Skip to content

Commit

Permalink
Adding Python 3.12 and Django 5.0 back into the test runners, updatin…
Browse files Browse the repository at this point in the history
…g the pyproject.toml to fix the compile issues
  • Loading branch information
StevenMapes committed Dec 14, 2023
1 parent 95245d0 commit a9595fa
Show file tree
Hide file tree
Showing 17 changed files with 1,263 additions and 60 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- 3.9
- '3.10'
- '3.11'
- '3.12'

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- # 1.0.13 - 14th December 2023
- Adding Django 4.2 into the matrix of tests replacing 4.2a1
- Adding Django 5 into the tox runner

# 1.0.12 - 20th September 2023
- Updating the README file with additional examples.
- Adding in additional unit tests to improve coverage from 86% to 96%.
Expand Down
30 changes: 27 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,42 @@ skip = [

[project]
name = "django-aws-api-gateway-websockets"
version = "1.0.11"
version = "1.0.13"
authors = [
{ name="Steven Mapes", email="[email protected]" },
]
description = "Created to allow Django projects to be used as a HTTP backend for AWS API Gateway websockets"
readme = "README.md"
requires-python = ">=3.8"
install_requires = "Django>=3.2.0"
keywords = [
"Django",
"WebSockets",
"AWS",
"API Gateway",
"Amazon WebServices"
]
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Development Status :: 5 - Production/Stable",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"Natural Language :: English",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Websockets",
"License :: OSI Approved :: MIT License",
]
license_file = "LICENSE"

[project.urls]
"Homepage" = "https://github.com/StevenMapes/django-aws-api-gateway-websockets"
Expand Down
52 changes: 26 additions & 26 deletions requirements/compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,38 +160,38 @@
"python",
*common_args,
"-P",
"Django==5.0a1",
"Django>=5.0,<5.1",
"-o",
"py311-django50.txt",
],
check=True,
capture_output=True,
)
# if (3, 12, 0) <= py_version < (3, 13, 0):
# subprocess.run(
# [
# "python",
# *common_args,
# "-P",
# "Django>=4.2,<5",
# "-o",
# "py312-django42.txt",
# ],
# check=True,
# capture_output=True,
# )
# subprocess.run(
# [
# "python",
# *common_args,
# "-P",
# "Django==5.0a1",
# "-o",
# "py312-django50.txt",
# ],
# check=True,
# capture_output=True,
# )
if (3, 12, 0) <= py_version < (3, 13, 0):
subprocess.run(
[
"python",
*common_args,
"-P",
"Django>=4.2,<5",
"-o",
"py312-django42.txt",
],
check=True,
capture_output=True,
)
subprocess.run(
[
"python",
*common_args,
"-P",
"Django>=5.0,<5.1",
"-o",
"py312-django50.txt",
],
check=True,
capture_output=True,
)

# Use SED to remove the --extra-index-url lines from every file
sed_args = ["sed", "-i", "-e", "s/--extra-index-url .*$//g"]
Expand Down
6 changes: 3 additions & 3 deletions requirements/py310-django41.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ distlib==0.3.7 \
--hash=sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057 \
--hash=sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8
# via virtualenv
django==4.1.11 \
--hash=sha256:7b134688965dd331ca4d11ed38e5ce594caed0e906689a9b95251c29c2c03990 \
--hash=sha256:cac9df0ba87b4f439e1a311ef22f75c938fc874bebf1fbabaed58d0e6d559a25
django==4.1.13 \
--hash=sha256:04ab3f6f46d084a0bba5a2c9a93a3a2eb3fe81589512367a75f79ee8acf790ce \
--hash=sha256:94a3f471e833c8f124ee7a2de11e92f633991d975e3fa5bdd91e8abd66426318
# via -r requirements.in
exceptiongroup==1.1.3 \
--hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
Expand Down
6 changes: 3 additions & 3 deletions requirements/py310-django42.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ distlib==0.3.7 \
--hash=sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057 \
--hash=sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8
# via virtualenv
django==4.2.5 \
--hash=sha256:5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1 \
--hash=sha256:b6b2b5cae821077f137dc4dade696a1c2aa292f892eca28fa8d7bfdf2608ddd4
django==4.2.8 \
--hash=sha256:6cb5dcea9e3d12c47834d32156b8841f533a4493c688e2718cafd51aa430ba6d \
--hash=sha256:d69d5e36cc5d9f4eb4872be36c622878afcdce94062716cf3e25bcedcb168b62
# via -r requirements.in
exceptiongroup==1.1.3 \
--hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \
Expand Down
6 changes: 3 additions & 3 deletions requirements/py311-django41.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ distlib==0.3.7 \
--hash=sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057 \
--hash=sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8
# via virtualenv
django==4.1.11 \
--hash=sha256:7b134688965dd331ca4d11ed38e5ce594caed0e906689a9b95251c29c2c03990 \
--hash=sha256:cac9df0ba87b4f439e1a311ef22f75c938fc874bebf1fbabaed58d0e6d559a25
django==4.1.13 \
--hash=sha256:04ab3f6f46d084a0bba5a2c9a93a3a2eb3fe81589512367a75f79ee8acf790ce \
--hash=sha256:94a3f471e833c8f124ee7a2de11e92f633991d975e3fa5bdd91e8abd66426318
# via -r requirements.in
filelock==3.12.4 \
--hash=sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4 \
Expand Down
6 changes: 3 additions & 3 deletions requirements/py311-django42.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ distlib==0.3.7 \
--hash=sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057 \
--hash=sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8
# via virtualenv
django==4.2.5 \
--hash=sha256:5e5c1c9548ffb7796b4a8a4782e9a2e5a3df3615259fc1bfd3ebc73b646146c1 \
--hash=sha256:b6b2b5cae821077f137dc4dade696a1c2aa292f892eca28fa8d7bfdf2608ddd4
django==4.2.8 \
--hash=sha256:6cb5dcea9e3d12c47834d32156b8841f533a4493c688e2718cafd51aa430ba6d \
--hash=sha256:d69d5e36cc5d9f4eb4872be36c622878afcdce94062716cf3e25bcedcb168b62
# via -r requirements.in
filelock==3.12.4 \
--hash=sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4 \
Expand Down
6 changes: 3 additions & 3 deletions requirements/py311-django50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ distlib==0.3.7 \
--hash=sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057 \
--hash=sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8
# via virtualenv
django==5.0a1 \
--hash=sha256:3a52052fbc5e01f2202c020a8241aa40dc030b16c8fb49dc480cc46ab8735158 \
--hash=sha256:4b7ee536e8b2bf1e68f6c9bda192300ec94844e32e730076c2e520bc63dac64e
django==5.0 \
--hash=sha256:3a9fd52b8dbeae335ddf4a9dfa6c6a0853a1122f1fb071a8d5eca979f73a05c8 \
--hash=sha256:7d29e14dfbc19cb6a95a4bd669edbde11f5d4c6a71fdaa42c2d40b6846e807f7
# via -r requirements.in
filelock==3.12.4 \
--hash=sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4 \
Expand Down
Loading

0 comments on commit a9595fa

Please sign in to comment.