Added 'deploy_pypi' CI job. Revised setup.py for a proper PyPI upload. Removed...

Added 'deploy_pypi' CI job. Revised setup.py for a proper PyPI upload. Removed installation of 'icu=58.*' from installation.rst.
Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

.gitlab-ci.yml

@@ -154,3 +154,18 @@ pages:
     - master
     - enhancement/improve_docs
     - feature/add_tutorial
+
+
+deploy_pypi:
+  stage: deploy
+  dependencies:
+    - test_enpt
+  script:
+    - source /root/miniconda3/bin/activate enpt
+    - pip install -U twine
+    - python setup.py sdist
+    - twine upload dist/*  # requires creds as environment variables
+  only:
+    - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
+  except:
+    - dev

docs/installation.rst

@@ -29,7 +29,6 @@ Using conda_, the recommended approach is:
 
     # install not pip-installable deps of geoarray
     conda install -c conda-forge numpy scikit-image matplotlib pandas gdal pyproj basemap shapely
-    conda install -c conda-forge 'icu=58.*'
 
     # install not pip-installable deps of sensormapgeo
     conda install -c conda-forge pyresample

setup.py

@@ -49,29 +49,16 @@ requirements = [  # put package requirements here
     # 'sicor', # pip install git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git
 ]
 
+setup_requirements = ['setuptools-git']  # needed for package_data version controlled by GIT
+
 test_requirements = ['coverage', 'nose', 'nose-htmloutput', 'rednose']
 
 setup(
-    name='enpt',
-    version=version['__version__'],
-    description="EnMAP Processing Tools",
-    long_description=readme + '\n\n' + history,
     author=["Karl Segl", "Daniel Scheffler", "Niklas Bohn", "Stéphane Guillaso"],
     author_email=['segl@gfz-potsdam.de', 'danschef@gfz-potsdam.de', 'nbohn@gfz-potsdam.de',
                   'stephane.guillaso@gfz-potsdam.de'],
-    url='https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT',
-    packages=find_packages(exclude=['tests*']),
-    package_dir={'enpt':
-                 'enpt'},
-    include_package_data=True,
-    install_requires=requirements,
-    license="GNU General Public License v3",
-    zip_safe=False,
-    scripts=['bin/enpt_cli.py'],
-    data=[],  # TODO
-    keywords=['EnPT', 'EnMAP', 'EnMAP-Box', 'hyperspectral', 'remote sensing', 'satellite', 'processing chain'],
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Natural Language :: English',
         'Programming Language :: Python :: 3.5',
@@ -79,6 +66,24 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
     ],
+    description="EnMAP Processing Tools",
+    keywords=['EnPT', 'EnMAP', 'EnMAP-Box', 'hyperspectral', 'remote sensing', 'satellite', 'processing chain'],
+    include_package_data=True,
+    install_requires=requirements,
+    license="GNU General Public License v3",
+    long_description=readme + '\n\n' + history,
+    name='enpt',
+    package_dir={'enpt':
+                     'enpt'},
+    # NOTE: if the 'package_data' files are not under CVS or Subversion version control, we need setuptools-git here,
+    #       otherwise they are not included in the PyPi upload content
+    package_data={"enpt": ["resources/**/**/*"]},
+    packages=find_packages(exclude=['tests*']),
+    scripts=['bin/enpt_cli.py'],
+    setup_requires=setup_requirements,
     test_suite='tests',
-    tests_require=test_requirements
+    tests_require=test_requirements,
+    url='https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT',
+    version=version['__version__'],
+    zip_safe=False
 )