deploy(minor): switch to pipfile

.gitlab-ci.yml

@@ -14,8 +14,8 @@ variables:
 
 before_script:
   # Ensure all dependencies are installed, even those not included in passbook/dev
-  - pip install -r requirements.txt
-  - pip install -r requirements-dev.txt
+  - pipenv lock -r --dev > requirements-all.txt
+  - pip install -r requirements-all.txt
 
 create-base-image:
   image:

Dockerfile.base

@@ -1,11 +1,13 @@
 FROM python:3.7-alpine
 
-COPY ./requirements.txt /app/
+COPY ./Pipfile /app/
+COPY ./Pipfile.lock /app/
 
 WORKDIR /app/
 
 RUN apk update && \
     apk add --no-cache openssl-dev build-base libxml2-dev libxslt-dev libffi-dev gcc musl-dev libgcc zlib-dev postgresql-dev && \
-    pip install -r /app/requirements.txt  --no-cache-dir && \
+    pipenv lock -r > requirements.txt && \
+    pip install -r requirements.txt  --no-cache-dir && \
     adduser -S passbook && \
     chown -R passbook /app

Dockerfile.dev

@@ -1,5 +1,4 @@
 FROM docker.beryju.org/passbook/base:latest
 
-COPY ./requirements-dev.txt /app/
-
-RUN pip install -r /app/requirements-dev.txt  --no-cache-dir
+RUN pipenv lock --dev -r > requirements-dev.txt && \
+    pip install -r /app/requirements-dev.txt  --no-cache-dir

Pipfile

@@ -0,0 +1,59 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[packages]
+asgiref = "*"
+beautifulsoup4 = "*"
+celery = "*"
+channels = "*"
+cherrypy = "*"
+colorlog = "*"
+daphne = "*"
+defusedxml = "*"
+django = "*"
+django-cors-middleware = "*"
+django-filters = "*"
+django-ipware = "*"
+django-model-utils = "*"
+django-oauth-toolkit = "*"
+django-oidc-provider = "*"
+django-otp = "*"
+django-recaptcha = "*"
+django-redis = "*"
+django-rest-framework = "*"
+django-revproxy = "*"
+djangorestframework = "==3.9.4"
+drf-yasg = "*"
+ldap3 = "*"
+lxml = "*"
+markdown = "*"
+oauthlib = "*"
+packaging = "*"
+psycopg2 = "*"
+pycryptodome = "*"
+pyyaml = "*"
+qrcode = "*"
+requests-oauthlib = "*"
+sentry-sdk = "*"
+service_identity = "*"
+signxml = "*"
+urllib3 = {extras = ["secure"],version = "*"}
+websocket_client = "*"
+
+[requires]
+python_version = "3.7"
+
+[dev-packages]
+coverage = "*"
+isort = "*"
+pylint = "*"
+pylint-django = "*"
+prospector = "*"
+django-debug-toolbar = "*"
+bumpversion = "*"
+unittest-xml-reporting = "*"
+autopep8 = "*"
+bandit = "*"
+twine = "*"

requirements-dev.txt

@@ -1,16 +0,0 @@
--r requirements.txt
-coverage
-isort
-astroid==2.0.4
-pylint==2.1.1
-pylint-django==2.0.2
-prospector==1.1.5
-django-debug-toolbar
-pycodestyle<2.4.0,>=2.0.0
-bumpversion
-unittest-xml-reporting
-autopep8
-bandit
-bumpversion
-twine
-grpcio-tools

requirements.txt

@@ -1,52 +0,0 @@
-# Root requirements
-celery
-colorlog
-cherrypy
-django-ipware
-django-model-utils
-django-redis
-django>=2.0
-idna<2.8,>=2.5
-markdown
-psycopg2
-PyYAML
-sentry-sdk
-pip
-urllib3<1.25,>=1.21.1
-grpcio
-grpcio-reflection
-protobuf
-packaging
-# OAuth Client
-requests_oauthlib>=0.4.2
-oauthlib>=2.0.6
-# LDAP Client
-ldap3
-# SAML IDP
-beautifulsoup4>=4.6.0
-lxml>=3.8.0
-signxml
-defusedxml
-PyCryptodome
-# OTP
-django_otp
-qrcode
-# OAuth Provider
-django-oauth-toolkit
-django-cors-middleware
-# ReCaptcha
-django-recaptcha
-# API
-drf_yasg
-djangorestframework==3.9.4
-django-filters
-# AppGW
-django-revproxy
-urllib3[secure]
-channels
-service_identity
-websocket-client
-daphne<2.3.0
-asgiref~=2.3
-# OIDC Provider
-django-oidc-provider