Feature/config update

bin/compile_dependencies.sh

@@ -6,24 +6,24 @@ toplevel=$(git rev-parse --show-toplevel)
 
 cd $toplevel
 
-# Base deps
+# Base (& prod) deps
 pip-compile \
     --no-index \
+    --upgrade \
     requirements/base.in
 
-# Dev deps
+# Dependencies for testing
 pip-compile \
     --no-index \
-    --output-file requirements/dev.txt \
+    --upgrade \
+    --output-file requirements/ci.txt \
     requirements/base.txt \
-    requirements/testing.in \
-    requirements/dev.in
-
+    requirements/test-tools.in
 
-# Jenkins/tests deps
+# Dev depedencies - exact same set as CI + some extra tooling
 pip-compile \
     --no-index \
-    --output-file requirements/jenkins.txt \
-    requirements/base.txt \
-    requirements/dev.txt \
-    requirements/jenkins.in
+    --upgrade \
+    --output-file requirements/dev.txt \
+    requirements/ci.txt \
+    requirements/dev.in

requirements/base.in

@@ -1,13 +1,14 @@
 pip-tools
 psycopg2
-python-dotenv
 python-dateutil
+python-decouple
+python-dotenv
 pytz
 raven
 markdown
 uwsgi
 
-Django
+Django<3.0
 django-better-admin-arrayfield
 django-choices
 django-cors-middleware

requirements/base.txt

@@ -4,53 +4,54 @@
 #
 #    pip-compile --no-index requirements/base.in
 #
-certifi==2019.9.11        # via requests
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
-click==7.0                # via pip-tools
+click==7.1.1              # via pip-tools
 coreapi==2.3.3            # via drf-yasg
 coreschema==0.0.4         # via coreapi, drf-yasg
-django-better-admin-arrayfield==1.0.4  # via -r requirements/base.in
-django-choices==1.7.0     # via -r requirements/base.in, vng-api-common
-django-cors-middleware==1.4.0  # via -r requirements/base.in
+django-better-admin-arrayfield==1.0.5
+django-choices==1.7.1
+django-cors-middleware==1.5.0
 django-filter==2.2.0      # via vng-api-common
-django-markup==1.3        # via -r requirements/base.in
-django-redis==4.10.0      # via -r requirements/base.in
+django-markup==1.3
+django-redis==4.11.0
 django-rest-framework-condition==0.1.1  # via vng-api-common
 django-solo==1.1.3        # via vng-api-common
-django==2.2.11            # via -r requirements/base.in, django-choices, django-filter, django-markup, django-redis, django-rest-framework-condition, drf-nested-routers, drf-yasg, vng-api-common
-djangorestframework-camel-case==1.1.1  # via vng-api-common
-djangorestframework==3.9.4  # via -r requirements/base.in, drf-nested-routers, drf-yasg, vng-api-common
+django==2.2.11
+djangorestframework-camel-case==1.1.2  # via vng-api-common
+djangorestframework==3.9.4
 drf-nested-routers==0.91  # via vng-api-common
 drf-yasg==1.16.0          # via vng-api-common
-gemma-zds-client==0.13.0  # via vng-api-common
-idna==2.8                 # via requests
+gemma-zds-client==0.13.1  # via vng-api-common
+idna==2.9                 # via requests
 inflection==0.3.1         # via drf-yasg
 iso-639==0.4.5            # via vng-api-common
 isodate==0.6.0            # via vng-api-common
 itypes==1.1.0             # via coreapi
-jinja2==2.10.3            # via coreschema
-markdown==3.1.1           # via -r requirements/base.in
+jinja2==2.11.1            # via coreschema
+markdown==3.2.1
 markupsafe==1.1.1         # via jinja2
 oyaml==0.9                # via vng-api-common
-pip-tools==4.2.0          # via -r requirements/base.in
-psycopg2==2.8.3           # via -r requirements/base.in
+pip-tools==4.5.1
+psycopg2==2.8.4
 pyjwt==1.7.1              # via gemma-zds-client, vng-api-common
