Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run on 3.11, and upgrade one package at a time. #269

Merged
merged 3 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
os:
- ubuntu-20.04
python-version:
- "3.10"
- "3.11"

steps:
- uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ RUN apt-get update && apt-get upgrade -qy
RUN apt-get install -qy \
git-core \
language-pack-en \
python3.10 \
python3.11 \
python3-pip \
python3.10-dev \
python3.11-dev \
libssl-dev
RUN pip3 install --upgrade pip setuptools

Expand Down
12 changes: 9 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ TYPEABLE = openedx_webhooks tests
mypy: ## Run mypy to check type annotations
-mypy $(TYPEABLE)

PIP_COMPILE = pip-compile --upgrade --allow-unsafe --resolver=backtracking
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## Update the requirements/*.txt files with the latest packages satisfying requirements/*.in
PIP_COMPILE = pip-compile --allow-unsafe --resolver=backtracking ${COMPILE_OPTS}
compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
compile-requirements: ## Update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
$(PIP_COMPILE) --rebuild -o requirements/pip.txt requirements/pip.in
Expand All @@ -51,6 +51,12 @@ upgrade: ## Update the requirements/*.txt files with the latest packages satisfy
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
$(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in

upgrade: ## Update the requirements/*.txt files with the latest packages satisfying requirements/*.in
$(MAKE) compile-requirements COMPILE_OPTS="--upgrade"

upgrade-package: ## Update just one package to the latest usable release
@test -n "$(package)" || { echo "\nUsage: make upgrade-package package=...\n"; exit 1; }
$(MAKE) compile-requirements COMPILE_OPTS="--upgrade-package $(package)"

PRIVATE_IN = requirements/private.in
PRIVATE_OUT = requirements/private.txt
Expand Down
4 changes: 1 addition & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -8,8 +8,6 @@ amqp==5.1.1
# via kombu
arrow==1.2.3
# via -r requirements/base.in
async-timeout==4.0.2
# via redis
attrs==23.1.0
# via glom
billiard==3.6.4.0
Expand Down
3 changes: 3 additions & 0 deletions requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ pip-tools # Requirements file management
python-dotenv
scriv # Changelog management
rq-dashboard
types-PyYAML
types-cachetools
types-requests
26 changes: 9 additions & 17 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -16,16 +16,12 @@ astroid==2.15.5
# via
# pylint
# pylint-celery
async-timeout==4.0.2
# via redis
attrs==23.1.0
# via
# glom
# scriv
babel==2.12.1
# via sphinx
backoff==2.2.1
# via repo-tools-data-schema
billiard==3.6.4.0
# via celery
bleach==6.0.0
Expand Down Expand Up @@ -99,8 +95,6 @@ docutils==0.18.1
# sphinx-rtd-theme
edx-lint==5.3.4
# via -r requirements/dev.in
exceptiongroup==1.1.1
# via pytest
face==20.1.1
# via glom
flask==2.3.2
Expand Down Expand Up @@ -250,7 +244,6 @@ requests==2.31.0
# -r requirements/base.in
# github3-py
# jira
# repo-tools-data-schema
# requests-mock
# requests-oauthlib
# requests-toolbelt
Expand Down Expand Up @@ -312,19 +305,18 @@ stevedore==5.1.0
# via code-annotations
text-unidecode==1.3
# via python-slugify
tomli==2.0.1
# via
# build
# coverage
# mypy
# pylint
# pyproject-hooks
# pytest
tomlkit==0.11.8
# via pylint
types-cachetools==5.3.0.6
# via -r requirements/dev.in
types-pyyaml==6.0.12.12
# via -r requirements/dev.in
types-requests==2.31.0.6
# via -r requirements/dev.in
types-urllib3==1.26.25.14
# via types-requests
typing-extensions==4.6.1
# via
# astroid
# jira
# mypy
uritemplate==4.1.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/doc.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand Down
6 changes: 1 addition & 5 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -14,10 +14,6 @@ pip-tools==6.13.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via
# build
# pyproject-hooks
wheel==0.40.0
# via pip-tools

Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand Down
13 changes: 1 addition & 12 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -10,14 +10,10 @@ amqp==5.1.1
# via kombu
arrow==1.2.3
# via -r requirements/base.in
async-timeout==4.0.2
# via redis
attrs==23.1.0
# via glom
babel==2.12.1
# via sphinx
backoff==2.2.1
# via repo-tools-data-schema
billiard==3.6.4.0
# via celery
bleach==6.0.0
Expand Down Expand Up @@ -73,8 +69,6 @@ docutils==0.18.1
# readme-renderer
# sphinx
# sphinx-rtd-theme
exceptiongroup==1.1.1
# via pytest
face==20.1.1
# via glom
flask==2.3.2
Expand Down Expand Up @@ -174,7 +168,6 @@ requests==2.31.0
# -r requirements/base.in
# github3-py
# jira
# repo-tools-data-schema
# requests-mock
# requests-oauthlib
# requests-toolbelt
Expand Down Expand Up @@ -224,10 +217,6 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
tomli==2.0.1
# via
# coverage
# pytest
typing-extensions==4.6.1
# via jira
uritemplate==4.1.1
Expand Down
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.10.8
python-3.11.6
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def get_requirements(path):
'License :: OSI Approved :: Apache Software License',
'Framework :: Flask',
'Programming Language :: Python',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
),
zip_safe=False,
)
Loading