From c6d828954b46119b30a749e85b17b3bf00ee398c Mon Sep 17 00:00:00 2001 From: Marcos Prieto Date: Mon, 8 Jan 2024 12:45:24 +0100 Subject: [PATCH 1/2] Upgrade to python 3.11 --- .cookiecutter/cookiecutter.json | 4 ++-- .github/workflows/ci.yml | 10 +++++----- .python-version | 2 +- Dockerfile | 2 +- README.md | 2 +- bin/make_python | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.cookiecutter/cookiecutter.json b/.cookiecutter/cookiecutter.json index efbc85c..dcfcaa9 100644 --- a/.cookiecutter/cookiecutter.json +++ b/.cookiecutter/cookiecutter.json @@ -13,7 +13,7 @@ "package_name": "h_periodic", "slug": "h-periodic", "short_description": "Celery beat processes for Hypothesis apps.", - "python_version": "3.8.12", + "python_version": "3.11.7", "github_owner": "hypothesis", "visibility": "public", "copyright_holder": "Hypothesis", @@ -34,4 +34,4 @@ }, "__copyright_year": "2022" } -} \ No newline at end of file +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3222554..55ba5b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - name: Cache the .tox dir uses: actions/cache@v3 with: @@ -47,7 +47,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - name: Cache the .tox dir uses: actions/cache@v3 with: @@ -64,7 +64,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - name: Cache the .tox dir uses: actions/cache@v3 with: @@ -89,7 +89,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - name: Cache the .tox dir uses: actions/cache@v3 with: @@ -110,7 +110,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.11' - name: Cache the .tox dir uses: actions/cache@v3 with: diff --git a/.python-version b/.python-version index 89a1ad7..d4b278f 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.8.12 +3.11.7 diff --git a/Dockerfile b/Dockerfile index f4ae3c5..3dc39cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8.12-alpine3.13 +FROM python:3.11.7-alpine3.19 MAINTAINER Hypothes.is Project and contributors # Create the h-periodic user, group, home directory and package directory. diff --git a/README.md b/README.md index b6d0b32..01dd8fe 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + diff --git a/bin/make_python b/bin/make_python index b73aa33..401f2f6 100755 --- a/bin/make_python +++ b/bin/make_python @@ -8,7 +8,7 @@ if [ -n "${CI+x}" ]; then exit; fi pyenv_root=$(pyenv root) -for python_version in 3.8.12; do +for python_version in 3.11.7; do bin_dir=$pyenv_root/versions/$python_version/bin if [ ! -f "$bin_dir"/tox ]; then pyenv install --skip-existing "$python_version" From edaa559a9250ef8bb6475dfd5debc78efb9ddf4c Mon Sep 17 00:00:00 2001 From: Marcos Prieto Date: Mon, 8 Jan 2024 12:50:27 +0100 Subject: [PATCH 2/2] Refresh python dependencies after python version upgrade Result of running: make requirements --always-make args='--upgrade --- requirements/checkformatting.txt | 14 ++------------ requirements/coverage.txt | 12 ++---------- requirements/dev.txt | 30 +++--------------------------- requirements/format.txt | 14 ++------------ requirements/functests.txt | 27 +++------------------------ requirements/lint.txt | 30 +----------------------------- requirements/prod.txt | 12 ++---------- requirements/template.txt | 13 ++----------- requirements/tests.txt | 28 +++------------------------- 9 files changed, 20 insertions(+), 160 deletions(-) diff --git a/requirements/checkformatting.txt b/requirements/checkformatting.txt index b62fd1a..0b34dee 100644 --- a/requirements/checkformatting.txt +++ b/requirements/checkformatting.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/checkformatting.in @@ -13,9 +13,7 @@ click==8.1.7 # black # pip-tools importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster isort==5.13.2 # via -r requirements/checkformatting.in mypy-extensions==1.0.0 @@ -36,14 +34,6 @@ platformdirs==4.1.0 # via black pyproject-hooks==1.0.0 # via build -tomli==2.0.1 - # via - # black - # build - # pip-tools - # pyproject-hooks -typing-extensions==4.9.0 - # via black wheel==0.42.0 # via pip-tools zipp==3.17.0 diff --git a/requirements/coverage.txt b/requirements/coverage.txt index 9e5ade7..34fbe67 100644 --- a/requirements/coverage.txt +++ b/requirements/coverage.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/coverage.in @@ -11,9 +11,7 @@ click==8.1.7 coverage[toml]==7.4.0 # via -r requirements/coverage.in importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster packaging==23.2 # via build pip-sync-faster==0.0.3 @@ -24,12 +22,6 @@ pip-tools==7.3.0 # pip-sync-faster pyproject-hooks==1.0.0 # via build -tomli==2.0.1 - # via - # build - # coverage - # pip-tools - # pyproject-hooks wheel==0.42.0 # via pip-tools zipp==3.17.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index d4ec814..d6f846e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/dev.in @@ -10,14 +10,6 @@ amqp==5.2.0 # kombu asttokens==2.4.1 # via stack-data -backcall==0.2.0 - # via ipython -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/prod.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/prod.txt @@ -59,10 +51,8 @@ factory-boy==3.3.0 faker==22.0.0 # via factory-boy importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster -ipython==8.12.3 + # via pip-sync-faster +ipython==8.20.0 # via -r requirements/dev.in jedi==0.19.1 # via ipython @@ -78,8 +68,6 @@ parso==0.8.3 # via jedi pexpect==4.9.0 # via ipython -pickleshare==0.7.5 - # via ipython pip-sync-faster==0.0.3 # via -r requirements/dev.in pip-tools==7.3.0 @@ -117,25 +105,13 @@ supervisor==4.2.5 # via # -r requirements/dev.in # -r requirements/prod.txt -tomli==2.0.1 - # via - # build - # pip-tools - # pyproject-hooks traitlets==5.14.1 # via # ipython # matplotlib-inline -typing-extensions==4.9.0 - # via - # -r requirements/prod.txt - # faker - # ipython - # kombu tzdata==2023.4 # via # -r requirements/prod.txt - # backports-zoneinfo # celery urllib3==2.1.0 # via diff --git a/requirements/format.txt b/requirements/format.txt index 2cbaa4a..d17887b 100644 --- a/requirements/format.txt +++ b/requirements/format.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/format.in @@ -13,9 +13,7 @@ click==8.1.7 # black # pip-tools importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster isort==5.13.2 # via -r requirements/format.in mypy-extensions==1.0.0 @@ -36,14 +34,6 @@ platformdirs==4.1.0 # via black pyproject-hooks==1.0.0 # via build -tomli==2.0.1 - # via - # black - # build - # pip-tools - # pyproject-hooks -typing-extensions==4.9.0 - # via black wheel==0.42.0 # via pip-tools zipp==3.17.0 diff --git a/requirements/functests.txt b/requirements/functests.txt index 970a152..1472c6c 100644 --- a/requirements/functests.txt +++ b/requirements/functests.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/functests.in @@ -8,12 +8,6 @@ amqp==5.2.0 # via # -r requirements/prod.txt # kombu -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/prod.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/prod.txt @@ -46,8 +40,6 @@ click-repl==0.3.0 # via # -r requirements/prod.txt # celery -exceptiongroup==1.2.0 - # via pytest factory-boy==3.3.0 # via # -r requirements/functests.in @@ -59,9 +51,7 @@ h-matchers==1.2.15 httpretty==1.1.4 # via -r requirements/functests.in importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster inflection==0.5.1 # via pytest-factoryboy iniconfig==2.0.0 @@ -107,22 +97,11 @@ six==1.16.0 # python-dateutil supervisor==4.2.5 # via -r requirements/prod.txt -tomli==2.0.1 - # via - # build - # pip-tools - # pyproject-hooks - # pytest typing-extensions==4.9.0 - # via - # -r requirements/prod.txt - # faker - # kombu - # pytest-factoryboy + # via pytest-factoryboy tzdata==2023.4 # via # -r requirements/prod.txt - # backports-zoneinfo # celery urllib3==2.1.0 # via diff --git a/requirements/lint.txt b/requirements/lint.txt index b1dc030..623f82c 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/lint.in @@ -11,13 +11,6 @@ amqp==5.2.0 # kombu astroid==3.0.2 # via pylint -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/functests.txt - # -r requirements/tests.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/functests.txt @@ -68,11 +61,6 @@ coverage[toml]==7.4.0 # pytest-cov dill==0.3.7 # via pylint -exceptiongroup==1.2.0 - # via - # -r requirements/functests.txt - # -r requirements/tests.txt - # pytest factory-boy==3.3.0 # via # -r requirements/functests.txt @@ -97,7 +85,6 @@ importlib-metadata==7.0.1 # via # -r requirements/functests.txt # -r requirements/tests.txt - # build # pip-sync-faster inflection==0.5.1 # via @@ -194,32 +181,17 @@ supervisor==4.2.5 # -r requirements/tests.txt toml==0.10.2 # via -r requirements/lint.in -tomli==2.0.1 - # via - # -r requirements/functests.txt - # -r requirements/tests.txt - # build - # coverage - # pip-tools - # pylint - # pyproject-hooks - # pytest tomlkit==0.12.3 # via pylint typing-extensions==4.9.0 # via # -r requirements/functests.txt # -r requirements/tests.txt - # astroid - # faker - # kombu - # pylint # pytest-factoryboy tzdata==2023.4 # via # -r requirements/functests.txt # -r requirements/tests.txt - # backports-zoneinfo # celery urllib3==2.1.0 # via diff --git a/requirements/prod.txt b/requirements/prod.txt index 7ea41f4..eefa430 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,15 +1,11 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/prod.in # amqp==5.2.0 # via kombu -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # kombu billiard==4.2.0 # via celery celery==5.3.6 @@ -40,12 +36,8 @@ six==1.16.0 # via python-dateutil supervisor==4.2.5 # via -r requirements/prod.in -typing-extensions==4.9.0 - # via kombu tzdata==2023.4 - # via - # backports-zoneinfo - # celery + # via celery urllib3==2.1.0 # via sentry-sdk vine==5.1.0 diff --git a/requirements/template.txt b/requirements/template.txt index 84d3ecf..840aefd 100644 --- a/requirements/template.txt +++ b/requirements/template.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/template.in @@ -25,9 +25,7 @@ cookiecutter==2.5.0 idna==3.6 # via requests importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster jinja2==3.1.2 # via cookiecutter markdown-it-py==3.0.0 @@ -62,15 +60,8 @@ six==1.16.0 # via python-dateutil text-unidecode==1.3 # via python-slugify -tomli==2.0.1 - # via - # build - # pip-tools - # pyproject-hooks types-python-dateutil==2.8.19.20240106 # via arrow -typing-extensions==4.9.0 - # via rich urllib3==2.1.0 # via requests wheel==0.42.0 diff --git a/requirements/tests.txt b/requirements/tests.txt index b333711..9d25ed1 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe requirements/tests.in @@ -8,12 +8,6 @@ amqp==5.2.0 # via # -r requirements/prod.txt # kombu -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/prod.txt - # backports-zoneinfo - # celery - # kombu billiard==4.2.0 # via # -r requirements/prod.txt @@ -50,8 +44,6 @@ coverage[toml]==7.4.0 # via # coverage # pytest-cov -exceptiongroup==1.2.0 - # via pytest factory-boy==3.3.0 # via # -r requirements/tests.in @@ -65,9 +57,7 @@ h-matchers==1.2.15 httpretty==1.1.4 # via -r requirements/tests.in importlib-metadata==7.0.1 - # via - # build - # pip-sync-faster + # via pip-sync-faster inflection==0.5.1 # via pytest-factoryboy iniconfig==2.0.0 @@ -117,23 +107,11 @@ six==1.16.0 # python-dateutil supervisor==4.2.5 # via -r requirements/prod.txt -tomli==2.0.1 - # via - # build - # coverage - # pip-tools - # pyproject-hooks - # pytest typing-extensions==4.9.0 - # via - # -r requirements/prod.txt - # faker - # kombu - # pytest-factoryboy + # via pytest-factoryboy tzdata==2023.4 # via # -r requirements/prod.txt - # backports-zoneinfo # celery urllib3==2.1.0 # via