Merge branch 'develop' of github.com:wwu-mmll/photonai into develop

Author: RLeenings

.github/workflows/python-deploy_to_pypi.yml

@@ -0,0 +1,25 @@
+name: PHOTONAI release deployment on PyPI
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  deploy:
+    name: Build and publish to PyPI
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7.6
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7.6
+    - name: Install pypa/build
+      run: pip install build
+    - name: Build a binary wheel and a source tarball
+      run: python -m build --sdist --wheel --outdir dist/ .
+    - name: Publish distribution to Test PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/python-test.yml renamed to .github/workflows/python-test_and_deploy.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: PHOTONAI tests
+name: PHOTONAI test and test deploy
 
 on:
   push:
@@ -11,7 +11,7 @@ on:
 
 jobs:
   pytest:
-
+    name: Run PHOTONAI tests and publish test coverage
     runs-on: ubuntu-18.04
 
     services:
@@ -43,3 +43,28 @@ jobs:
       env: 
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  deploy:
+    name: Build and publish to TestPyPI
+    runs-on: ubuntu-18.04
+    needs: pytest
+    if: github.ref == 'refs/heads/master'
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7.6
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7.6
+    - name: Replace version number with commit hash
+      run: |
+        dt=$(date '+%Y.%m.%d.%H.%M.%S')
+        sed -i "s/^__version__.*/__version__ = '$dt'/g" setup.py
+    - name: Install pypa/build
+      run: pip install build
+    - name: Build a binary wheel and a source tarball
+      run: python -m build --sdist --wheel --outdir dist/ .
+    - name: Publish distribution to Test PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        repository_url: https://test.pypi.org/legacy/

README.md

@@ -1,6 +1,6 @@
-![PHOTON LOGO](http://www.photon-ai.com/static/img/photon/photon-logo-github.png "PHOTON Logo")
+[![PHOTON LOGO](https://www.photon-ai.com/static/img/photon/photon-logo-github.png)](https://www.photon-ai.com/)
 
-[![Build Status](https://travis-ci.com/wwu-mmll/photonai.svg?branch=master)](https://travis-ci.com/wwu-mmll/photonai)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wwu-mmll/photonai/PHOTONAI%20test%20and%20test%20deploy)](https://github.com/wwu-mmll/photonai/actions)
 [![Coverage Status](https://coveralls.io/repos/github/wwu-mmll/photonai/badge.svg?branch=master)](https://coveralls.io/github/wwu-mmll/photonai?branch=master)
 [![Github Contributors](https://img.shields.io/github/contributors-anon/wwu-mmll/photonai?color=blue)](https://github.com/wwu-mmll/photonai/graphs/contributors)
 [![Github Commits](https://img.shields.io/github/commit-activity/y/wwu-mmll/photonai)](https://github.com/wwu-mmll/photonai/commits/master)

setup.py

@@ -5,38 +5,38 @@
     use_setuptools()
     from setuptools import setup, find_packages
 
-# from setuptools.command.install import install
-#
-# class Modulenstalltio
-
 
 __version__ = '2.1.0'
 
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
 setup(
     name='photonai',
     packages=find_packages(),
     include_package_data=True,
     version=__version__,
-    description="""
-PHOTONAI
-is a rapid prototyping framework enabling (not so experienced) users to build, train, optimize, evaluate,
-and share even complex machine learning (ML) pipelines with very high efficiency.
-
-By pre-registering state-of-the-art ML implementations, we create a system in which the user can select 
-and arrange processing steps and learning algorithms in simple or parallel pipeline data streams. 
-
-Importantly, PHOTONAI is capable to automatize the training and testing procedure including nested cross-validation and 
-hyperparameter search, calculates performance metrics and conveniently visualizes the analyzed hyperparameter space.
-
-It also enables the user persist and load your optimal model, including all preprocessing elements, 
-with only one line of code.
-""",
+    description="PHOTONAI is a high level python API for designing and optimizing machine learning pipelines.",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    license = "GPLv3",
     author='PHOTONAI Team',
     author_email='[email protected]',
-    url='https://github.com/mmll-wwu/photonai.git',
-    download_url='https://github.com/wwu-mmll/photonai/archive/' + __version__ + '.tar.gz',
+    url='https://www.photon-ai.com/',
+    project_urls={
+        "Source Code": "https://github.com/wwu-mmll/photonai/",
+        "Documentation": "https://wwu-mmll.github.io/photonai/",
+        "Bug Tracker": "https://github.com/wwu-mmll/photonai/issues",
+    },
+    download_url='https://pypi.org/project/photonai/#files',
     keywords=['machine learning', 'deep learning', 'neural networks', 'hyperparameter'],
-    classifiers=[],
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+        "Operating System :: OS Independent",
+        'Intended Audience :: Science/Research',
+        'Intended Audience :: Developers',
+    ],
     install_requires=[
         'numpy',
         'matplotlib',