From 54644b86f5b3513d548fb4e7939e673f29e4a6f7 Mon Sep 17 00:00:00 2001 From: Anas Date: Wed, 1 Sep 2021 15:31:23 +0100 Subject: [PATCH 01/15] ci(GA): disable Deploy step on dev --- .github/workflows/activity_ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/activity_ci_cd.yml b/.github/workflows/activity_ci_cd.yml index 3c1c8bed..e4e45094 100644 --- a/.github/workflows/activity_ci_cd.yml +++ b/.github/workflows/activity_ci_cd.yml @@ -140,7 +140,7 @@ jobs: Deploy: needs: Build_and_push_image runs-on: ubuntu-latest - if: github.ref == 'refs/heads/develop' || github.event_name == 'release' + if: github.event_name == 'release' container: image: yagami22/ci-deploy-image steps: From c659a6f6c6d3e7ff0886afcd0eba6e928eeaebea Mon Sep 17 00:00:00 2001 From: Anas Date: Wed, 1 Sep 2021 15:37:24 +0100 Subject: [PATCH 02/15] CI(GA): ignore changes to docs and Markdown files on PRs --- .github/workflows/activity_ci_cd.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/activity_ci_cd.yml b/.github/workflows/activity_ci_cd.yml index e4e45094..a5408b8a 100644 --- a/.github/workflows/activity_ci_cd.yml +++ b/.github/workflows/activity_ci_cd.yml @@ -7,6 +7,9 @@ on: pull_request: branches: - develop + paths-ignore: + - 'docs/**' + - '*.md' release: types: - published From e557aba97e9d6ca36578cd789c38cd2604ecbff8 Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 2 Sep 2021 16:51:06 +0100 Subject: [PATCH 03/15] WIP(PIP): first draft of direct dependencies Tests are passing and the server runs --- requirements.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 requirements.in diff --git a/requirements.in b/requirements.in new file mode 100644 index 00000000..162f673a --- /dev/null +++ b/requirements.in @@ -0,0 +1,52 @@ +coverage==5.0.3 +Django==2.2.13 +django-appconf==1.0.3 +django-bootstrap-modal-forms==1.5.0 +django-ckeditor==5.7.0 +django-crispy-forms==1.7.2 +django-debug-toolbar==1.11 +django-extensions==2.1.6 +django-filter==2.1.0 +django-geojson==2.12.0 +django-import-export==1.2.0 +django-js-asset==1.2.2 +django-leaflet==0.24.0 +django-localflavor==2.1 +django-map-widgets==0.2.2 +django-mathfilters==0.4.0 +django-multiupload==0.5.2 +django-registration==3.1.2 +django-report-utils==0.3.15 +django-rest-swagger==2.2.0 +django-select2==7.2.2 +django-simple-history==2.7.2 +django-tables2==2.0.6 +django-uuidfield==0.5.0 +django-wysiwyg==0.8.0 +djangorestframework==3.11.2 + +flake8==3.7.9 + + +#Jinja2==2.11.3 + +pendulum==2.0.5 +Pillow==8.2.0 +# pluggy==0.13.1 +psycopg2-binary==2.8.4 + +pylint==2.5.2 + + +pytest==5.4.1 + +pytz==2019.1 +requests==2.21.0 +requests-oauthlib==1.2.0 +simplejson==3.16.0 +six==1.12.0 +social-auth-app-django==3.1.0 + +WeasyPrint==47 +whitenoise==5.0.1 + From 6513fd98759ab31b8289d78002a7513db8021948 Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 2 Sep 2021 16:51:28 +0100 Subject: [PATCH 04/15] chore: delete unused YAML environment file --- environment.yml | 100 ------------------------------------------------ 1 file changed, 100 deletions(-) delete mode 100644 environment.yml diff --git a/environment.yml b/environment.yml deleted file mode 100644 index f4480a9d..00000000 --- a/environment.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: activityenv -channels: - - conda-forge - - defaults -dependencies: - - bzip2=1.0.6=h14c3975_1002 - - ca-certificates=2019.3.9=hecc5488_0 - - certifi=2019.3.9=py37_0 - - libffi=3.2.1=he1b5a44_1006 - - libgcc-ng=8.2.0=hdf63c60_1 - - libstdcxx-ng=8.2.0=hdf63c60_1 - - ncurses=6.1=hf484d3e_1002 - - openssl=1.1.1b=h14c3975_1 - - pip=19.1=py37_0 - - python=3.7.3=h5b0a415_0 - - readline=7.0=hf8c457e_1001 - - setuptools=41.0.1=py37_0 - - sqlite=3.26.0=h67949de_1001 - - tk=8.6.9=h84994c4_1001 - - wheel=0.33.1=py37_0 - - xz=5.2.4=h14c3975_1001 - - zlib=1.2.11=h14c3975_1004 - - pip: - - altgraph==0.16.1 - - backports-csv==1.0.7 - - cairocffi==1.0.2 - - cairosvg==2.3.1 - - cffi==1.12.3 - - chardet==3.0.4 - - confusable-homoglyphs==3.2.0 - - coreapi==2.3.3 - - coreschema==0.0.4 - - cssselect2==0.2.1 - - defusedxml==0.6.0 - - dicttoxml==1.7.4 - - diff-match-patch==20181111 - - django==2.2 - - django-ckeditor==5.7.0 - - django-crispy-forms==1.7.2 - - django-debug-toolbar==1.11 - - django-extensions==2.1.6 - - django-filter==2.1.0 - - django-geojson==2.12.0 - - django-import-export==1.2.0 - - django-js-asset==1.2.2 - - django-leaflet==0.24.0 - - django-localflavor==2.1 - - django-mathfilters==0.4.0 - - django-multiupload==0.5.2 - - django-registration==3.0 - - django-report-utils==0.3.15 - - django-rest-swagger==2.2.0 - - django-simple-history==2.7.2 - - django-tables2==2.0.6 - - django-uuidfield==0.5.0 - - django-wysiwyg==0.8.0 - - djangorestframework==3.9.3 - - et-xmlfile==1.0.1 - - html5lib==1.0.1 - - httplib2==0.12.3 - - idna==2.8 - - itypes==1.1.0 - - jdcal==1.4.1 - - jinja2==2.10.1 - - macholib==1.11 - - markupsafe==1.1.1 - - mysqlclient==1.4.2.post1 - - oauthlib==3.0.1 - - odfpy==1.4.0 - - openapi-codec==1.3.2 - - openpyxl==2.6.2 - - pillow==6.0.0 - - pyasn1==0.4.5 - - pycparser==2.19 - - pyjwt==1.7.1 - - pyphen==0.9.5 - - python-dateutil==2.8.0 - - python-logstash==0.4.6 - - python3-ldap==0.9.8.4 - - python3-openid==3.1.0 - - pytz==2019.1 - - pyyaml==5.1 - - reportlab==3.5.21 - - requests==2.21.0 - - requests-oauthlib==1.2.0 - - simplejson==3.16.0 - - six==1.12.0 - - social-auth-app-django==3.1.0 - - social-auth-core==3.1.0 - - sqlparse==0.3.0 - - tablib==0.13.0 - - tinycss2==1.0.2 - - uritemplate==3.0.0 - - urllib3==1.24.3 - - weasyprint==47 - - webencodings==0.5.1 - - xlrd==1.2.0 - - xlwt==1.3.0 -prefix: /home/user/anaconda3/envs/activityenv - From fe10636cc72b2703052ed3d6b6afcc109f1796ac Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 2 Sep 2021 19:27:40 +0100 Subject: [PATCH 05/15] chore(PIP): generate requirements.txt file using pip-tools --- requirements.txt | 254 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 201 insertions(+), 53 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f5ab3df..fa26376d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,104 +1,252 @@ -altgraph==0.16.1 -atomicwrites==1.3.0 -attrs==19.3.0 -backports.csv==1.0.7 -cairocffi==1.0.2 -CairoSVG==2.5.1 -certifi==2019.3.9 -cffi==1.12.3 +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile requirements.in +# +astroid==2.5 + # via pylint +attrs==21.2.0 + # via pytest +cairocffi==1.2.0 + # via + # cairosvg + # weasyprint +cairosvg==2.5.2 + # via weasyprint +certifi==2021.5.30 + # via requests +cffi==1.14.6 + # via + # cairocffi + # cryptography + # weasyprint chardet==3.0.4 -colorama==0.4.3 + # via requests confusable-homoglyphs==3.2.0 + # via django-registration coreapi==2.3.3 + # via + # django-rest-swagger + # openapi-codec coreschema==0.0.4 + # via coreapi coverage==5.0.3 -coveralls==1.11.1 -cssselect2==0.2.1 -defusedxml==0.6.0 -dicttoxml==1.7.4 -diff-match-patch==20181111 -Django==2.2.24 + # via -r requirements.in +cryptography==3.4.8 + # via social-auth-core +cssselect2==0.4.1 + # via + # cairosvg + # weasyprint +defusedxml==0.7.1 + # via + # cairosvg + # python3-openid + # social-auth-core +diff-match-patch==20200713 + # via django-import-export +django==2.2.13 + # via + # -r requirements.in + # django-appconf + # django-bootstrap-modal-forms + # django-debug-toolbar + # django-filter + # django-geojson + # django-import-export + # django-leaflet + # django-localflavor + # django-multiupload + # django-registration + # django-report-utils + # django-select2 + # django-tables2 + # django-uuidfield + # djangorestframework django-appconf==1.0.3 + # via + # -r requirements.in + # django-select2 django-bootstrap-modal-forms==1.5.0 + # via -r requirements.in django-ckeditor==5.7.0 + # via -r requirements.in django-crispy-forms==1.7.2 + # via -r requirements.in django-debug-toolbar==1.11 + # via -r requirements.in django-extensions==2.1.6 + # via -r requirements.in django-filter==2.1.0 + # via -r requirements.in django-geojson==2.12.0 + # via -r requirements.in django-import-export==1.2.0 + # via -r requirements.in django-js-asset==1.2.2 + # via + # -r requirements.in + # django-ckeditor django-leaflet==0.24.0 + # via -r requirements.in django-localflavor==2.1 + # via -r requirements.in django-map-widgets==0.2.2 + # via -r requirements.in django-mathfilters==0.4.0 + # via -r requirements.in django-multiupload==0.5.2 + # via -r requirements.in django-registration==3.1.2 + # via -r requirements.in django-report-utils==0.3.15 + # via -r requirements.in django-rest-swagger==2.2.0 + # via -r requirements.in django-select2==7.2.2 + # via -r requirements.in django-simple-history==2.7.2 + # via -r requirements.in django-tables2==2.0.6 + # via -r requirements.in django-uuidfield==0.5.0 + # via -r requirements.in django-wysiwyg==0.8.0 + # via -r requirements.in djangorestframework==3.11.2 -docopt==0.6.2 + # via + # -r requirements.in + # django-rest-swagger entrypoints==0.3 -et-xmlfile==1.0.1 + # via flake8 flake8==3.7.9 -html5lib==1.0.1 -httplib2==0.19.0 + # via -r requirements.in +html5lib==1.1 + # via weasyprint idna==2.8 -importlib-metadata==1.5.0 -itypes==1.1.0 -jdcal==1.4.1 -Jinja2==2.11.3 -macholib==1.11 -MarkupSafe==1.1.1 + # via requests +isort==4.3.21 + # via pylint +itypes==1.2.0 + # via coreapi +jinja2==3.0.1 + # via coreschema +lazy-object-proxy==1.6.0 + # via astroid +markupsafe==2.0.1 + # via jinja2 mccabe==0.6.1 -more-itertools==8.2.0 -oauthlib==3.0.1 -odfpy==1.4.0 + # via + # flake8 + # pylint +more-itertools==8.8.0 + # via pytest +oauthlib==3.1.1 + # via + # requests-oauthlib + # social-auth-core openapi-codec==1.3.2 -openpyxl==2.6.2 -packaging==20.3 + # via django-rest-swagger +packaging==21.0 + # via pytest pendulum==2.0.5 -Pillow==8.2.0 + # via -r requirements.in +pillow==8.2.0 + # via + # -r requirements.in + # cairosvg pluggy==0.13.1 + # via pytest psycopg2-binary==2.8.4 + # via -r requirements.in py==1.10.0 -pyasn1==0.4.5 + # via pytest pycodestyle==2.5.0 -pycparser==2.19 + # via flake8 +pycparser==2.20 + # via cffi pyflakes==2.1.1 -PyJWT==1.7.1 + # via flake8 +pyjwt==2.1.0 + # via social-auth-core pylint==2.5.2 -pyparsing==2.4.6 -Pyphen==0.9.5 + # via -r requirements.in +pyparsing==2.4.7 + # via packaging +pyphen==0.11.0 + # via weasyprint pytest==5.4.1 -python-dateutil==2.8.0 -python-logstash==0.4.6 -python3-ldap==0.9.8.4 -python3-openid==3.1.0 + # via -r requirements.in +python-dateutil==2.8.2 + # via pendulum +python3-openid==3.2.0 + # via social-auth-core pytz==2019.1 -pytzdata==2019.3 -PyYAML==5.4 -reportlab==3.5.21 + # via + # -r requirements.in + # django +pytzdata==2020.1 + # via pendulum requests==2.21.0 + # via + # -r requirements.in + # coreapi + # requests-oauthlib + # social-auth-core requests-oauthlib==1.2.0 + # via + # -r requirements.in + # social-auth-core simplejson==3.16.0 + # via + # -r requirements.in + # django-rest-swagger six==1.12.0 + # via + # -r requirements.in + # django-appconf + # django-extensions + # django-geojson + # django-report-utils + # django-simple-history + # html5lib + # python-dateutil + # social-auth-app-django social-auth-app-django==3.1.0 -social-auth-core==3.1.0 -sqlparse==0.3.0 -tablib==0.13.0 -tinycss2==1.0.2 -uritemplate==3.0.0 + # via -r requirements.in +social-auth-core==4.1.0 + # via social-auth-app-django +sqlparse==0.4.1 + # via + # django + # django-debug-toolbar +tablib==3.0.0 + # via django-import-export +tinycss2==1.1.0 + # via + # cairosvg + # cssselect2 + # weasyprint +toml==0.10.2 + # via pylint +uritemplate==3.0.1 + # via coreapi urllib3==1.24.3 -wcwidth==0.1.8 -WeasyPrint==47 + # via requests +wcwidth==0.2.5 + # via pytest +weasyprint==47 + # via -r requirements.in webencodings==0.5.1 + # via + # cssselect2 + # html5lib + # tinycss2 whitenoise==5.0.1 -xlrd==1.2.0 -xlwt==1.3.0 -zipp==3.1.0 + # via -r requirements.in +wrapt==1.12.1 + # via astroid + +# The following packages are considered to be unsafe in a requirements file: +# setuptools From 76e3f38f8b21579a0fda3eb8a3876a9384831cac Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 2 Sep 2021 19:55:49 +0100 Subject: [PATCH 06/15] refactor(PIP): comment out undirect or unused dependencies --- requirements.in | 42 +++++++++++++++++++++--------------------- requirements.txt | 42 ++++-------------------------------------- 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/requirements.in b/requirements.in index 162f673a..06dfd7eb 100644 --- a/requirements.in +++ b/requirements.in @@ -1,23 +1,28 @@ coverage==5.0.3 Django==2.2.13 -django-appconf==1.0.3 -django-bootstrap-modal-forms==1.5.0 -django-ckeditor==5.7.0 -django-crispy-forms==1.7.2 +# django-appconf==1.0.3 +# django-bootstrap-modal-forms==1.5.0 +django-ckeditor==5.7.0 # All references are in the initial commit +django-crispy-forms==1.7.2 # ? + django-debug-toolbar==1.11 + django-extensions==2.1.6 -django-filter==2.1.0 -django-geojson==2.12.0 -django-import-export==1.2.0 -django-js-asset==1.2.2 -django-leaflet==0.24.0 -django-localflavor==2.1 -django-map-widgets==0.2.2 -django-mathfilters==0.4.0 -django-multiupload==0.5.2 -django-registration==3.1.2 -django-report-utils==0.3.15 +django-filter==2.1.0 # Used. All references very old +# django-geojson==2.12.0 +django-import-export==1.2.0 # Is it really used? + +# django-leaflet==0.24.0 +# django-localflavor==2.1 +# django-map-widgets==0.2.2 + +django-mathfilters==0.4.0 # Only used in templates/workflow/projectdashboard_list.html +# django-multiupload==0.5.2 +# django-registration==3.1.2 +# django-report-utils==0.3.15 + django-rest-swagger==2.2.0 + django-select2==7.2.2 django-simple-history==2.7.2 django-tables2==2.0.6 @@ -27,12 +32,8 @@ djangorestframework==3.11.2 flake8==3.7.9 - -#Jinja2==2.11.3 - pendulum==2.0.5 Pillow==8.2.0 -# pluggy==0.13.1 psycopg2-binary==2.8.4 pylint==2.5.2 @@ -42,9 +43,8 @@ pytest==5.4.1 pytz==2019.1 requests==2.21.0 -requests-oauthlib==1.2.0 simplejson==3.16.0 -six==1.12.0 +# six==1.12.0 social-auth-app-django==3.1.0 WeasyPrint==47 diff --git a/requirements.txt b/requirements.txt index fa26376d..f9248fa8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile requirements.in +# pip-compile # astroid==2.5 # via pylint @@ -23,8 +23,6 @@ cffi==1.14.6 # weasyprint chardet==3.0.4 # via requests -confusable-homoglyphs==3.2.0 - # via django-registration coreapi==2.3.3 # via # django-rest-swagger @@ -50,26 +48,15 @@ django==2.2.13 # via # -r requirements.in # django-appconf - # django-bootstrap-modal-forms # django-debug-toolbar # django-filter - # django-geojson # django-import-export - # django-leaflet - # django-localflavor - # django-multiupload - # django-registration - # django-report-utils # django-select2 # django-tables2 # django-uuidfield # djangorestframework django-appconf==1.0.3 - # via - # -r requirements.in - # django-select2 -django-bootstrap-modal-forms==1.5.0 - # via -r requirements.in + # via django-select2 django-ckeditor==5.7.0 # via -r requirements.in django-crispy-forms==1.7.2 @@ -80,28 +67,12 @@ django-extensions==2.1.6 # via -r requirements.in django-filter==2.1.0 # via -r requirements.in -django-geojson==2.12.0 - # via -r requirements.in django-import-export==1.2.0 # via -r requirements.in django-js-asset==1.2.2 - # via - # -r requirements.in - # django-ckeditor -django-leaflet==0.24.0 - # via -r requirements.in -django-localflavor==2.1 - # via -r requirements.in -django-map-widgets==0.2.2 - # via -r requirements.in + # via django-ckeditor django-mathfilters==0.4.0 # via -r requirements.in -django-multiupload==0.5.2 - # via -r requirements.in -django-registration==3.1.2 - # via -r requirements.in -django-report-utils==0.3.15 - # via -r requirements.in django-rest-swagger==2.2.0 # via -r requirements.in django-select2==7.2.2 @@ -195,20 +166,15 @@ requests==2.21.0 # requests-oauthlib # social-auth-core requests-oauthlib==1.2.0 - # via - # -r requirements.in - # social-auth-core + # via social-auth-core simplejson==3.16.0 # via # -r requirements.in # django-rest-swagger six==1.12.0 # via - # -r requirements.in # django-appconf # django-extensions - # django-geojson - # django-report-utils # django-simple-history # html5lib # python-dateutil From 4215724c4df2f278eb686953084ea46d70a87bf0 Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 2 Sep 2021 19:58:31 +0100 Subject: [PATCH 07/15] feat(PIP): define dev requirements --- dev-requirements.in | 3 +++ dev-requirements.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 dev-requirements.in create mode 100644 dev-requirements.txt diff --git a/dev-requirements.in b/dev-requirements.in new file mode 100644 index 00000000..95c18ad9 --- /dev/null +++ b/dev-requirements.in @@ -0,0 +1,3 @@ +flake8==3.7.9 +pylint==2.5.2 +pytest==5.4.1 diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 00000000..efa7129e --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,46 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile dev-requirements.in +# +astroid==2.5 + # via pylint +attrs==21.2.0 + # via pytest +entrypoints==0.3 + # via flake8 +flake8==3.7.9 + # via -r dev-requirements.in +isort==4.3.21 + # via pylint +lazy-object-proxy==1.6.0 + # via astroid +mccabe==0.6.1 + # via + # flake8 + # pylint +more-itertools==8.8.0 + # via pytest +packaging==21.0 + # via pytest +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pycodestyle==2.5.0 + # via flake8 +pyflakes==2.1.1 + # via flake8 +pylint==2.5.2 + # via -r dev-requirements.in +pyparsing==2.4.7 + # via packaging +pytest==5.4.1 + # via -r dev-requirements.in +toml==0.10.2 + # via pylint +wcwidth==0.2.5 + # via pytest +wrapt==1.12.1 + # via astroid From 9b816616df6ea8468c21cf65f0a741e589bbc854 Mon Sep 17 00:00:00 2001 From: Anas Date: Fri, 3 Sep 2021 20:20:16 +0100 Subject: [PATCH 08/15] chore(PIP): move Django debug toolbar to dev deps --- dev-requirements.in | 1 + requirements.in | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dev-requirements.in b/dev-requirements.in index 95c18ad9..bcbf4a85 100644 --- a/dev-requirements.in +++ b/dev-requirements.in @@ -1,3 +1,4 @@ +django-debug-toolbar==1.11 flake8==3.7.9 pylint==2.5.2 pytest==5.4.1 diff --git a/requirements.in b/requirements.in index 06dfd7eb..3afb9f8a 100644 --- a/requirements.in +++ b/requirements.in @@ -1,25 +1,17 @@ coverage==5.0.3 Django==2.2.13 -# django-appconf==1.0.3 -# django-bootstrap-modal-forms==1.5.0 django-ckeditor==5.7.0 # All references are in the initial commit django-crispy-forms==1.7.2 # ? -django-debug-toolbar==1.11 - django-extensions==2.1.6 django-filter==2.1.0 # Used. All references very old # django-geojson==2.12.0 django-import-export==1.2.0 # Is it really used? -# django-leaflet==0.24.0 # django-localflavor==2.1 # django-map-widgets==0.2.2 django-mathfilters==0.4.0 # Only used in templates/workflow/projectdashboard_list.html -# django-multiupload==0.5.2 -# django-registration==3.1.2 -# django-report-utils==0.3.15 django-rest-swagger==2.2.0 @@ -30,23 +22,15 @@ django-uuidfield==0.5.0 django-wysiwyg==0.8.0 djangorestframework==3.11.2 -flake8==3.7.9 pendulum==2.0.5 Pillow==8.2.0 psycopg2-binary==2.8.4 -pylint==2.5.2 - - -pytest==5.4.1 - pytz==2019.1 requests==2.21.0 simplejson==3.16.0 -# six==1.12.0 social-auth-app-django==3.1.0 WeasyPrint==47 whitenoise==5.0.1 - From 4a3e50151a23dc4892bbbf38ea0697f4298cfa35 Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 6 Sep 2021 17:04:58 +0100 Subject: [PATCH 09/15] chore: remove Pipfile and package-lock files --- Pipfile.lock | 796 ---------------------------------------------- package-lock.json | 3 - 2 files changed, 799 deletions(-) delete mode 100644 Pipfile.lock delete mode 100644 package-lock.json diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index b31e38bc..00000000 --- a/Pipfile.lock +++ /dev/null @@ -1,796 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "5efdc47ec473b0b4b33f239ca00ae6f5676ab0a0020b378c99c29c067d286642" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.6" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "altgraph": { - "hashes": [ - "sha256:d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997", - "sha256:ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c" - ], - "index": "pypi", - "version": "==0.16.1" - }, - "backports-csv": { - "hashes": [ - "sha256:21f6e09bab589e6c1f877edbc40277b65e626262a86e69a70137db714eaac5ce" - ], - "index": "pypi", - "version": "==1.0.7" - }, - "backports.csv": { - "hashes": [ - "sha256:1277dfff73130b2e106bf3dd347adb3c5f6c4340882289d88f31240da92cbd6d", - "sha256:21f6e09bab589e6c1f877edbc40277b65e626262a86e69a70137db714eaac5ce" - ], - "version": "==1.0.7" - }, - "cairocffi": { - "hashes": [ - "sha256:01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff" - ], - "index": "pypi", - "version": "==1.0.2" - }, - "cairosvg": { - "hashes": [ - "sha256:b5b67bc598f73693490b1bed8bc6e0ae447cf3a6d986c285db309343b90786ee", - "sha256:c4fdf392a6730fd70edf6f9d3b7185150cf011b9d134839b3e98a2c8aba8d6d1" - ], - "index": "pypi", - "version": "==2.3.1" - }, - "certifi": { - "hashes": [ - "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", - "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" - ], - "index": "pypi", - "version": "==2019.3.9" - }, - "cffi": { - "hashes": [ - "sha256:041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774", - "sha256:046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d", - "sha256:066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90", - "sha256:066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b", - "sha256:2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63", - "sha256:300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45", - "sha256:34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25", - "sha256:46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3", - "sha256:4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b", - "sha256:4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647", - "sha256:4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016", - "sha256:50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4", - "sha256:55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb", - "sha256:5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753", - "sha256:59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7", - "sha256:73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9", - "sha256:a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f", - "sha256:a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8", - "sha256:a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f", - "sha256:a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc", - "sha256:ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42", - "sha256:b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3", - "sha256:d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909", - "sha256:d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45", - "sha256:dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d", - "sha256:e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512", - "sha256:e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff", - "sha256:ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201" - ], - "index": "pypi", - "version": "==1.12.3" - }, - "chardet": { - "hashes": [ - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" - ], - "index": "pypi", - "version": "==3.0.4" - }, - "confusable-homoglyphs": { - "hashes": [ - "sha256:3b4a0d9fa510669498820c91a0bfc0c327568cecec90648cf3819d4a6fc6a751", - "sha256:e3ce611028d882b74a5faa69e3cbb5bd4dcd9f69936da6e73d33eda42c917944" - ], - "index": "pypi", - "version": "==3.2.0" - }, - "coreapi": { - "hashes": [ - "sha256:46145fcc1f7017c076a2ef684969b641d18a2991051fddec9458ad3f78ffc1cb", - "sha256:bf39d118d6d3e171f10df9ede5666f63ad80bba9a29a8ec17726a66cf52ee6f3" - ], - "index": "pypi", - "version": "==2.3.3" - }, - "coreschema": { - "hashes": [ - "sha256:5e6ef7bf38c1525d5e55a895934ab4273548629f16aed5c0a6caa74ebf45551f", - "sha256:9503506007d482ab0867ba14724b93c18a33b22b6d19fb419ef2d239dd4a1607" - ], - "index": "pypi", - "version": "==0.0.4" - }, - "cssselect2": { - "hashes": [ - "sha256:267eebc7378ade2e8be710cd0179606ad9c95ecc673138fccfcfba42c5ce153d", - "sha256:505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab" - ], - "index": "pypi", - "version": "==0.2.1" - }, - "defusedxml": { - "hashes": [ - "sha256:6687150770438374ab581bb7a1b327a847dd9c5749e396102de3fad4e8a3ef93", - "sha256:f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5" - ], - "index": "pypi", - "version": "==0.6.0" - }, - "dicttoxml": { - "hashes": [ - "sha256:ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45" - ], - "index": "pypi", - "version": "==1.7.4" - }, - "diff-match-patch": { - "hashes": [ - "sha256:a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb" - ], - "index": "pypi", - "version": "==20181111" - }, - "django": { - "hashes": [ - "sha256:16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86", - "sha256:89c2007ca4fa5b351a51a279eccff298520783b713bf28efb89dfb81c80ea49b" - ], - "index": "pypi", - "version": "==2.2.13" - }, - "django-appconf": { - "hashes": [ - "sha256:35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3", - "sha256:c98a7af40062e996b921f5962a1c4f3f0c979fa7885f7be4710cceb90ebe13a6" - ], - "version": "==1.0.3" - }, - "django-ckeditor": { - "hashes": [ - "sha256:852ae92358a3209727d5fa4acc97088bfadf58b643b8aa967ca4feb7792427d4", - "sha256:c9ac3bbd48e269f54c3eb718aaee5252d99a9bca08417e2c02e1e49d989f0881" - ], - "index": "pypi", - "version": "==5.7.0" - }, - "django-crispy-forms": { - "hashes": [ - "sha256:5952bab971110d0b86c278132dae0aa095beee8f723e625c3d3fa28888f1675f", - "sha256:705ededc554ad8736157c666681165fe22ead2dec0d5446d65fc9dd976a5a876" - ], - "index": "pypi", - "version": "==1.7.2" - }, - "django-debug-toolbar": { - "hashes": [ - "sha256:89d75b60c65db363fb24688d977e5fbf0e73386c67acf562d278402a10fc3736", - "sha256:c2b0134119a624f4ac9398b44f8e28a01c7686ac350a12a74793f3dd57a9eea0" - ], - "index": "pypi", - "version": "==1.11" - }, - "django-extensions": { - "hashes": [ - "sha256:109004f80b6f45ad1f56addaa59debca91d94aa0dc1cb19678b9364b4fe9b6f4", - "sha256:307766e5e6c1caffe76c5d99239d8115d14ae3f7cab2cd991fcffd763dad904b" - ], - "index": "pypi", - "version": "==2.1.6" - }, - "django-filter": { - "hashes": [ - "sha256:3dafb7d2810790498895c22a1f31b2375795910680ac9c1432821cbedb1e176d", - "sha256:a3014de317bef0cd43075a0f08dfa1d319a7ccc5733c3901fb860da70b0dda68" - ], - "index": "pypi", - "version": "==2.1.0" - }, - "django-geojson": { - "hashes": [ - "sha256:7a892e1f8f17f10ffbced9f737c347eae975eb340cd3f00bc9e3896ecce4135d" - ], - "index": "pypi", - "version": "==2.12.0" - }, - "django-import-export": { - "hashes": [ - "sha256:830824f79aae39e4212bb03aabdd83dc57931420557b757981cf6add8d07e611", - "sha256:99fae7d963af4ade97af9237a843f250312421fa4ee350a3b735fcc5684c3fb5" - ], - "index": "pypi", - "version": "==1.2.0" - }, - "django-js-asset": { - "hashes": [ - "sha256:8ec12017f26eec524cab436c64ae73033368a372970af4cf42d9354fcb166bdd", - "sha256:c163ae80d2e0b22d8fb598047cd0dcef31f81830e127cfecae278ad574167260" - ], - "index": "pypi", - "version": "==1.2.2" - }, - "django-leaflet": { - "hashes": [ - "sha256:efdf98ae0bb52f1c5e0fdceb20b870dc6a58378340366a9083f857ccea66117b" - ], - "index": "pypi", - "version": "==0.24.0" - }, - "django-localflavor": { - "hashes": [ - "sha256:0cee94c4b8f0214a5ba7be7e935019a8c062f4e7726d1df4b1e453cb812b2039", - "sha256:12ce98b13adcd68bb4babcd937d0ae5a0fd5801f71acaf9a6bf1784c218ef53c" - ], - "index": "pypi", - "version": "==2.1" - }, - "django-mathfilters": { - "hashes": [ - "sha256:530774776e5bbf8061c95e3542166fa8a4ec4cd8992b6dc9f3cad866c71051b5", - "sha256:e570e113a92dd54125fc2066a93b509a521d3f42a4502731775d0f7b92acc3e8" - ], - "index": "pypi", - "version": "==0.4.0" - }, - "django-multiupload": { - "hashes": [ - "sha256:0a4193efbe2bfb1e8cd14b2df11de6a36923ddf2458ce97a70306a25b8bf4e60", - "sha256:43789280095fc5491dff3a6da22280571bb79333427e6ba007298165e128ad93" - ], - "index": "pypi", - "version": "==0.5.2" - }, - "django-registration": { - "hashes": [ - "sha256:0527be82f3f62233c7b7a4fe6b0217832cbde2c6d8ea5008e8233a764f9a2543", - "sha256:8f1960d1780804b67afb6b202c98cdfaca030a202bc7a263bf80e32f9c8a6984" - ], - "index": "pypi", - "version": "==3.0" - }, - "django-report-utils": { - "hashes": [ - "sha256:66584f5a025f493fafc1a0b7999443535c8c89932e5d7aeea1715603414c3475", - "sha256:f3d922d8efcc28cac3b2a4fc5809c28348d43b64005e283231ee38aa57cf8204" - ], - "index": "pypi", - "version": "==0.3.15" - }, - "django-rest-swagger": { - "hashes": [ - "sha256:48f6aded9937e90ae7cbe9e6c932b9744b8af80cc4e010088b3278c700e0685b", - "sha256:b039b0288bab4665cd45dc5d16f94b13911bc4ad0ed55f74ad3b90aa31c87c17" - ], - "index": "pypi", - "version": "==2.2.0" - }, - "django-select2": { - "hashes": [ - "sha256:4c531cb7e9eb4152c7e5f8ab83be386f46978b3d80e91e55ad1fb46382222a0b", - "sha256:d17bb0e64503a7e52ba405f73a187664906cefda5f1c33971c67ab0b3891e91c" - ], - "index": "pypi", - "version": "==7.2.0" - }, - "django-simple-history": { - "hashes": [ - "sha256:63736301576c04ee4b3a3b28ad17b10a0666b988f6f5ee5990edb29c2de6475d", - "sha256:652979d2091cb1230104d930c1e335feb267feb1784c2aa95b5d334a5748b079" - ], - "index": "pypi", - "version": "==2.7.2" - }, - "django-tables2": { - "hashes": [ - "sha256:11d914910745d6826ba2226f45ee7fc38dbc471dd62992b4204c6ee68ec10689", - "sha256:98038606603a157b79bb7564e589d1f21050c463d12c59d5b3848eba9e10a0ae" - ], - "index": "pypi", - "version": "==2.0.6" - }, - "django-uuidfield": { - "hashes": [ - "sha256:ec7db94ff6fc5b2a2f8edf6a9ab29b401a6a63d4523840fa0a3f1286ea45de86" - ], - "index": "pypi", - "version": "==0.5.0" - }, - "django-wysiwyg": { - "hashes": [ - "sha256:4de7214c0da50807cf1bef32d1ad16976048006d187a1b8daf0380ed326c424d", - "sha256:7c37c685379fa23402f415ba7f8f6bce3552d3836ed2cf99e37591e1cc0dffc3" - ], - "index": "pypi", - "version": "==0.8.0" - }, - "djangorestframework": { - "hashes": [ - "sha256:1d22971a5fc98becdbbad9710ca2a9148dd339f6cbea4c3ddbed2cb84bab94e1", - "sha256:2884763160b997073ff1e937bd820a69d23978902a3ccd0ba53a217e196239f0" - ], - "index": "pypi", - "version": "==3.9.3" - }, - "et-xmlfile": { - "hashes": [ - "sha256:614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" - ], - "index": "pypi", - "version": "==1.0.1" - }, - "html5lib": { - "hashes": [ - "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3", - "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736" - ], - "index": "pypi", - "version": "==1.0.1" - }, - "httplib2": { - "hashes": [ - "sha256:23914b5487dfe8ef09db6656d6d63afb0cf3054ad9ebc50868ddc8e166b5f8e8", - "sha256:a18121c7c72a56689efbf1aef990139ad940fee1e64c6f2458831736cd593600" - ], - "index": "pypi", - "version": "==0.18.0" - }, - "idna": { - "hashes": [ - "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", - "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" - ], - "index": "pypi", - "version": "==2.8" - }, - "itypes": { - "hashes": [ - "sha256:c6e77bb9fd68a4bfeb9d958fea421802282451a25bac4913ec94db82a899c073" - ], - "index": "pypi", - "version": "==1.1.0" - }, - "jdcal": { - "hashes": [ - "sha256:1abf1305fce18b4e8aa248cf8fe0c56ce2032392bc64bbd61b5dff2a19ec8bba", - "sha256:472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" - ], - "index": "pypi", - "version": "==1.4.1" - }, - "jinja2": { - "hashes": [ - "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", - "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" - ], - "index": "pypi", - "version": "==2.10.1" - }, - "macholib": { - "hashes": [ - "sha256:ac02d29898cf66f27510d8f39e9112ae00590adb4a48ec57b25028d6962b1ae1", - "sha256:c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db" - ], - "index": "pypi", - "version": "==1.11" - }, - "markupsafe": { - "hashes": [ - "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", - "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", - "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", - "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", - "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", - "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", - "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", - "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", - "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", - "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", - "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", - "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", - "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", - "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", - "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", - "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", - "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", - "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", - "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", - "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", - "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", - "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", - "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", - "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", - "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", - "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", - "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", - "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", - "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", - "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", - "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" - ], - "index": "pypi", - "version": "==1.1.1" - }, - "oauthlib": { - "hashes": [ - "sha256:0ce32c5d989a1827e3f1148f98b9085ed2370fc939bf524c9c851d8714797298", - "sha256:3e1e14f6cde7e5475128d30e97edc3bfb4dc857cb884d8714ec161fdbb3b358e" - ], - "index": "pypi", - "version": "==3.0.1" - }, - "odfpy": { - "hashes": [ - "sha256:596021f0519623ca8717331951c95e3b8d7b21e86edc7efe8cb650a0d0f59a2b" - ], - "index": "pypi", - "version": "==1.4.0" - }, - "openapi-codec": { - "hashes": [ - "sha256:1bce63289edf53c601ea3683120641407ff6b708803b8954c8a876fe778d2145" - ], - "index": "pypi", - "version": "==1.3.2" - }, - "openpyxl": { - "hashes": [ - "sha256:1d2af392cef8c8227bd2ac3ebe3a28b25aba74fd4fa473ce106065f0b73bfe2e" - ], - "index": "pypi", - "version": "==2.6.2" - }, - "pillow": { - "hashes": [ - "sha256:00fdeb23820f30e43bba78eb9abb00b7a937a655de7760b2e09101d63708b64e", - "sha256:01f948e8220c85eae1aa1a7f8edddcec193918f933fb07aaebe0bfbbcffefbf1", - "sha256:08abf39948d4b5017a137be58f1a52b7101700431f0777bec3d897c3949f74e6", - "sha256:099a61618b145ecb50c6f279666bbc398e189b8bc97544ae32b8fcb49ad6b830", - "sha256:2c1c61546e73de62747e65807d2cc4980c395d4c5600ecb1f47a650c6fa78c79", - "sha256:2ed9c4f694861642401f27dc3cb99772be67cd190e84845c749dae0a06c3bfae", - "sha256:338581b30b908e111be578f0297255f6b57a51358cd16fa0e6f664c9a1f88bff", - "sha256:38c7d48a21cd06fdeee93987147b9b1c55b73b4cfcbf83240568bfbd5adee447", - "sha256:43fd026f613c8e48a25eba1a92f4d2ad7f3903c95d8c33a11611a7717d2ab654", - "sha256:4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df", - "sha256:5090857876c58885cfa388dc649e5db30aae98a068c26f3fd0ac9d7d9a4d9572", - "sha256:5bbba34f97a26a93f5e8dec469ca4ddd712451418add43da946dbaed7f7a98d2", - "sha256:65a28969a025a0eb4594637b6103201dc4ed2a9508bdab56ac33e43e3081c404", - "sha256:892bb52b70bd5ea9dbbc3ac44f38e84f5a04e9d8b1bff48159d96cb795b81159", - "sha256:8a9becd5cbd5062f973bcd2e7bc79483af310222de112b6541f8af1f93a3cc42", - "sha256:972a7aaeb7c4a2795b52eef52ee991ef040b31009f36deca6207a986607b55f3", - "sha256:97b119c436bfa96a92ac2ca525f7025836d4d4e64b1c9f9eff8dbaf3ff1d86f3", - "sha256:9ba37698e242223f8053cc158f130aee046a96feacbeab65893dbe94f5530118", - "sha256:b1b0e1f626a0f079c0d3696db70132fb1f29aa87c66aecb6501a9b8be64ce9f7", - "sha256:c14c1224fd1a5be2733530d648a316974dbbb3c946913562c6005a76f21ca042", - "sha256:c79a8546c48ae6465189e54e3245a97ddf21161e33ff7eaa42787353417bb2b6", - "sha256:ceb76935ac4ebdf6d7bc845482a4450b284c6ccfb281e34da51d510658ab34d8", - "sha256:e22bffaad04b4d16e1c091baed7f2733fc1ebb91e0c602abf1b6834d17158b1f", - "sha256:ec883b8e44d877bda6f94a36313a1c6063f8b1997aa091628ae2f34c7f97c8d5", - "sha256:f1baa54d50ec031d1a9beb89974108f8f2c0706f49798f4777df879df0e1adb6", - "sha256:f53a5385932cda1e2c862d89460992911a89768c65d176ff8c50cddca4d29bed" - ], - "index": "pypi", - "version": "==6.2.2" - }, - "psycopg2-binary": { - "hashes": [ - "sha256:040234f8a4a8dfd692662a8308d78f63f31a97e1c42d2480e5e6810c48966a29", - "sha256:086f7e89ec85a6704db51f68f0dcae432eff9300809723a6e8782c41c2f48e03", - "sha256:18ca813fdb17bc1db73fe61b196b05dd1ca2165b884dd5ec5568877cabf9b039", - "sha256:19dc39616850342a2a6db70559af55b22955f86667b5f652f40c0e99253d9881", - "sha256:2166e770cb98f02ed5ee2b0b569d40db26788e0bf2ec3ae1a0d864ea6f1d8309", - "sha256:3a2522b1d9178575acee4adf8fd9f979f9c0449b00b4164bb63c3475ea6528ed", - "sha256:3aa773580f85a28ffdf6f862e59cb5a3cc7ef6885121f2de3fca8d6ada4dbf3b", - "sha256:3b5deaa3ee7180585a296af33e14c9b18c218d148e735c7accf78130765a47e3", - "sha256:407af6d7e46593415f216c7f56ba087a9a42bd6dc2ecb86028760aa45b802bd7", - "sha256:4c3c09fb674401f630626310bcaf6cd6285daf0d5e4c26d6e55ca26a2734e39b", - "sha256:4c6717962247445b4f9e21c962ea61d2e884fc17df5ddf5e35863b016f8a1f03", - "sha256:50446fae5681fc99f87e505d4e77c9407e683ab60c555ec302f9ac9bffa61103", - "sha256:5057669b6a66aa9ca118a2a860159f0ee3acf837eda937bdd2a64f3431361a2d", - "sha256:5dd90c5438b4f935c9d01fcbad3620253da89d19c1f5fca9158646407ed7df35", - "sha256:659c815b5b8e2a55193ede2795c1e2349b8011497310bb936da7d4745652823b", - "sha256:69b13fdf12878b10dc6003acc8d0abf3ad93e79813fd5f3812497c1c9fb9be49", - "sha256:7a1cb80e35e1ccea3e11a48afe65d38744a0e0bde88795cc56a4d05b6e4f9d70", - "sha256:7e6e3c52e6732c219c07bd97fff6c088f8df4dae3b79752ee3a817e6f32e177e", - "sha256:7f42a8490c4fe854325504ce7a6e4796b207960dabb2cbafe3c3959cb00d1d7e", - "sha256:84156313f258eafff716b2961644a4483a9be44a5d43551d554844d15d4d224e", - "sha256:8578d6b8192e4c805e85f187bc530d0f52ba86c39172e61cd51f68fddd648103", - "sha256:890167d5091279a27e2505ff0e1fb273f8c48c41d35c5b92adbf4af80e6b2ed6", - "sha256:98e10634792ac0e9e7a92a76b4991b44c2325d3e7798270a808407355e7bb0a1", - "sha256:9aadff9032e967865f9778485571e93908d27dab21d0fdfdec0ca779bb6f8ad9", - "sha256:9f24f383a298a0c0f9b3113b982e21751a8ecde6615494a3f1470eb4a9d70e9e", - "sha256:a73021b44813b5c84eda4a3af5826dd72356a900bac9bd9dd1f0f81ee1c22c2f", - "sha256:afd96845e12638d2c44d213d4810a08f4dc4a563f9a98204b7428e567014b1cd", - "sha256:b73ddf033d8cd4cc9dfed6324b1ad2a89ba52c410ef6877998422fcb9c23e3a8", - "sha256:b8f490f5fad1767a1331df1259763b3bad7d7af12a75b950c2843ba319b2415f", - "sha256:dbc5cd56fff1a6152ca59445178652756f4e509f672e49ccdf3d79c1043113a4", - "sha256:eac8a3499754790187bb00574ab980df13e754777d346f85e0ff6df929bcd964", - "sha256:eaed1c65f461a959284649e37b5051224f4db6ebdc84e40b5e65f2986f101a08" - ], - "index": "pypi", - "version": "==2.8.4" - }, - "pyasn1": { - "hashes": [ - "sha256:da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7", - "sha256:da6b43a8c9ae93bc80e2739efb38cc776ba74a886e3e9318d65fe81a8b8a2c6e" - ], - "index": "pypi", - "version": "==0.4.5" - }, - "pycparser": { - "hashes": [ - "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" - ], - "index": "pypi", - "version": "==2.19" - }, - "pyjwt": { - "hashes": [ - "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e", - "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96" - ], - "index": "pypi", - "version": "==1.7.1" - }, - "pyphen": { - "hashes": [ - "sha256:3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921", - "sha256:e172faf10992c8c9d369bdc83e36dbcf1121f4ed0d881f1a0b521935aee583b5" - ], - "index": "pypi", - "version": "==0.9.5" - }, - "python-dateutil": { - "hashes": [ - "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", - "sha256:c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e" - ], - "index": "pypi", - "version": "==2.8.0" - }, - "python-logstash": { - "hashes": [ - "sha256:10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c" - ], - "index": "pypi", - "version": "==0.4.6" - }, - "python3-ldap": { - "hashes": [ - "sha256:da4fb40461214835477afb2d31315e607508e6c17daf7de4af1348290a2b8731", - "sha256:f18a0e64f717a60f3bfb74b83a3298830efff0860d90d21619e158a90f9e9494" - ], - "index": "pypi", - "version": "==0.9.8.4" - }, - "python3-openid": { - "hashes": [ - "sha256:0086da6b6ef3161cfe50fb1ee5cceaf2cda1700019fda03c2c5c440ca6abe4fa", - "sha256:628d365d687e12da12d02c6691170f4451db28d6d68d050007e4a40065868502" - ], - "index": "pypi", - "version": "==3.1.0" - }, - "pytz": { - "hashes": [ - "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", - "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141" - ], - "index": "pypi", - "version": "==2019.1" - }, - "pyyaml": { - "hashes": [ - "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", - "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", - "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", - "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", - "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", - "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", - "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", - "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", - "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", - "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", - "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" - ], - "index": "pypi", - "version": "==5.1" - }, - "reportlab": { - "hashes": [ - "sha256:04b9bf35127974f734bddddf48860732361e31c1220c0ebe4f683f19d5cfc3b8", - "sha256:073da867efdf9e0d6cba2a566f5929ef0bb9fb757b53a7132b91db9869441859", - "sha256:08e6e63a4502d3a00062ba9ff9669f95577fbdb1a5f8c6cdb1230c5ee295273a", - "sha256:0960567b9d937a288efa04753536dce1dbb032a1e1f622fd92efbe85b8cccf6e", - "sha256:1870e321c5d7772fd6e5538a89562ed8b40687ed0aec254197dc73e9d700e62f", - "sha256:1eac902958a7f66c30e1115fa1a80bf6a7aa57680427cfcb930e13c746142150", - "sha256:1f6cdcdaf6ab78ab3efd21b23c27e4487a5c0816202c3578b277f441f984a51f", - "sha256:281443252a335489ce4b8b150afccdc01c74daf97e962fd99a8c2d59c8b333d3", - "sha256:2ae66e61b03944c5ed1f3c96bbc51160cce4aa28cbe96f205b464017cdfc851c", - "sha256:34d348575686390676757876fef50f6e32e3a59ff7d549e022b5f3b8a9f7e564", - "sha256:508224a11ec9ef203ae2fd2177e903d36d3b840eeb8ac70747f53eeb373db439", - "sha256:5c497c9597a346d27007507cddc2a792f8ca5017268738fd35c374c224d81988", - "sha256:6e0d9efe78526ddf5ad1d2357f6b2b0f5d7df354ac559358e3d056bdd12fdabf", - "sha256:817dfd400c5e694cbb6eb87bc932cd3d97cf5d79d918329b8f99085a7979bb29", - "sha256:8d6ed4357eb0146501ebdb7226c87ef98a9bcbc6d54401ec676fa905b6355e00", - "sha256:8e681324ce457cc3d5c0949c92d590ac4401347b5df55f6fde207b42316d42d2", - "sha256:926981544d37554b44c6f067c3f94981831f9ef3f2665fa5f4114b23a140f596", - "sha256:92a0bf5cc2d9418115bff46032964d25bb21c0ac8bcdf6bee5769ca810a54a5a", - "sha256:9a3e7495e223fc4a9bdcd356972c230d32bf8c7a57442ca5b8c2ff6b19e6007b", - "sha256:a31f424020176e96a0ff0229f7f251d865c5409ddf074f695b97ba604f173b48", - "sha256:aa0c35b22929c19ecd48d5c1734e420812f269f463d1ef138e0adb28069c3150", - "sha256:b36b555cdbdd51f9f00a7606966ec6d4d30d74c61d1523a1ac56bbeb83a15ed3", - "sha256:cd3d9765b8f446c25d75a4456d8781c4781de0f10f860dff5cb69bbe526e8f53", - "sha256:d3daa4f19d1dc2fc1fc2591e1354edd95439b9e9953ca8b374d41524d434b315", - "sha256:d8f1878bc1fc91c63431e9b0f1940ff18b70c059f6d38f2be1e34ce9ffcc28ea", - "sha256:ddca7479d29f9dfbfc69057764239ec7753b49a3b0dcbed08f70cbef8fccfee6", - "sha256:f28f3a965d15c88c797cf33968bdaa5a04aabcf321d3f6fcf14d7e7fde8d90f3", - "sha256:fcca214bf340f59245fff792134a9ac333d21eeef19a874a69ecc926b4c992a4" - ], - "index": "pypi", - "version": "==3.5.21" - }, - "requests": { - "hashes": [ - "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", - "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" - ], - "index": "pypi", - "version": "==2.21.0" - }, - "requests-oauthlib": { - "hashes": [ - "sha256:bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57", - "sha256:d3ed0c8f2e3bbc6b344fa63d6f933745ab394469da38db16bdddb461c7e25140" - ], - "index": "pypi", - "version": "==1.2.0" - }, - "simplejson": { - "hashes": [ - "sha256:067a7177ddfa32e1483ba5169ebea1bc2ea27f224853211ca669325648ca5642", - "sha256:2fc546e6af49fb45b93bbe878dea4c48edc34083729c0abd09981fe55bdf7f91", - "sha256:354fa32b02885e6dae925f1b5bbf842c333c1e11ea5453ddd67309dc31fdb40a", - "sha256:37e685986cf6f8144607f90340cff72d36acf654f3653a6c47b84c5c38d00df7", - "sha256:3af610ee72efbe644e19d5eaad575c73fb83026192114e5f6719f4901097fce2", - "sha256:3b919fc9cf508f13b929a9b274c40786036b31ad28657819b3b9ba44ba651f50", - "sha256:3dd289368bbd064974d9a5961101f080e939cbe051e6689a193c99fb6e9ac89b", - "sha256:6c3258ffff58712818a233b9737fe4be943d306c40cf63d14ddc82ba563f483a", - "sha256:75e3f0b12c28945c08f54350d91e624f8dd580ab74fd4f1bbea54bc6b0165610", - "sha256:b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5", - "sha256:ee9625fc8ee164902dfbb0ff932b26df112da9f871c32f0f9c1bcf20c350fe2a", - "sha256:fb2530b53c28f0d4d84990e945c2ebb470edb469d63e389bf02ff409012fe7c5" - ], - "index": "pypi", - "version": "==3.16.0" - }, - "six": { - "hashes": [ - "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" - ], - "index": "pypi", - "version": "==1.12.0" - }, - "social-auth-app-django": { - "hashes": [ - "sha256:6d0dd18c2d9e71ca545097d57b44d26f59e624a12833078e8e52f91baf849778", - "sha256:9237e3d7b6f6f59494c3b02e0cce6efc69c9d33ad9d1a064e3b2318bcbe89ae3", - "sha256:f151396e5b16e2eee12cd2e211004257826ece24fc4ae97a147df386c1cd7082" - ], - "index": "pypi", - "version": "==3.1.0" - }, - "social-auth-core": { - "hashes": [ - "sha256:65122fb4287c70ff7915be0f52150fc1a9b9515eab3c3f0e4cd9dbb2a442a5c3", - "sha256:cc871fb4528f7cbba67efdba0bc0f7d7c6eeb92113b0cdc9368dd91ffe965782", - "sha256:f9f36dfa6af2823efb35a5ef65dfd02f66c944f389c33c25dd9621f8bb75a7da" - ], - "index": "pypi", - "version": "==3.1.0" - }, - "sqlparse": { - "hashes": [ - "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177", - "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" - ], - "index": "pypi", - "version": "==0.3.0" - }, - "tablib": { - "hashes": [ - "sha256:0f88a9cebdaa1a2cc29ae57387082ee81015d1149ecd34e48a8c8d3b4dd21670", - "sha256:5f33c079b07eb10cf9c4b4696add2ecf32c89db7729240546ecdcd5c92f67e13" - ], - "index": "pypi", - "version": "==0.13.0" - }, - "tinycss2": { - "hashes": [ - "sha256:6427d0e3faa0a5e0e8c9f6437e2de26148a7a197a8b0992789f23d9a802788cf", - "sha256:9fdacc0e22d344ddd2ca053837c133900fe820ae1222f63b79617490a498507a" - ], - "index": "pypi", - "version": "==1.0.2" - }, - "uritemplate": { - "hashes": [ - "sha256:01c69f4fe8ed503b2951bef85d996a9d22434d2431584b5b107b2981ff416fbd", - "sha256:1b9c467a940ce9fb9f50df819e8ddd14696f89b9a8cc87ac77952ba416e0a8fd", - "sha256:c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d" - ], - "index": "pypi", - "version": "==3.0.0" - }, - "urllib3": { - "hashes": [ - "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", - "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" - ], - "index": "pypi", - "version": "==1.24.3" - }, - "weasyprint": { - "hashes": [ - "sha256:968df4eecfb30fe572591f7ef1ad3d179adc0294c249aaae47b183cfbe3e491b", - "sha256:af8d39f45027ecd7fa47272b93558d851a49b3dad238a52478475a3733ffa141" - ], - "index": "pypi", - "version": "==47" - }, - "webencodings": { - "hashes": [ - "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", - "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" - ], - "index": "pypi", - "version": "==0.5.1" - }, - "xlrd": { - "hashes": [ - "sha256:546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2", - "sha256:e551fb498759fa3a5384a94ccd4c3c02eb7c00ea424426e212ac0c57be9dfbde" - ], - "index": "pypi", - "version": "==1.2.0" - }, - "xlwt": { - "hashes": [ - "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e", - "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88" - ], - "index": "pypi", - "version": "==1.3.0" - } - }, - "develop": {} -} diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 48e341a0..00000000 --- a/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -} From 2f674f07f91d3ab181bb9fa9d9df4f55dcb282ad Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 6 Sep 2021 20:13:29 +0100 Subject: [PATCH 10/15] chore(PIP): pip-compile requirements --- requirements.in | 12 ------------ requirements.txt | 47 +---------------------------------------------- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/requirements.in b/requirements.in index 3afb9f8a..8af414d6 100644 --- a/requirements.in +++ b/requirements.in @@ -2,35 +2,23 @@ coverage==5.0.3 Django==2.2.13 django-ckeditor==5.7.0 # All references are in the initial commit django-crispy-forms==1.7.2 # ? - django-extensions==2.1.6 django-filter==2.1.0 # Used. All references very old -# django-geojson==2.12.0 django-import-export==1.2.0 # Is it really used? - -# django-localflavor==2.1 -# django-map-widgets==0.2.2 - django-mathfilters==0.4.0 # Only used in templates/workflow/projectdashboard_list.html - django-rest-swagger==2.2.0 - django-select2==7.2.2 django-simple-history==2.7.2 django-tables2==2.0.6 django-uuidfield==0.5.0 django-wysiwyg==0.8.0 djangorestframework==3.11.2 - - pendulum==2.0.5 Pillow==8.2.0 psycopg2-binary==2.8.4 - pytz==2019.1 requests==2.21.0 simplejson==3.16.0 social-auth-app-django==3.1.0 - WeasyPrint==47 whitenoise==5.0.1 diff --git a/requirements.txt b/requirements.txt index f9248fa8..02fbdafc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,10 +4,6 @@ # # pip-compile # -astroid==2.5 - # via pylint -attrs==21.2.0 - # via pytest cairocffi==1.2.0 # via # cairosvg @@ -48,7 +44,6 @@ django==2.2.13 # via # -r requirements.in # django-appconf - # django-debug-toolbar # django-filter # django-import-export # django-select2 @@ -61,8 +56,6 @@ django-ckeditor==5.7.0 # via -r requirements.in django-crispy-forms==1.7.2 # via -r requirements.in -django-debug-toolbar==1.11 - # via -r requirements.in django-extensions==2.1.6 # via -r requirements.in django-filter==2.1.0 @@ -89,66 +82,36 @@ djangorestframework==3.11.2 # via # -r requirements.in # django-rest-swagger -entrypoints==0.3 - # via flake8 -flake8==3.7.9 - # via -r requirements.in html5lib==1.1 # via weasyprint idna==2.8 # via requests -isort==4.3.21 - # via pylint itypes==1.2.0 # via coreapi jinja2==3.0.1 # via coreschema -lazy-object-proxy==1.6.0 - # via astroid markupsafe==2.0.1 # via jinja2 -mccabe==0.6.1 - # via - # flake8 - # pylint -more-itertools==8.8.0 - # via pytest oauthlib==3.1.1 # via # requests-oauthlib # social-auth-core openapi-codec==1.3.2 # via django-rest-swagger -packaging==21.0 - # via pytest pendulum==2.0.5 # via -r requirements.in pillow==8.2.0 # via # -r requirements.in # cairosvg -pluggy==0.13.1 - # via pytest psycopg2-binary==2.8.4 # via -r requirements.in -py==1.10.0 - # via pytest -pycodestyle==2.5.0 - # via flake8 pycparser==2.20 # via cffi -pyflakes==2.1.1 - # via flake8 pyjwt==2.1.0 # via social-auth-core -pylint==2.5.2 - # via -r requirements.in -pyparsing==2.4.7 - # via packaging pyphen==0.11.0 # via weasyprint -pytest==5.4.1 - # via -r requirements.in python-dateutil==2.8.2 # via pendulum python3-openid==3.2.0 @@ -184,9 +147,7 @@ social-auth-app-django==3.1.0 social-auth-core==4.1.0 # via social-auth-app-django sqlparse==0.4.1 - # via - # django - # django-debug-toolbar + # via django tablib==3.0.0 # via django-import-export tinycss2==1.1.0 @@ -194,14 +155,10 @@ tinycss2==1.1.0 # cairosvg # cssselect2 # weasyprint -toml==0.10.2 - # via pylint uritemplate==3.0.1 # via coreapi urllib3==1.24.3 # via requests -wcwidth==0.2.5 - # via pytest weasyprint==47 # via -r requirements.in webencodings==0.5.1 @@ -211,8 +168,6 @@ webencodings==0.5.1 # tinycss2 whitenoise==5.0.1 # via -r requirements.in -wrapt==1.12.1 - # via astroid # The following packages are considered to be unsafe in a requirements file: # setuptools From f62fb44d287623b25defde23a062e61ffd56c73a Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 6 Sep 2021 20:14:20 +0100 Subject: [PATCH 11/15] CI(GA): use pip-tools for build and test job --- .github/workflows/activity_ci_cd.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/activity_ci_cd.yml b/.github/workflows/activity_ci_cd.yml index a5408b8a..1622cf73 100644 --- a/.github/workflows/activity_ci_cd.yml +++ b/.github/workflows/activity_ci_cd.yml @@ -15,7 +15,7 @@ on: - published jobs: - Build_and_test: + Build_lint_test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -23,17 +23,11 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.7 - - name: Install dependencies - run: | - sudo apt-get update -y - sudo apt-get install gdal-bin - python -m pip install --upgrade pip - pip install pipenv - name: Lint with flake8 run: | pip install flake8 # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # TODO use a main flake8 config file # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Run Tests @@ -41,8 +35,7 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} run: | cp activity/settings/local-sample.py activity/settings/local.py - pipenv install - source $(python3 -m pipenv --venv)/bin/activate + pip install pip-tools && pip-sync coverage run manage.py test echo "++++++++ Show test coverage report +++++++" coverage report @@ -51,7 +44,7 @@ jobs: Infrastructure: runs-on: ubuntu-latest - needs: Build_and_test + needs: Build_lint_test if: github.ref == 'refs/heads/develop' || github.event_name == 'release' steps: - uses: actions/checkout@v1 From 4626b18344960baf9cf22ea8484089fe54b05c91 Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 6 Sep 2021 21:21:27 +0100 Subject: [PATCH 12/15] feat(CI): use Python3.8 for build and test job --- .github/workflows/activity_ci_cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/activity_ci_cd.yml b/.github/workflows/activity_ci_cd.yml index 1622cf73..f3cf205c 100644 --- a/.github/workflows/activity_ci_cd.yml +++ b/.github/workflows/activity_ci_cd.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.8 - name: Lint with flake8 run: | pip install flake8 From d5b31288e061b8a85888226af3f5b0da3ba6d04f Mon Sep 17 00:00:00 2001 From: Anas Date: Mon, 6 Sep 2021 22:33:19 +0100 Subject: [PATCH 13/15] fix(PIP): add django-debug-toolbar --- requirements.in | 2 ++ requirements.txt | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 8af414d6..8edd8af5 100644 --- a/requirements.in +++ b/requirements.in @@ -22,3 +22,5 @@ simplejson==3.16.0 social-auth-app-django==3.1.0 WeasyPrint==47 whitenoise==5.0.1 + +django-debug-toolbar==1.11 # Currently necessary. To be moved to a Dev dependency diff --git a/requirements.txt b/requirements.txt index 02fbdafc..7a505772 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,6 +44,7 @@ django==2.2.13 # via # -r requirements.in # django-appconf + # django-debug-toolbar # django-filter # django-import-export # django-select2 @@ -56,6 +57,8 @@ django-ckeditor==5.7.0 # via -r requirements.in django-crispy-forms==1.7.2 # via -r requirements.in +django-debug-toolbar==1.11 + # via -r requirements.in django-extensions==2.1.6 # via -r requirements.in django-filter==2.1.0 @@ -147,7 +150,9 @@ social-auth-app-django==3.1.0 social-auth-core==4.1.0 # via social-auth-app-django sqlparse==0.4.1 - # via django + # via + # django + # django-debug-toolbar tablib==3.0.0 # via django-import-export tinycss2==1.1.0 From 4c1dc04cc2f5fef85d1c00c2ea7f4f69b059c2b5 Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 16 Sep 2021 21:18:16 +0100 Subject: [PATCH 14/15] docs: how to manage deps using pip-tools --- docs/dependencies.md | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/docs/dependencies.md b/docs/dependencies.md index a405c571..7e655d8c 100644 --- a/docs/dependencies.md +++ b/docs/dependencies.md @@ -1,2 +1,32 @@ - - +# PIP dependencies + +We are using [pip-tools](https://github.com/jazzband/pip-tools) for better dependency management. + +> All commands are supposed to be executed from your virtual environment! + +## Installing dependencies + +To install the dependencies into your virtual environment, use the command `pip-sync`. + +This will install/upgrade/uninstall everything necessary to match the requirements.txt contents. This way we can ensure all virtual environments perfectly reflect the `requirements.txt` file. + +The generated requirements files will include "transitive dependencies" (dependencies of our dependencies) and show for each dependency metadata of the "why" it was installed as comments. + +If you wish to get a clearer picture of the dependency tree, you can use the command `pipedtree` + +## Adding a PIP dependency + +To add a development or production dependency, use respectively the `dev-requirements.in` and `requirements.in` files. Always **make sure to pin** the version of the dependency. + +For this dependency to be added to the `dev-requirements.txt` and `requirements.txt` files, we use `pip-compile`: + +```bash +pip-compile requirements.in # Prod dependencies +pip-compile dev-requirements.in # Dev dependencies +``` + +## Further references + +- [jazzband/pip-tools](https://github.com/jazzband/pip-tools) +- [Quick tip: How I use pip-tools to wrangle dependencies](https://www.codementor.io/@adammertz/quick-tip-how-i-use-pip-tools-to-wrangle-dependencies-1fzreskhok) +- [Better Python dependency management with pip-tools](https://cheat.readthedocs.io/en/latest/python/piptools.html) \ No newline at end of file From 93752674c2a2714d42cb32a36f34cd873badae94 Mon Sep 17 00:00:00 2001 From: Anas Date: Thu, 16 Sep 2021 21:28:28 +0100 Subject: [PATCH 15/15] docs: installation documentation --- docs/installation.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index a551fb6e..bd0be71b 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -5,19 +5,20 @@ 1. Development setup with hot reload 2. Python virtual environment and dependencies installation 3. Django config file & Django "superuser" creation -4. Running migrations & fixtures -5. Gaining access to local Activity instance +## Recommended setup -1. Running Activity locally and PostgreSQL using Docker Compose - +docker-compose up -d -## Recommended setup +This will launch the Activity app and a PostgreSQL database. +To see how the Activity Docker container is built, please check the [Dockerfile](../Dockerfile). +From inside the Activity Docker container, the script `start.sh` will be executed. +The Activity code is mounted using a [Docker Volume](), which allows your changes to the code to be reflected in the Activity Docker container. -Checks logs and -f -Check containers -Get a bash terminal +To check the running Docker containers: `docker ps -a` +To inspect and follow the logs: `docker-compose logs -f` +To get a BASH terminal into the Activity container: `docker-compose exec -ti api bash` ## Alternative setup @@ -32,8 +33,8 @@ pip-tools sync 3. Launch a PostgreSQL instance and create a database in it (alternatively `docker-compose up -d db`) -4. Configure environment variables. See more details - +4. Configure environment variables. + 5. Make and apply migrations