Merge branch 'v0.2_release'

MANIFEST.in

@@ -0,0 +1,2 @@
+include zunis_lib/zunis/utils/config/*.yaml
+include README.md

Makefile

@@ -1,14 +1,15 @@
-.PHONY: clean data requirements doc static-doc docinstall serve
+.PHONY: clean data requirements doc static-doc docinstall serve build pypi-upload
 
 #################################################################################
 # GLOBALS                                                                       #
 #################################################################################
 
 PROJECT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-PROJECT_NAME = pytorch_flows
+PROJECT_NAME = zunis
 PYTHON_INTERPRETER = python
 DOC_DIR = docs/
 DOC_BUILD_DIR = doc_build/
+PROJECT_SRC = zunis_lib/
 
 ifeq (,$(shell which conda))
 HAS_CONDA=False
@@ -29,6 +30,7 @@ requirements:
 clean:
 	find . -type f -name "*.py[co]" -delete
 	find . -type d -name "__pycache__" -delete
+	rm -rf dist zunis.egg-info
 
 ## Build automatic API documentation
 doc:
@@ -51,6 +53,12 @@ doc-install:
 serve:
 	$(MAKE) serve -C $(DOC_BUILD_DIR)
 
+build:
+	python setup.py sdist bdist_wheel
+
+pypi-upload:
+	python -m twine upload dist/*
+
 
 #################################################################################
 # PROJECT RULES                                                                 #

README.md

@@ -44,9 +44,9 @@ python benchmark_hypersphere.py
 
 ## Library usage
 
-For basic uses, a RealNVP-based integrator is provided with default choices and can be created and used as follows:
+For basic applications, the integrator is provided with default choices and can be created and used as follows:
 
-```
+```python
 import torch
 from zunis.integration import Integrator
 

doc_build/requirements.txt

@@ -7,4 +7,4 @@ vegas==4.0.1
 
 torchps @ git+https://github.com/NGoetz/TorchPS
 # Editable Zunis install
--e ./zunis_lib
+-e .

requirements.txt

@@ -80,4 +80,4 @@ widgetsnbextension==3.5.1
 torchps @ git+https://github.com/NGoetz/TorchPS
 
 # Editable Zunis install
--e ./zunis_lib
+-e .

zunis_lib/setup.py → setup.py

@@ -2,7 +2,8 @@
 
 setup(
     name='zunis',
-    packages=find_packages(),
+    packages=find_packages(where='zunis_lib'),
+    package_dir={'': 'zunis_lib'},
     install_requires=[
         "numpy == 1.19.1",
         "pandas == 1.1.0",
@@ -11,14 +12,14 @@
         "dictwrapper == 1.3",
         "ruamel.yaml <= 0.16.12"
     ],
-    version='0.2rc3',
+    version='0.2',
     description='Neural Importance Sampling',
-    long_description=open("../README.md").read(),
+    long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     author='Nicolas Deutschmann',
     author_email="[email protected]",
     url="https://zunis.readthedocs.io",
-    download_url="https://github.com/ndetschmann/zunis",
+    download_url="https://github.com/ndeutschmann/zunis",
     license='MIT',
     include_package_data = True
 )