-python-dateutil==2.8.0    # via -r requirements/base.in
-python-dotenv==0.10.3     # via -r requirements/base.in
-pytz==2019.3              # via -r requirements/base.in, django
-pyyaml==5.1.2             # via gemma-zds-client, oyaml, vng-api-common
-raven==6.10.0             # via -r requirements/base.in
-redis==3.3.11             # via django-redis
-requests==2.22.0          # via coreapi, gemma-zds-client, vng-api-common
+python-dateutil==2.8.1
+python-decouple==3.3
+python-dotenv==0.12.0
+pytz==2019.3
+pyyaml==5.3.1             # via gemma-zds-client, oyaml, vng-api-common
+raven==6.10.0
+redis==3.4.1              # via django-redis
+requests==2.23.0          # via coreapi, gemma-zds-client, vng-api-common
 ruamel.yaml.clib==0.2.0   # via ruamel.yaml
-ruamel.yaml==0.16.5       # via drf-yasg
-six==1.12.0               # via django-markup, drf-yasg, isodate, pip-tools, python-dateutil
-sqlparse==0.3.0           # via django
+ruamel.yaml==0.16.10      # via drf-yasg
+six==1.14.0               # via django-choices, django-markup, drf-yasg, isodate, pip-tools, python-dateutil
+sqlparse==0.3.1           # via django
 unidecode==1.1.1          # via vng-api-common
-uritemplate==3.0.0        # via coreapi, drf-yasg
-urllib3==1.25.6           # via requests
-uwsgi==2.0.18             # via -r requirements/base.in
-vng-api-common==1.4.0     # via -r requirements/base.in
+uritemplate==3.0.1        # via coreapi, drf-yasg
+urllib3==1.25.8           # via requests
+uwsgi==2.0.18
+vng-api-common==1.4.5
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# setuptools==46.1.1        # via markdown

requirements/ci.txt

@@ -0,0 +1,78 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --no-index --output-file=requirements/ci.txt requirements/base.txt requirements/test-tools.in
+#
+astroid==1.6.6            # via pylint
+beautifulsoup4==4.8.2     # via webtest
+certifi==2019.11.28
+chardet==3.0.4
+click==7.1.1
+coreapi==2.3.3
+coreschema==0.0.4
+coverage==5.0.4
+django-better-admin-arrayfield==1.0.5
+django-choices==1.7.1
+django-cors-middleware==1.5.0
+django-filter==2.2.0
+django-jenkins==0.110.0
+django-markup==1.3
+django-redis==4.11.0
+django-rest-framework-condition==0.1.1
+django-solo==1.1.3
+django-webtest==1.9.7
+django==2.2.11
+djangorestframework-camel-case==1.1.2
+djangorestframework==3.9.4
+drf-nested-routers==0.91
+drf-yasg==1.16.0
+factory-boy==2.12.0
+faker==4.0.2              # via factory-boy
+freezegun==0.3.15
+gemma-zds-client==0.13.1
+idna==2.9
+inflection==0.3.1
+iso-639==0.4.5
+isodate==0.6.0
+isort==4.3.21             # via pylint
+itypes==1.1.0
+jinja2==2.11.1
+lazy-object-proxy==1.4.3  # via astroid
+markdown==3.2.1
+markupsafe==1.1.1
+mccabe==0.6.1             # via pylint
+oyaml==0.9
+pep8==1.7.1
+pip-tools==4.5.1
+psycopg2==2.8.4
+pyjwt==1.7.1
+pylint==1.9.4
+python-dateutil==2.8.1
+python-decouple==3.3
+python-dotenv==0.12.0
+pytz==2019.3
+pyyaml==5.3.1
+raven==6.10.0
+redis==3.4.1
+requests-mock==1.7.0
+requests==2.23.0
+ruamel.yaml.clib==0.2.0
+ruamel.yaml==0.16.10
+six==1.14.0
+soupsieve==2.0            # via beautifulsoup4
+sqlparse==0.3.1
+tblib==1.6.0
+text-unidecode==1.3       # via faker
+unidecode==1.1.1
+uritemplate==3.0.1
+urllib3==1.25.8
+uwsgi==2.0.18
+vng-api-common==1.4.5
+waitress==1.4.3           # via webtest
+webob==1.8.6              # via webtest
+webtest==2.0.34           # via django-webtest
+wrapt==1.12.1             # via astroid
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==46.1.1        # via markdown

requirements/dev.in

@@ -1,2 +1,14 @@
+# Helpers
+pip-tools
+
+# Code formatting
+black
+isort
+
+# Debug tooling
 django-debug-toolbar
 django-extensions
+
+# Documentation
+sphinx
+sphinx_rtd_theme