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.

Sign up for GitHub

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

Jump to bottom

Update tox matrix versions #91

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update tox matrix versions #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6e723c
Update tox matrix versions
janbrasna Jun 20, 2024
39cf3f7
Update README testing info
janbrasna Jun 20, 2024
a444cd4
Update setup versions
janbrasna Jun 26, 2024
e46d22a
Update required requests
janbrasna Jun 26, 2024
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
19 changes: 8 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,22 @@ jobs:
strategy:
matrix:
python-version:
# CPython
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
django-tox-env:
- "django22"
- "django32"
- "django40"
- "django42"
- "django50"
exclude:
# We don't want every combination of the above, as some are not compatible
- python-version: "3.6"
- python-version: "3.11"
django-tox-env: "django32"
- python-version: "3.11"
django-tox-env: "django40"

- python-version: "3.7"
django-tox-env: "django40"

- python-version: "3.10"
django-tox-env: "django22"
- python-version: "3.9"
django-tox-env: "django50"

name: Python ${{ matrix.python-version }} + ${{ matrix.django-tox-env }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Development
Patches are welcome.

To run tests, install ``tox`` and run ``tox`` from the project root.
This will run the tests in Python 3.7, 3.8 and 3.9 against
This will run the tests in Python 3.9, 3.10 and 3.11 against
janbrasna marked this conversation as resolved.
Show resolved Hide resolved
various appropriate Django versions. If you don't have ``tox`` and/or all the
versions of Python available, install ``nose``, ``mock``, ``requests``,
``responses`` and ``Django`` (see ``tox.ini``'s ``deps``) and run the
Expand Down
7 changes: 3 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@ def find_version(*file_paths):
packages=find_packages(),
include_package_data=True,
zip_safe=False,
install_requires=["Django>=2.2", "requests>=2.21.0"],
install_requires=["Django>=3.2", "requests>=2.26.0"],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TL;DR the rest is mostly metadata, so this is really the only impact here — basically moving the requires in line with what is pinned for testing, to have the visibility into confirming it truly working. Feel free to revert if you feel like still keeping the older (and fully working as of now) versions around.

classifiers=[
"Development Status :: 4 - Beta",
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Environment :: Web Environment :: Mozilla",
"Framework :: Django",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Software Development :: Libraries :: Python Modules",
],
)
13 changes: 7 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,30 @@ args_are_paths = false
skip_missing_interpreters = true
envlist =
py3.9-flake8
{py3.7,py3.8,py3.9}-django22
{py3.7,py3.8,py3.9,py3.10}-django32
{py3.8,py3.9,py3.10}-django40
{py3.9,py3.10}-django32
{py3.9,py3.10}-django40
{py3.9,py3.10,py3.11}-django42
{py3.10,py3.11}-django50

[testenv]
usedevelop = true
pip_pre = true
allowlist_externals = ./runtests.py
commands = ./runtests.py
deps =
django22: Django>=2.2,<2.3
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
django50: Django>=5.0,<5.1

nose==1.3.7
mock==4.0.3
responses==0.15.0
requests==2.26.0
basepython =
py3.11: python3.11
py3.10: python3.10
py3.9: python3.9
py3.8: python3.8
py3.7: python3.7

[testenv:py3.9-flake8]
deps = flake8
Expand Down