From cd48f124061f7df9c4099e1385fc22e114f0f547 Mon Sep 17 00:00:00 2001 From: Jeffrey Klardie Date: Thu, 27 Feb 2020 10:37:41 +0100 Subject: [PATCH 1/2] Use makefile to create requirements.txt --- Makefile | 21 +++++++++++++++++++++ requirements.in | 7 +++++++ requirements.txt | 20 ++++++++++++++++++++ src/importer/Makefile | 21 +++++++++++++++++++++ src/importer/requirements.in | 12 ++++++++++++ src/importer/requirements.txt | 29 +++++++++++++++++------------ src/requirements.txt | 7 ------- 7 files changed, 98 insertions(+), 19 deletions(-) create mode 100644 Makefile create mode 100644 requirements.in create mode 100644 requirements.txt create mode 100644 src/importer/Makefile create mode 100644 src/importer/requirements.in delete mode 100644 src/requirements.txt diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d3afab8 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# This Makefile is based on the Makefile defined in the Python Best Practices repository: +# https://git.datapunt.amsterdam.nl/Datapunt/python-best-practices/blob/master/dependency_management/ +# +# VERSION = 2020.01.29 +.PHONY = help pip-tools install requirements update +PYTHON = python3 +dc = docker-compose -p timetell + +help: ## Show this help. + @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' + +pip-tools: + pip install pip-tools + +install: pip-tools ## Install requirements and sync venv with expected state as defined in requirements.txt + pip-sync requirements.txt + +requirements: pip-tools ## Upgrade requirements (in requirements.in) to latest versions and compile requirements.txt + pip-compile --upgrade --output-file requirements.txt requirements.in + +upgrade: requirements install ## Run 'requirements' and 'install' targets diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..79a938a --- /dev/null +++ b/requirements.in @@ -0,0 +1,7 @@ +Django +djangorestframework +psycopg2-binary +django-filter +django-cors-headers +flake8 +coverage \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..8fbcf10 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --output-file=requirements.txt requirements.in +# +asgiref==3.2.3 # via django +coverage==5.0.3 # via -r requirements.in +django-cors-headers==3.2.1 # via -r requirements.in +django-filter==2.2.0 # via -r requirements.in +django==3.0.3 # via -r requirements.in, django-cors-headers, django-filter, djangorestframework +djangorestframework==3.11.0 # via -r requirements.in +entrypoints==0.3 # via flake8 +flake8==3.7.9 # via -r requirements.in +mccabe==0.6.1 # via flake8 +psycopg2-binary==2.8.4 # via -r requirements.in +pycodestyle==2.5.0 # via flake8 +pyflakes==2.1.1 # via flake8 +pytz==2019.3 # via django +sqlparse==0.3.0 # via django diff --git a/src/importer/Makefile b/src/importer/Makefile new file mode 100644 index 0000000..d3afab8 --- /dev/null +++ b/src/importer/Makefile @@ -0,0 +1,21 @@ +# This Makefile is based on the Makefile defined in the Python Best Practices repository: +# https://git.datapunt.amsterdam.nl/Datapunt/python-best-practices/blob/master/dependency_management/ +# +# VERSION = 2020.01.29 +.PHONY = help pip-tools install requirements update +PYTHON = python3 +dc = docker-compose -p timetell + +help: ## Show this help. + @fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//' + +pip-tools: + pip install pip-tools + +install: pip-tools ## Install requirements and sync venv with expected state as defined in requirements.txt + pip-sync requirements.txt + +requirements: pip-tools ## Upgrade requirements (in requirements.in) to latest versions and compile requirements.txt + pip-compile --upgrade --output-file requirements.txt requirements.in + +upgrade: requirements install ## Run 'requirements' and 'install' targets diff --git a/src/importer/requirements.in b/src/importer/requirements.in new file mode 100644 index 0000000..1248cb1 --- /dev/null +++ b/src/importer/requirements.in @@ -0,0 +1,12 @@ +aiohttp +async-timeout +asyncio +asyncpg +attrs +chardet +idna + +multidict +typing-extensions +uvloop +yarl diff --git a/src/importer/requirements.txt b/src/importer/requirements.txt index d9815c7..ba78dad 100644 --- a/src/importer/requirements.txt +++ b/src/importer/requirements.txt @@ -1,12 +1,17 @@ -aiohttp==3.5.4 -async-timeout==3.0.1 -asyncio==3.4.3 -asyncpg==0.18.3 -attrs==19.1.0 -chardet==3.0.4 -idna==2.8 -idna-ssl==1.1.0 -multidict==4.5.2 -typing-extensions==3.7.4 -uvloop==0.12.2 -yarl==1.3.0 +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile --output-file=requirements.txt requirements.in +# +aiohttp==3.6.2 # via -r requirements.in +async-timeout==3.0.1 # via -r requirements.in, aiohttp +asyncio==3.4.3 # via -r requirements.in +asyncpg==0.20.1 # via -r requirements.in +attrs==19.3.0 # via -r requirements.in, aiohttp +chardet==3.0.4 # via -r requirements.in, aiohttp +idna==2.9 # via -r requirements.in, yarl +multidict==4.7.5 # via -r requirements.in, aiohttp, yarl +typing-extensions==3.7.4.1 # via -r requirements.in +uvloop==0.14.0 # via -r requirements.in +yarl==1.4.2 # via -r requirements.in, aiohttp diff --git a/src/requirements.txt b/src/requirements.txt deleted file mode 100644 index d9b1735..0000000 --- a/src/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -Django>=2.2.0 -django-rest-framework==0.1.0 -psycopg2>=2.8.3 -django-filter==2.1.0 -django-cors-headers==3.0.2 -flake8>=3.7.8 -coverage>=4.5.3 \ No newline at end of file From d50360f34b7151791a58c44f2d459e2eb9b140be Mon Sep 17 00:00:00 2001 From: Jeffrey Klardie Date: Thu, 27 Feb 2020 10:41:00 +0100 Subject: [PATCH 2/2] Fixed incorrect env-datapunt-dev exporter --- src/importer/env-datapunt-dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/importer/env-datapunt-dev.sh b/src/importer/env-datapunt-dev.sh index 14ff114..80e0626 100755 --- a/src/importer/env-datapunt-dev.sh +++ b/src/importer/env-datapunt-dev.sh @@ -6,7 +6,7 @@ set -x export DATABASE_NAME=timetell export DATABASE_USER=timetell -export DATABASE_PASSWORD=timetell +export DATABASE_PASSWORD=insecure export DATABASE_HOST=localhost export DATABASE_PORT=5444