From dc083f9c168d6f1b9335ec3a215f53285584e970 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 11:49:52 +0000 Subject: [PATCH 1/5] Bump numpy from 1.21.6 to 1.22.0 Bumps [numpy](https://github.com/numpy/numpy) from 1.21.6 to 1.22.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.21.6...v1.22.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 91d7e79a..de6a4069 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ pyjwt==2.4.0 pint==0.9 py-dmidecode==0.1.0 pandas==1.3.5 -numpy==1.21.6 +numpy==1.22.0 odfpy==1.4.1 xlrd==2.0.1 openpyxl==3.0.10 From 05c6b9f47bd8c34ae2f74c458a79f1a7270b7c27 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Fri, 15 Jul 2022 11:58:27 +0200 Subject: [PATCH 2/5] Add comment to pandas dependencies --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index de6a4069..99abf67a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,10 +47,10 @@ pyjwt==2.4.0 pint==0.9 py-dmidecode==0.1.0 pandas==1.3.5 -numpy==1.22.0 -odfpy==1.4.1 -xlrd==2.0.1 -openpyxl==3.0.10 -et_xmlfile==1.1.0 +numpy==1.22.0 # pandas dependency +odfpy==1.4.1 # pandas dependency +xlrd==2.0.1 # pandas dependency +openpyxl==3.0.10 # pandas dependency +et_xmlfile==1.1.0 # pandas dependency sentry_sdk==1.6.0 blinker==1.4 From 09412f9ee607617f8d149615ba63a5f730f1a1ff Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Fri, 15 Jul 2022 11:59:06 +0200 Subject: [PATCH 3/5] Move sentry & blinker to requirements-prod.txt Use a separate file to requirements of production environment --- requirements-prod.txt | 2 ++ requirements.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 requirements-prod.txt diff --git a/requirements-prod.txt b/requirements-prod.txt new file mode 100644 index 00000000..50a04d5d --- /dev/null +++ b/requirements-prod.txt @@ -0,0 +1,2 @@ +sentry_sdk==1.6.0 +blinker==1.4 diff --git a/requirements.txt b/requirements.txt index 99abf67a..b886ac57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,5 +52,3 @@ odfpy==1.4.1 # pandas dependency xlrd==2.0.1 # pandas dependency openpyxl==3.0.10 # pandas dependency et_xmlfile==1.1.0 # pandas dependency -sentry_sdk==1.6.0 -blinker==1.4 From 5aa6f16ae05f74d0c0d9f8bed643ef7819d521c2 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Fri, 15 Jul 2022 12:03:06 +0200 Subject: [PATCH 4/5] Move selenium to requirements-dev.txt and update actions to install dependencies from this file. --- .github/workflows/flask.yml | 2 +- .github/workflows/selenium.yml | 2 +- requirements-dev.txt | 3 +++ requirements.txt | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flask.yml b/.github/workflows/flask.yml index 43fbe8e7..0c801216 100644 --- a/.github/workflows/flask.yml +++ b/.github/workflows/flask.yml @@ -47,7 +47,7 @@ jobs: sudo apt-get update -qy sudo apt-get -y install postgresql-client --no-install-recommends python -m pip install --upgrade pip - pip install flake8 pytest coverage + pip install -r requirements-dev.txt pip install -r requirements.txt - name: Prepare database diff --git a/.github/workflows/selenium.yml b/.github/workflows/selenium.yml index f9209484..fab0faab 100644 --- a/.github/workflows/selenium.yml +++ b/.github/workflows/selenium.yml @@ -47,7 +47,7 @@ jobs: sudo apt-get update -qy sudo apt-get -y install postgresql-client --no-install-recommends python -m pip install --upgrade pip - pip install flake8 pytest coverage + pip install -r requirements-dev.txt pip install -r requirements.txt pip install -e . mkdir bin diff --git a/requirements-dev.txt b/requirements-dev.txt index 02778f7d..c7110e32 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,7 @@ black +coverage isort flake8 pre-commit +pytest +selenium==4.1.5 diff --git a/requirements.txt b/requirements.txt index b886ac57..8ec1e0a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -42,7 +42,6 @@ sortedcontainers==2.1.0 tqdm==4.32.2 python-decouple==3.3 python-dotenv==0.14.0 -selenium==4.1.5 pyjwt==2.4.0 pint==0.9 py-dmidecode==0.1.0 From b2f8fe3ed5fa60075eae8dcf1f7b434c5ed9f2eb Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Fri, 15 Jul 2022 12:10:10 +0200 Subject: [PATCH 5/5] Reorder imports because sentry is an optional dep --- examples/app.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/app.py b/examples/app.py index 3a6a25a6..47671ec9 100644 --- a/examples/app.py +++ b/examples/app.py @@ -3,11 +3,8 @@ Example app with minimal configuration. Use this as a starting point. """ -import sentry_sdk -from decouple import config -# from flask_wtf.csrf import CSRFProtect -from sentry_sdk.integrations.flask import FlaskIntegration +from decouple import config from ereuse_devicehub.api.views import api from ereuse_devicehub.config import DevicehubConfig @@ -17,11 +14,17 @@ from ereuse_devicehub.labels.views import labels from ereuse_devicehub.views import core from ereuse_devicehub.workbench.views import workbench +# from flask_wtf.csrf import CSRFProtect + + # from werkzeug.contrib.profiler import ProfilerMiddleware SENTRY_DSN = config('SENTRY_DSN', None) if SENTRY_DSN: + import sentry_sdk + from sentry_sdk.integrations.flask import FlaskIntegration + sentry_sdk.init( dsn=SENTRY_DSN, integrations=[