Merge branch 'develop'

.gitlab-ci.yml

@@ -25,7 +25,7 @@ package:
     expire_in: 1 week
 
 test wheel installation:
-  image: python:3
+  image: python:3.7
   stage: test-build
   before_script:
     - apt-get remove -y git

Dockerfile

-FROM python:3
+FROM python:3.7
 ENV PYTHONUNBUFFERED 1
 ENV BUILD_PACKAGES pandoc rsync openssh-client build-essential
 
@@ -7,6 +7,6 @@ WORKDIR /code
 
 RUN apt-get update -y && apt-get install -y $BUILD_PACKAGES
 
-RUN pip install --upgrade pip
-ADD requirements.txt requirements-devel.txt /code/
-RUN pip install --upgrade -r requirements.txt -r requirements-devel.txt
+RUN pip install pipenv
+ADD Pipfile Pipfile.lock /code/
+RUN pipenv install --dev --system --deploy

Pipfile

@@ -4,6 +4,16 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+recommonmark = "*"
+sphinx-markdown-tables = "*"
+pytest = "*"
+pytest-cov = ">=2.5.1"
+sphinx-rtd-theme = "*"
+twine = "*"
+mypy = "*"
+pylint = "*"
+Sphinx = "*"
+pipenv = "*"
 
 [packages]
 pyserial = "*"
@@ -25,6 +35,3 @@ six = ">=1.12.0"
 python-dateutil = ">=2.7.5"
 eml-parser = ">=1.11"
 DateTime = "*"
-
-[requires]
-python_version = "3.7"

README.md

@@ -50,6 +50,10 @@ documentation.
 
 ## Development
 
+### Pipenv
+Use [Pipenv](https://pipenv.readthedocs.io/en/latest/) to manage the development packages.
+If you are missing a small how-to, just ask and write it. :)
+
 ### Tests
 Please write unittests if you add new features.
 All tests located in `src/test` are automatically tested when pushing to Gitlab.

requirements-devel.txt

-Sphinx
-recommonmark
-sphinx-markdown-tables
-wheel
-pytest
-pytest-cov>=2.5.1
-sphinx_rtd_theme
-setuptools
-twine
-mypy
-pylint

requirements.txt

-pyserial
-numpy
-scipy>=1.1.0
-pandas>=0.23.3
-matplotlib
-tabulate
-pytimeparse
-pytz
-pathlib
-datetime
-psutil
-statsmodels
-jsonpickle
-multiprocess
-dill
-requests
-six>=1.12.0
-python-dateutil>=2.7.5
-eml_parser>=1.11

setup.py

 import os
 from setuptools import setup
-
+from pipenv.project import Project
+from pipenv.utils import convert_deps_to_pip
 # Work around mbcs bug in distutils.
 # Sebastian 2019-03-04: not sure whether this is still needed...
 # http://bugs.python.org/issue10945
@@ -14,12 +15,9 @@ except LookupError:
     codecs.register(func)
 
 
-thelibFolder = os.path.dirname(os.path.realpath(__file__))
-requirementPath = thelibFolder + '/requirements.txt'
-install_requires = []
-if os.path.isfile(requirementPath):
-    with open(requirementPath) as f:
-        install_requires = f.read().splitlines()
+pfile = Project(chdir=False).parsed_pipfile
+install_requires = convert_deps_to_pip(pfile['packages'], r=False)
+test_requirements = convert_deps_to_pip(pfile['dev-packages'], r=False)
 
 
 if __name__=='__main__':