Skip to content
Snippets Groups Projects
Commit 877d9c62 authored by Christian Darsow-Fromm's avatar Christian Darsow-Fromm
Browse files

Merge branch 'develop'

parents c4b96ea8 e509bc76
Branches
Tags
No related merge requests found
Pipeline #4710 failed
...@@ -25,7 +25,7 @@ package: ...@@ -25,7 +25,7 @@ package:
expire_in: 1 week expire_in: 1 week
test wheel installation: test wheel installation:
image: python:3 image: python:3.7
stage: test-build stage: test-build
before_script: before_script:
- apt-get remove -y git - apt-get remove -y git
......
FROM python:3 FROM python:3.7
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV BUILD_PACKAGES pandoc rsync openssh-client build-essential ENV BUILD_PACKAGES pandoc rsync openssh-client build-essential
...@@ -7,6 +7,6 @@ WORKDIR /code ...@@ -7,6 +7,6 @@ WORKDIR /code
RUN apt-get update -y && apt-get install -y $BUILD_PACKAGES RUN apt-get update -y && apt-get install -y $BUILD_PACKAGES
RUN pip install --upgrade pip RUN pip install pipenv
ADD requirements.txt requirements-devel.txt /code/ ADD Pipfile Pipfile.lock /code/
RUN pip install --upgrade -r requirements.txt -r requirements-devel.txt RUN pipenv install --dev --system --deploy
...@@ -4,6 +4,16 @@ url = "https://pypi.org/simple" ...@@ -4,6 +4,16 @@ url = "https://pypi.org/simple"
verify_ssl = true verify_ssl = true
[dev-packages] [dev-packages]
recommonmark = "*"
sphinx-markdown-tables = "*"
pytest = "*"
pytest-cov = ">=2.5.1"
sphinx-rtd-theme = "*"
twine = "*"
mypy = "*"
pylint = "*"
Sphinx = "*"
pipenv = "*"
[packages] [packages]
pyserial = "*" pyserial = "*"
...@@ -25,6 +35,3 @@ six = ">=1.12.0" ...@@ -25,6 +35,3 @@ six = ">=1.12.0"
python-dateutil = ">=2.7.5" python-dateutil = ">=2.7.5"
eml-parser = ">=1.11" eml-parser = ">=1.11"
DateTime = "*" DateTime = "*"
[requires]
python_version = "3.7"
...@@ -50,6 +50,10 @@ documentation. ...@@ -50,6 +50,10 @@ documentation.
## Development ## 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 ### Tests
Please write unittests if you add new features. Please write unittests if you add new features.
All tests located in `src/test` are automatically tested when pushing to Gitlab. All tests located in `src/test` are automatically tested when pushing to Gitlab.
......
Sphinx
recommonmark
sphinx-markdown-tables
wheel
pytest
pytest-cov>=2.5.1
sphinx_rtd_theme
setuptools
twine
mypy
pylint
import os import os
from setuptools import setup from setuptools import setup
from pipenv.project import Project
from pipenv.utils import convert_deps_to_pip
# Work around mbcs bug in distutils. # Work around mbcs bug in distutils.
# Sebastian 2019-03-04: not sure whether this is still needed... # Sebastian 2019-03-04: not sure whether this is still needed...
# http://bugs.python.org/issue10945 # http://bugs.python.org/issue10945
...@@ -14,12 +15,9 @@ except LookupError: ...@@ -14,12 +15,9 @@ except LookupError:
codecs.register(func) codecs.register(func)
thelibFolder = os.path.dirname(os.path.realpath(__file__)) pfile = Project(chdir=False).parsed_pipfile
requirementPath = thelibFolder + '/requirements.txt' install_requires = convert_deps_to_pip(pfile['packages'], r=False)
install_requires = [] test_requirements = convert_deps_to_pip(pfile['dev-packages'], r=False)
if os.path.isfile(requirementPath):
with open(requirementPath) as f:
install_requires = f.read().splitlines()
if __name__=='__main__': if __name__=='__main__':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment