From 99bfbe8b4fc4d49abdca8d285e8f9595d6a86e6a Mon Sep 17 00:00:00 2001 From: bobby-didcoding Date: Wed, 23 Aug 2023 10:49:33 +0100 Subject: [PATCH 1/4] fixed flake8 to 6.1.0 --- Dockerfile.dev | 31 +++++++++++++++++++++++++++++++ requirements.txt | 17 ++++++++--------- requirements_test.in | 2 +- requirements_test.txt | 19 +++++++++---------- 4 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 Dockerfile.dev diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 00000000..cd73eb39 --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,31 @@ +FROM python:3.9.2 + +### 1. Set environment variables +ENV PYTHONUNBUFFERED 1 +ENV PYTHONDONTWRITEBYTECODE 1 +ENV DOCKERIZE_VERSION v0.6.1 + +### 2. Setup GDAL +RUN apt-get update &&\ + apt-get -y install gettext ;\ + apt-get -y install httpie; \ + apt-get install -y binutils libproj-dev gdal-bin python3-gdal + + +### 3. Add dockerize to allow waiting for the DB to load. +RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ + && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz + +### 4. Create working directory +RUN mkdir /app +COPY . /app/ +WORKDIR /app + +### 5. Install packages +RUN set -e; \ + /usr/local/bin/python -m pip install --upgrade pip ;\ + python -m pip install pip-tools ;\ + python -m pip install -r /app/requirements_test.txt ; +### 6. Expose port +EXPOSE 8010 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index d1f7cf4e..ad21f188 100644 --- a/requirements.txt +++ b/requirements.txt @@ -48,7 +48,7 @@ cffi==1.15.1 # via cryptography charset-normalizer==3.2.0 # via requests -click==8.1.6 +click==8.1.7 # via # celery # click-didyoumean @@ -72,7 +72,7 @@ directory-constants==23.1.1 # directory-components directory-healthcheck==3.1.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via -r requirements.in django==4.1.10 # via @@ -127,7 +127,7 @@ django-storages==1.13.2 # via -r requirements.in django-taggit==3.1.0 # via wagtail -django-timezone-field==5.1 +django-timezone-field==6.0 # via django-celery-beat django-treebeard==4.7 # via wagtail @@ -145,7 +145,7 @@ draftjs-exporter==2.1.7 # via wagtail drf-spectacular==0.26.4 # via -r requirements.in -ecs-logging==2.0.2 +ecs-logging==2.1.0 # via elastic-apm elastic-apm==6.18.0 # via -r requirements.in @@ -227,12 +227,11 @@ pytube==9.2.2 pytz==2023.3 # via # django-modelcluster - # django-timezone-field # djangorestframework # l18n pyyaml==6.0.1 # via drf-spectacular -redis==4.6.0 +redis==5.0.0 # via # celery # django-redis @@ -244,7 +243,7 @@ requests[security]==2.31.0 # wagtail requests-oauthlib==1.3.1 # via django-staff-sso-client -s3transfer==0.6.1 +s3transfer==0.6.2 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in @@ -290,7 +289,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22 +w3lib==1.22.0 # via -r requirements.in wagtail==4.1.5 # via @@ -298,7 +297,7 @@ wagtail==4.1.5 # wagtail-markdown # wagtail-modeltranslation # wagtailmedia -wagtail-markdown==0.11 +wagtail-markdown==0.11.0 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in diff --git a/requirements_test.in b/requirements_test.in index 9abf810c..d0893815 100644 --- a/requirements_test.in +++ b/requirements_test.in @@ -4,7 +4,7 @@ pytest pytest-cov pytest-django pytest-sugar -flake8 +flake8==6.1.0 requests_mock freezegun==0.3.14 coveralls diff --git a/requirements_test.txt b/requirements_test.txt index a9ddf8b3..306186b7 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -50,7 +50,7 @@ cffi==1.15.1 # via cryptography charset-normalizer==3.2.0 # via requests -click==8.1.6 +click==8.1.7 # via # celery # click-didyoumean @@ -82,7 +82,7 @@ directory-constants==23.1.1 # directory-components directory-healthcheck==3.1.2 # via -r requirements.in -dj-database-url==2.0.0 +dj-database-url==2.1.0 # via -r requirements.in django==4.1.10 # via @@ -140,7 +140,7 @@ django-storages==1.13.2 # via -r requirements.in django-taggit==3.1.0 # via wagtail -django-timezone-field==5.1 +django-timezone-field==6.0 # via django-celery-beat django-treebeard==4.7 # via wagtail @@ -159,7 +159,7 @@ draftjs-exporter==2.1.7 # via wagtail drf-spectacular==0.26.4 # via -r requirements.in -ecs-logging==2.0.2 +ecs-logging==2.1.0 # via elastic-apm elastic-apm==6.18.0 # via -r requirements.in @@ -294,12 +294,11 @@ pytube==9.2.2 pytz==2023.3 # via # django-modelcluster - # django-timezone-field # djangorestframework # l18n pyyaml==6.0.1 # via drf-spectacular -redis==4.6.0 +redis==5.0.0 # via # celery # django-redis @@ -316,7 +315,7 @@ requests-mock==1.11.0 # via -r requirements_test.in requests-oauthlib==1.3.1 # via django-staff-sso-client -s3transfer==0.6.1 +s3transfer==0.6.2 # via boto3 sentry-sdk==1.29.2 # via -r requirements.in @@ -377,7 +376,7 @@ vine==5.0.0 # amqp # celery # kombu -w3lib==1.22 +w3lib==1.22.0 # via -r requirements.in wagtail==4.1.5 # via @@ -388,7 +387,7 @@ wagtail==4.1.5 # wagtailmedia wagtail-factories==2.0.1 # via -r requirements_test.in -wagtail-markdown==0.11 +wagtail-markdown==0.11.0 # via -r requirements.in wagtail-modeltranslation==0.13.0 # via -r requirements.in @@ -400,7 +399,7 @@ webencodings==0.5.1 # via # bleach # html5lib -wheel==0.41.1 +wheel==0.41.2 # via pip-tools whitenoise==6.4.0 # via -r requirements.in From 0692fa812e32b8b0514264456fa94d59cc9f525c Mon Sep 17 00:00:00 2001 From: bobby-didcoding Date: Wed, 23 Aug 2023 10:55:38 +0100 Subject: [PATCH 2/4] removed dockerfile.dev --- .gitignore | 3 +++ Dockerfile.dev | 31 ------------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 Dockerfile.dev diff --git a/.gitignore b/.gitignore index b32eef57..b679b8ae 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,6 @@ conf/.env conf/env/secrets-do-not-commit .pii-secret-hook/file_content/pii-secret-log + +#Docker config file +Dockerfile.dev diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index cd73eb39..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,31 +0,0 @@ -FROM python:3.9.2 - -### 1. Set environment variables -ENV PYTHONUNBUFFERED 1 -ENV PYTHONDONTWRITEBYTECODE 1 -ENV DOCKERIZE_VERSION v0.6.1 - -### 2. Setup GDAL -RUN apt-get update &&\ - apt-get -y install gettext ;\ - apt-get -y install httpie; \ - apt-get install -y binutils libproj-dev gdal-bin python3-gdal - - -### 3. Add dockerize to allow waiting for the DB to load. -RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz - -### 4. Create working directory -RUN mkdir /app -COPY . /app/ -WORKDIR /app - -### 5. Install packages -RUN set -e; \ - /usr/local/bin/python -m pip install --upgrade pip ;\ - python -m pip install pip-tools ;\ - python -m pip install -r /app/requirements_test.txt ; -### 6. Expose port -EXPOSE 8010 \ No newline at end of file From 4b46fe0a7c5d43aa2a4100b0f2307c5e1b837e7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:37:57 +0000 Subject: [PATCH 3/4] Bump gitpython from 3.1.32 to 3.1.34 Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.32 to 3.1.34. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.32...3.1.34) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_test.txt b/requirements_test.txt index 306186b7..73d01ad8 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -181,7 +181,7 @@ gevent==22.10.2 # via -r requirements.in gitdb==4.0.10 # via gitpython -gitpython==3.1.32 +gitpython==3.1.34 # via -r requirements_test.in greenlet==2.0.2 # via gevent From bd896cdc3d0d79a8d7135f6a602df9af1358963c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 08:14:49 +0000 Subject: [PATCH 4/4] Bump gitpython from 3.1.34 to 3.1.35 Bumps [gitpython](https://github.com/gitpython-developers/GitPython) from 3.1.34 to 3.1.35. - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](https://github.com/gitpython-developers/GitPython/compare/3.1.34...3.1.35) --- updated-dependencies: - dependency-name: gitpython dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_test.txt b/requirements_test.txt index 73d01ad8..e302cd98 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -181,7 +181,7 @@ gevent==22.10.2 # via -r requirements.in gitdb==4.0.10 # via gitpython -gitpython==3.1.34 +gitpython==3.1.35 # via -r requirements_test.in greenlet==2.0.2 # via gevent