Replaced deprecated PyPi upload commands by twine. Updated version info.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

.gitlab-ci.yml

@@ -4,8 +4,6 @@ before_script:
 
 # Advise GitLab that these environment vars should be loaded from the Variables config.
 variables:
-    PYPI_USER: SECURE
-    PYPI_PASSWORD: SECURE
     ANACONDA_USER: SECURE
     ANACONDA_PASSWORD: SECURE
     ANACONDA_TOKEN: SECURE
@@ -109,14 +107,12 @@ deploy_pypi:
   stage: deploy_pypi
   dependencies:
     - test_py_tools_ds
-  script:   # Configure the PyPI credentials, then push the package, and cleanup the creds.
+  script:
     - source /root/miniconda3/bin/activate
-    - printf "[distutils]\nindex-servers =\n    pypi\n\n" >> ~/.pypirc
-    - printf "[pypi]\n""repository:"" https://upload.pypi.org/legacy/\n" >> ~/.pypirc
-    - printf "username= ${PYPI_USER}\n" >> ~/.pypirc
-    - printf "password= ${PYPI_PASSWORD}\n" >> ~/.pypirc
-    - python setup.py check sdist upload -r pypi  # This will fail if your creds are bad.
-    - echo "" > ~/.pypirc && rm ~/.pypirc  # If the above fails, this won't run.
+    - source activate ci_env
+    - 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:
@@ -129,6 +125,7 @@ deploy_anaconda:
     - test_py_tools_ds
   script:
     - source /root/miniconda3/bin/activate
+    - source activate ci_env
     - conda install -y -q conda-build anaconda-client
     - yum install -y patch # https://stackoverflow.com/questions/40392161/building-conda-skeleton-from-pypi-package-throws-error
     # - conda skeleton pypi py_tools_ds --output-dir public/conda.recipe/py_tools_ds # create recipe
@@ -143,10 +140,3 @@ deploy_anaconda:
     - /^v\d+\.\d+\.\d+([abc]\d*)?$/  # PEP-440 compliant version (tags)
   except:
     - dev
-
-
-cleanup_pypirc:
-   stage: cleanup
-   when: always   # this is important; run even if preceding stages failed.
-   script:
-    - rm -vf ~/.pypirc  # we don't want to leave these around, but GitLab may clean up anyway.

py_tools_ds/version.py

@@ -19,5 +19,5 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '0.14.20'
-__versionalias__ = '20190726_01'
+__version__ = '0.14.21'
+__versionalias__ = '20190814_01'