Skip to content

Commit

Permalink
Remove Python 3.7 (after end-of-life and unsupported by requests>=2.32)
Browse files Browse the repository at this point in the history
  • Loading branch information
hynekcer committed May 22, 2024
1 parent abc98d7 commit bb139d0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 1
matrix:
python-version: [3.8, 3.11, "3.10", 3.7, 3.9]
python-version: [3.8, 3.12, 3.11, "3.10", 3.9]
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
Expand All @@ -41,11 +41,11 @@ jobs:
SF_PASSWORD: ${{ secrets.SF_PASSWORD }}
SF_HOST: ${{ secrets.SF_HOST }}

TOXENV_38: "docs_style,typing,clean,dj22-py38,dj32-py38"
TOXENV_311: "dj50-py311,dj42-py311"
TOXENV_38: "docs_style,typing,clean,dj22-py38,dj20-py38"
TOXENV_312: "dj50-py312"
TOXENV_311: "dj42-py311"
TOXENV_310: "dj40-py310"
TOXENV_37: "dj20-py37,dj30-py37"
TOXENV_39: "no_django-py39,debug_toolbar-dj42-py39"
TOXENV_39: "no_django-py39,debug_toolbar-dj42-py39,dj32-py39,dj30-py39"
run: |
TOXENV_NAME=$(echo TOXENV_${{ matrix.python-version }} | sed 's/\.//')
cat > salesforce/testrunner/local_settings.py <<'-- end local_settings --'
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django-salesforce
.. image:: https://badge.fury.io/py/django-salesforce.svg
:target: https://pypi.python.org/pypi/django-salesforce

.. image:: https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue
.. image:: https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue
:target: https://www.python.org/

.. image:: https://img.shields.io/badge/Django-2.0%2C%202.1%2C%202.2%20%7C%203.0%2C%203.1%20%2C%203.2%20%7C%204.0%2C%204.1%2C%204.2%20%7C%205.0-blue.svg
Expand All @@ -19,7 +19,7 @@ for most uses. It works by integrating with the Django ORM, allowing access to
the objects in your SFDC instance (Salesforce .com) as if they were in a
traditional database.

Python 3.7 to 3.12, Django 2.0 to 5.0. (Tested also with Python 3.13 alpha 2)
Python 3.8 to 3.12, Django 2.0 to 5.0. (Tested also with Python 3.13b1)

Use with Django 5.0 or 4.2(LTS) currently requires an enteprise license key DJSF_LICENSE_KEY
until August 2024 unless you accept the AGPL license and install our otherwise identical
Expand Down
21 changes: 10 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@
envlist =
docs_style
typing
# dj50-py313 # Django can not run with a current alpha version of Python 3.13
# dj50-py313
dj50-py312
dj42-py312
dj41-py311
dj40-py310
dj32-py39
dj30-py38
dj22-py37
dj20-py37
# djdev-py312
dj22-py38
dj20-py38
# djdev-py313
no_django-py311
debug_toolbar-dj50-py312
# pylint-dj42-py310`

# Python versions used for Github Actions with the latest Ubuntu 22 Jammy Jellyfish are 3.8, 3.11, "3.10", 3.7, 3.9
# Python versions used for Github Actions with the latest Ubuntu 22 Jammy Jellyfish are 3.8, 3.11, "3.10", 3.9

[testenv]
basepython =
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
Expand All @@ -36,7 +35,7 @@ basepython =
pypy: pypy
pypy3: pypy3
deps =
# minimal required versions for all supported Python versions
# listed also a range of Python versions officially supported by Django
dj20: Django~=2.0.0 # py34-37
dj21: Django~=2.1.0 # py35-37
dj22: Django~=2.2.17 # py35-37
Expand Down Expand Up @@ -87,12 +86,12 @@ commands =
[testenv:debug_toolbar-dj{32-py39,42-py39,50-py312}]
commands = {envpython} manage.py test tests.t_debug_toolbar --settings=tests.t_debug_toolbar.settings

[testenv:pylint-dj{20-py37,22-py37,30-py39,32-py39,40-py310,41-py310,42-py310}]
# Python 3.11 will require "wrapt>=1.14.1" and therefore Python between 3.7 and 3.10 is used with pylint
[testenv:pylint-dj{20-py38,22-py38,30-py39,32-py39,40-py310,41-py310,42-py310}]
# Python 3.11 will require "wrapt>=1.14.1" and therefore Python between 3.8 and 3.10 is used with pylint
setenv = DJANGO_SETTINGS_MODULE=salesforce.testrunner.settings
commands = pylint --reports=no salesforce

[testenv:no_django-py{37,39,311}]
[testenv:no_django-py{38,39,311}]
usedevelop=True
allowlist_externals =
rm
Expand All @@ -115,7 +114,7 @@ commands =
rstcheck --recursive README.rst CHANGELOG.rst docs

[testenv:typing]
# any python >= 3.5.3, < 3.9
# currently only python3.8 is supported for typing with django-salesforce-stubs
basepython = python3.8
deps =
mypy==0.770
Expand Down

0 comments on commit bb139d0

Please sign in to comment.