darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-10 18:22:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3805 from alphagov/retry-pyup-07

Browse Source 
Fix issues with dependencies and upgrade them
This commit is contained in:
Ben Thorner
2021-02-17 11:51:50 +00:00
committed by GitHub
parent 1c1dd8c96f 765c8ddbe2
commit b4b1fd641c
6 changed files with 30 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.pyup.yml
+1 -1
View File
@@ -5,4 +5,4 @@ schedule: "every week on monday"
search: False search: False
requirements: requirements:
- requirements.in - requirements.in
- requirements_for_test.in - requirements_for_test.txt
Makefile
-1
View File
@@ -78,7 +78,6 @@ fix-imports:
freeze-requirements: ## create static requirements.txt freeze-requirements: ## create static requirements.txt
${VIRTUALENV_ROOT}/bin/pip install pip-tools ${VIRTUALENV_ROOT}/bin/pip install pip-tools
${VIRTUALENV_ROOT}/bin/pip-compile requirements.in ${VIRTUALENV_ROOT}/bin/pip-compile requirements.in
${VIRTUALENV_ROOT}/bin/pip-compile requirements_for_test.in
.PHONY: prepare-docker-build-image .PHONY: prepare-docker-build-image
prepare-docker-build-image: ## Prepare the Docker builder image prepare-docker-build-image: ## Prepare the Docker builder image
requirements.in
+3 -3
View File
@@ -14,10 +14,10 @@ pyexcel-io==0.6.4
pyexcel-xls==0.6.2 pyexcel-xls==0.6.2
pyexcel-xlsx==0.6.0 pyexcel-xlsx==0.6.0
pyexcel-ods3==0.6.0 pyexcel-ods3==0.6.0
pytz==2020.5 pytz==2021.1
gunicorn==20.0.4 gunicorn==20.0.4
eventlet==0.30.0 eventlet==0.30.1
notifications-python-client==5.7.1 notifications-python-client==6.0.2
Shapely==1.7.1 Shapely==1.7.1
# PaaS # PaaS
requirements.txt
+15 -19
View File
@@ -8,7 +8,7 @@ ago==0.0.93
# via -r requirements.in # via -r requirements.in
awscli-cwlogs==1.4.6 awscli-cwlogs==1.4.6
# via -r requirements.in # via -r requirements.in
awscli==1.18.211 awscli==1.19.7
# via # via
# awscli-cwlogs # awscli-cwlogs
# notifications-utils # notifications-utils
@@ -18,14 +18,14 @@ blinker==1.4
# via # via
# -r requirements.in # -r requirements.in
# gds-metrics # gds-metrics
boto3==1.16.51 boto3==1.17.7
# via notifications-utils # via notifications-utils
botocore==1.19.51 botocore==1.20.7
# via # via
# awscli # awscli
# boto3 # boto3
# s3transfer # s3transfer
cachetools==4.2.0 cachetools==4.2.1
# via notifications-utils # via notifications-utils
certifi==2020.12.5 certifi==2020.12.5
# via requests # via requests
@@ -43,7 +43,7 @@ docutils==0.15.2
# via awscli # via awscli
et-xmlfile==1.0.1 et-xmlfile==1.0.1
# via openpyxl # via openpyxl
eventlet==0.30.0 eventlet==0.30.1
# via -r requirements.in # via -r requirements.in
flask-login==0.5.0 flask-login==0.5.0
# via -r requirements.in # via -r requirements.in
@@ -59,8 +59,6 @@ flask==1.1.2
# flask-wtf # flask-wtf
# gds-metrics # gds-metrics
# notifications-utils # notifications-utils
future==0.18.2
# via notifications-python-client
gds-metrics==0.2.4 gds-metrics==0.2.4
# via -r requirements.in # via -r requirements.in
geojson==2.5.0 geojson==2.5.0
@@ -71,7 +69,7 @@ govuk-bank-holidays==0.8
# notifications-utils # notifications-utils
git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha
# via -r requirements.in # via -r requirements.in
greenlet==0.4.17 greenlet==1.0.0
# via eventlet # via eventlet
gunicorn==20.0.4 gunicorn==20.0.4
# via -r requirements.in # via -r requirements.in
@@ -110,19 +108,17 @@ markupsafe==1.1.1
# wtforms # wtforms
mistune==0.8.4 mistune==0.8.4
# via notifications-utils # via notifications-utils
monotonic==1.5 notifications-python-client==6.0.2
# via notifications-python-client
notifications-python-client==5.7.1
# via -r requirements.in # via -r requirements.in
git+https://github.com/alphagov/notifications-utils.git@43.8.3#egg=notifications-utils==43.8.3 git+https://github.com/alphagov/notifications-utils.git@43.8.3#egg=notifications-utils==43.8.3
# via -r requirements.in # via -r requirements.in
openpyxl==3.0.5 openpyxl==3.0.6
# via pyexcel-xlsx # via pyexcel-xlsx
orderedset==2.0.3 orderedset==2.0.3
# via notifications-utils # via notifications-utils
packaging==20.8 packaging==20.9
# via bleach # via bleach
phonenumbers==8.12.15 phonenumbers==8.12.18
# via notifications-utils # via notifications-utils
prometheus-client==0.9.0 prometheus-client==0.9.0
# via # via
@@ -147,7 +143,7 @@ pyexcel-xlsx==0.6.0
# via -r requirements.in # via -r requirements.in
pyexcel==0.6.6 pyexcel==0.6.6
# via -r requirements.in # via -r requirements.in
pyjwt==2.0.0 pyjwt==2.0.1
# via notifications-python-client # via notifications-python-client
pyparsing==2.4.7 pyparsing==2.4.7
# via packaging # via packaging
@@ -159,11 +155,11 @@ python-dateutil==2.8.1
# botocore # botocore
python-json-logger==2.0.1 python-json-logger==2.0.1
# via notifications-utils # via notifications-utils
pytz==2020.5 pytz==2021.1
# via # via
# -r requirements.in # -r requirements.in
# notifications-utils # notifications-utils
pyyaml==5.4.0 pyyaml==5.3.1
# via # via
# awscli # awscli
# notifications-utils # notifications-utils
@@ -177,7 +173,7 @@ requests==2.25.1
# notifications-utils # notifications-utils
rsa==4.5 rsa==4.5
# via awscli # via awscli
s3transfer==0.3.3 s3transfer==0.3.4
# via # via
# awscli # awscli
# boto3 # boto3
@@ -198,7 +194,7 @@ statsd==3.3.0
# via notifications-utils # via notifications-utils
texttable==1.6.3 texttable==1.6.3
# via pyexcel # via pyexcel
urllib3==1.26.2 urllib3==1.26.3
# via # via
# botocore # botocore
# requests # requests
requirements_for_test.in
-14
View File
@@ -1,14 +0,0 @@
-r requirements.txt
isort==4.3.21
pytest==5.3.2
pytest-env==0.6.2
pytest-mock==1.11.2
pytest-xdist==1.31.0
beautifulsoup4==4.8.1
freezegun==0.3.12
flake8==3.7.9
flake8-bugbear==19.8.0
flake8-print==3.1.4
requests-mock==1.7.0
# used for creating manifest file locally
jinja2-cli[yaml]==0.7.0
requirements_for_test.txt
+11 -386
View File
@@ -1,389 +1,14 @@
# -r requirements.txt
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile requirements_for_test.in
#
ago==0.0.93
# via -r requirements.txt
apipkg==1.5
# via execnet
attrs==20.3.0
# via
# flake8-bugbear
# pytest
awscli-cwlogs==1.4.6
# via -r requirements.txt
awscli==1.18.211
# via
# -r requirements.txt
# awscli-cwlogs
# notifications-utils
beautifulsoup4==4.8.1
# via -r requirements_for_test.in
bleach==3.3.0
# via
# -r requirements.txt
# notifications-utils
blinker==1.4
# via
# -r requirements.txt
# gds-metrics
boto3==1.16.51
# via
# -r requirements.txt
# notifications-utils
botocore==1.19.51
# via
# -r requirements.txt
# awscli
# boto3
# s3transfer
cachetools==4.2.0
# via
# -r requirements.txt
# notifications-utils
certifi==2020.12.5
# via
# -r requirements.txt
# requests
chardet==4.0.0
# via
# -r requirements.txt
# requests
click==7.1.2
# via
# -r requirements.txt
# flask
colorama==0.4.3
# via
# -r requirements.txt
# awscli
dnspython==1.16.0
# via
# -r requirements.txt
# eventlet
docopt==0.6.2
# via
# -r requirements.txt
# notifications-python-client
docutils==0.15.2
# via
# -r requirements.txt
# awscli
entrypoints==0.3
# via flake8
et-xmlfile==1.0.1
# via
# -r requirements.txt
# openpyxl
eventlet==0.30.0
# via -r requirements.txt
execnet==1.7.1
# via pytest-xdist
flake8-bugbear==19.8.0
# via -r requirements_for_test.in
flake8-print==3.1.4
# via -r requirements_for_test.in
flake8==3.7.9
# via
# -r requirements_for_test.in
# flake8-bugbear
# flake8-print
flask-login==0.5.0
# via -r requirements.txt
flask-redis==0.4.0
# via
# -r requirements.txt
# notifications-utils
flask-wtf==0.14.3
# via -r requirements.txt
flask==1.1.2
# via
# -r requirements.txt
# flask-login
# flask-redis
# flask-wtf
# gds-metrics
# notifications-utils
freezegun==0.3.12
# via -r requirements_for_test.in
future==0.18.2
# via
# -r requirements.txt
# notifications-python-client
gds-metrics==0.2.4
# via -r requirements.txt
geojson==2.5.0
# via
# -r requirements.txt
# notifications-utils
govuk-bank-holidays==0.8
# via
# -r requirements.txt
# notifications-utils
git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha
# via -r requirements.txt
greenlet==0.4.17
# via
# -r requirements.txt
# eventlet
gunicorn==20.0.4
# via -r requirements.txt
humanize==3.2.0
# via -r requirements.txt
idna==2.10
# via
# -r requirements.txt
# requests
importlib-metadata==3.3.0
# via
# pluggy
# pytest
isort==4.3.21 isort==4.3.21
# via -r requirements_for_test.in
itsdangerous==1.1.0
# via
# -r requirements.txt
# flask
# flask-wtf
# notifications-utils
jdcal==1.4.1
# via
# -r requirements.txt
# openpyxl
jinja2-cli[yaml]==0.7.0
# via -r requirements_for_test.in
jinja2==2.11.3
# via
# -r requirements.txt
# flask
# govuk-frontend-jinja
# jinja2-cli
# notifications-utils
jmespath==0.10.0
# via
# -r requirements.txt
# boto3
# botocore
lml==0.1.0
# via
# -r requirements.txt
# pyexcel
# pyexcel-io
lxml==4.6.2
# via
# -r requirements.txt
# pyexcel-ezodf
# pyexcel-ods3
markupsafe==1.1.1
# via
# -r requirements.txt
# jinja2
# wtforms
mccabe==0.6.1
# via flake8
mistune==0.8.4
# via
# -r requirements.txt
# notifications-utils
monotonic==1.5
# via
# -r requirements.txt
# notifications-python-client
more-itertools==8.6.0
# via pytest
notifications-python-client==5.7.1
# via -r requirements.txt
git+https://github.com/alphagov/notifications-utils.git@43.8.3#egg=notifications-utils==43.8.3
# via -r requirements.txt
openpyxl==3.0.5
# via
# -r requirements.txt
# pyexcel-xlsx
orderedset==2.0.3
# via
# -r requirements.txt
# notifications-utils
packaging==20.8
# via
# -r requirements.txt
# bleach
# pytest
phonenumbers==8.12.15
# via
# -r requirements.txt
# notifications-utils
pluggy==0.13.1
# via pytest
prometheus-client==0.9.0
# via
# -r requirements.txt
# gds-metrics
py==1.10.0
# via
# pytest
# pytest-forked
pyasn1==0.4.8
# via
# -r requirements.txt
# rsa
pycodestyle==2.5.0
# via
# flake8
# flake8-print
pyexcel-ezodf==0.3.4
# via
# -r requirements.txt
# pyexcel-ods3
pyexcel-io==0.6.4
# via
# -r requirements.txt
# pyexcel
# pyexcel-ods3
# pyexcel-xls
# pyexcel-xlsx
pyexcel-ods3==0.6.0
# via -r requirements.txt
pyexcel-xls==0.6.2
# via -r requirements.txt
pyexcel-xlsx==0.6.0
# via -r requirements.txt
pyexcel==0.6.6
# via -r requirements.txt
pyflakes==2.1.1
# via flake8
pyjwt==2.0.0
# via
# -r requirements.txt
# notifications-python-client
pyparsing==2.4.7
# via
# -r requirements.txt
# packaging
pypdf2==1.26.0
# via
# -r requirements.txt
# notifications-utils
pytest-env==0.6.2
# via -r requirements_for_test.in
pytest-forked==1.3.0
# via pytest-xdist
pytest-mock==1.11.2
# via -r requirements_for_test.in
pytest-xdist==1.31.0
# via -r requirements_for_test.in
pytest==5.3.2 pytest==5.3.2
# via pytest-env==0.6.2
# -r requirements_for_test.in pytest-mock==1.11.2
# pytest-env pytest-xdist==1.31.0
# pytest-forked beautifulsoup4==4.8.1
# pytest-mock freezegun==0.3.12
# pytest-xdist flake8==3.7.9
python-dateutil==2.8.1 flake8-bugbear==19.8.0
# via flake8-print==3.1.4
# -r requirements.txt
# awscli-cwlogs
# botocore
# freezegun
python-json-logger==2.0.1
# via
# -r requirements.txt
# notifications-utils
pytz==2020.5
# via
# -r requirements.txt
# notifications-utils
pyyaml==5.3.1
# via
# -r requirements.txt
# awscli
# jinja2-cli
# notifications-utils
redis==3.5.3
# via
# -r requirements.txt
# flask-redis
requests-mock==1.7.0 requests-mock==1.7.0
# via -r requirements_for_test.in # used for creating manifest file locally
requests==2.25.1 jinja2-cli[yaml]==0.7.0
# via
# -r requirements.txt
# awscli-cwlogs
# govuk-bank-holidays
# notifications-python-client
# notifications-utils
# requests-mock
rsa==4.5
# via
# -r requirements.txt
# awscli
s3transfer==0.3.3
# via
# -r requirements.txt
# awscli
# boto3
shapely==1.7.1
# via
# -r requirements.txt
# notifications-utils
six==1.15.0
# via
# -r requirements.txt
# awscli-cwlogs
# bleach
# eventlet
# flake8-print
# freezegun
# govuk-bank-holidays
# pytest-xdist
# python-dateutil
# requests-mock
smartypants==2.0.1
# via
# -r requirements.txt
# notifications-utils
soupsieve==2.1
# via beautifulsoup4
statsd==3.3.0
# via
# -r requirements.txt
# notifications-utils
texttable==1.6.3
# via
# -r requirements.txt
# pyexcel
typing-extensions==3.7.4.3
# via importlib-metadata
urllib3==1.26.2
# via
# -r requirements.txt
# botocore
# requests
wcwidth==0.2.5
# via pytest
webencodings==0.5.1
# via
# -r requirements.txt
# bleach
werkzeug==1.0.1
# via
# -r requirements.txt
# flask
wtforms==2.3.3
# via
# -r requirements.txt
# flask-wtf
xlrd==1.2.0
# via
# -r requirements.txt
# pyexcel-xls
xlwt==1.3.0
# via
# -r requirements.txt
# pyexcel-xls
zipp==3.4.0
# via importlib-metadata
# The following packages are considered to be unsafe in a requirements file:
# setuptools