From d8212ed73ffb21891f3dda697ef4ced4346e6830 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Sun, 16 Apr 2023 14:57:54 +0200 Subject: [PATCH] Library updates #432 --- .github/workflows/cypress.yml | 12 +++--- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 12 +++--- Dockerfile | 2 +- doc/deployment.md | 2 +- requirements.txt | 73 ++++++++++++++++++----------------- tests/conftest.py | 2 +- 7 files changed, 53 insertions(+), 52 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index b83ecb2..c2b522a 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -42,10 +42,10 @@ jobs: - name: Check out repository code uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | @@ -116,10 +116,10 @@ jobs: - name: Check out repository code uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: Install dependencies run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1890a23..44d6745 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 - uses: jamescurtin/isort-action@master - uses: psf/black@stable - uses: TrueBrain/actions-flake8@v1.4.1 \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6cefec5..95a78b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -52,10 +52,10 @@ jobs: - name: Check out repository code uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.9' - name: Install dependencies run: | @@ -83,10 +83,10 @@ jobs: - name: Check out repository code uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.9' - name: Install dependencies run: | diff --git a/Dockerfile b/Dockerfile index 9b0b13b..01d8807 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7 +FROM python:3.9 # Add rsync RUN apt update -qq && apt upgrade -y && apt autoremove -y diff --git a/doc/deployment.md b/doc/deployment.md index 614f72e..b54711d 100644 --- a/doc/deployment.md +++ b/doc/deployment.md @@ -14,7 +14,7 @@ docker run -p 5000:5000 -e "DATABASE_URL=postgresql://postgres@localhost/eventca ### Requirements -- Python 3.7 +- Python 3.9 - pip - Postgres with postgis diff --git a/requirements.txt b/requirements.txt index 2ac7ab5..98b05fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,16 +5,16 @@ anytree==2.8.0 apispec==4.0.0 apispec-webframeworks==0.5.2 appdirs==1.4.4 -argh==0.26.2 -arrow==0.14.7 +argh==0.28.1 +arrow==1.2.3 async-timeout==4.0.2 attrs==20.3.0 -Authlib==0.15.3 +Authlib==1.2.0 Babel==2.9.1 -bcrypt==3.2.0 -beautifulsoup4==4.9.3 +bcrypt==4.0.1 +beautifulsoup4==4.12.2 billiard==3.6.4.0 -black==23.1.0 +black==23.3.0 blinker==1.4 cached-property==1.5.2 cachetools==5.3.0 @@ -29,44 +29,44 @@ click-plugins==1.1.1 click-repl==0.2.0 colour==0.1.5 coverage==5.5 -coveralls==2.2.0 +coveralls==3.3.1 cryptography==3.3.2 decorator==5.1.0 -distlib==0.3.1 +distlib==0.3.6 dnspython==2.0.0 docopt==0.6.2 dominate==2.6.0 email-validator==1.1.2 exceptiongroup==1.1.1 -filelock==3.0.12 -flake8==3.8.4 +filelock==3.11.0 +flake8==6.0.0 Flask==2.2.3 flask-apispec==0.11.4 Flask-BabelEx==0.9.4 Flask-Bootstrap==3.3.7.1 -Flask-Cors==3.0.9 -Flask-Dance==3.2.0 +Flask-Cors==3.0.10 +Flask-Dance==6.2.0 Flask-gzip==0.2 Flask-Login==0.6.2 Flask-Mail==0.9.1 -flask-marshmallow==0.14.0 +flask-marshmallow==0.15.0 Flask-Migrate==4.0.4 Flask-Principal==0.4.0 -Flask-QRcode==3.0.0 +Flask-QRcode==3.1.0 Flask-RESTful==0.3.9 Flask-Security-Too==5.1.2 Flask-SQLAlchemy==3.0.3 Flask-WTF==1.1.1 GeoAlchemy2==0.13.1 -googlemaps==4.4.7 +googlemaps==4.10.0 greenlet==2.0.2 -gunicorn==20.0.4 -icalendar==4.0.7 +gunicorn==20.1.0 +icalendar==5.0.5 identify==1.5.10 idna==2.10 importlib-metadata==6.3.0 iniconfig==1.1.1 -isort==5.7.0 +isort==5.12.0 itsdangerous==2.1.2 Jinja2==3.1.2 johnnydep==1.18.0 @@ -74,11 +74,11 @@ jsonschema==3.2.0 kombu==5.2.4 Mako==1.1.3 MarkupSafe==2.1.2 -marshmallow==3.10.0 +marshmallow==3.19.0 marshmallow-enum==1.5.1 -marshmallow-sqlalchemy==0.24.1 -mccabe==0.6.1 -mistune==0.8.4 +marshmallow-sqlalchemy==0.29.0 +mccabe==0.7.0 +mistune==2.0.5 mypy-extensions==0.4.3 nodeenv==1.5.0 oauthlib==3.1.0 @@ -87,18 +87,18 @@ packaging==23.0 passlib==1.7.4 pathspec==0.11.0 pilkit==2.0 -Pillow==9.0.0 +Pillow==9.5.0 pipdeptree==2.7.0 pkginfo==1.9.6 platformdirs==3.1.0 pluggy==0.13.1 -pre-commit==2.9.3 +pre-commit==3.2.2 prompt-toolkit==3.0.38 -psycopg2-binary==2.8.6 +psycopg2-binary==2.9.6 py==1.10.0 -pycodestyle==2.6.0 +pycodestyle==2.10.0 pycparser==2.20 -pyflakes==2.2.0 +pyflakes==3.0.1 pyparsing==2.4.7 pyrsistent==0.17.3 pytest==7.3.1 @@ -110,39 +110,40 @@ pytest-split==0.8.1 python-dateutil==2.8.1 python-dotenv==0.15.0 python-editor==1.0.4 +pytoolconfig==1.2.5 pytz==2022.7.1 PyYAML==5.4.1 qrcode==6.1 -redis==4.5.1 -regex==2020.11.13 +redis==4.5.4 +regex==2023.3.23 requests==2.25.0 -requests-mock==1.9.3 +requests-mock==1.10.0 requests-oauthlib==1.3.0 -rope==0.18.0 +rope==1.7.0 six==1.15.0 soupsieve==2.1 speaklater==1.3 SQLAlchemy==2.0.9 SQLAlchemy-Utils==0.41.0 structlog==23.1.0 -swagger-spec-validator==2.7.3 +swagger-spec-validator==3.0.3 tabulate==0.9.0 -TatSu==4.4.0 +TatSu==5.8.3 toml==0.10.2 tomli==2.0.1 typed-ast==1.5.4 typing_extensions==4.5.0 urllib3==1.26.5 URLObject==2.4.3 -validators==0.18.2 +validators==0.20.0 vine==5.0.0 -virtualenv==20.2.2 +virtualenv==20.21.0 visitor==0.1.3 wcwidth==0.2.6 webargs==7.0.1 Werkzeug==2.2.3 wimpy==0.6 WTForms==3.0.1 -WTForms-SQLAlchemy==0.2 +WTForms-SQLAlchemy==0.3 yarg==0.1.9 zipp==3.4.0 diff --git a/tests/conftest.py b/tests/conftest.py index fc462ab..d5f25ac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -12,7 +12,7 @@ def pytest_generate_tests(metafunc): warnings.filterwarnings("error", category=SAWarning) os.environ["DATABASE_URL"] = os.environ.get( - "TEST_DATABASE_URL", "postgresql://postgres@localhost/eventcally_tests" + "TEST_DATABASE_URL", "postgresql://user:pass@myserver/ec_tests" ) os.environ["REDIS_URL"] = os.environ.get("TEST_REDIS_URL", "redis://") os.environ["AUTHLIB_INSECURE_TRANSPORT"] = "1"