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

Drop support for EOL Python 3.4 and 3.5 #842

Merged
merged 4 commits into from
Aug 12, 2022
Merged

Drop support for EOL Python 3.4 and 3.5 #842

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
497f94d
Drop support for EOL Python 3.4
hugovk Nov 14, 2021
e97cc66
Merge branch 'main' into main
hugovk Apr 28, 2022
1f355d5
Merge remote-tracking branch 'upstream/main'
hugovk Aug 12, 2022
fed762d
Drop support for EOL Python 3.5
hugovk Aug 12, 2022
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/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ As a minimum, tests should be run using Python 3.5+.

I use [pythonbrew](https://github.com/utahta/pythonbrew) and [Tox](https://tox.readthedocs.io/en/latest/) to test with a variety of Python versions. See the Makefile for example test targets. A `tox.ini` file is already configured.
Copy link
Owner

Choose a reason for hiding this comment

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

Note to self. Remove this line about tox after merge.


When you push your changes they will also be tested using GitHub actions.
When you push your changes they will also be tested using GitHub Actions.


### Documentation
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/python-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ jobs:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
python-version: [3.x, pypy3]
python-version: ["pypy-3.8", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ As a minimum, tests should be run using Python 3.5+.

I use [pythonbrew](https://github.com/utahta/pythonbrew) and [Tox](https://tox.readthedocs.io/en/latest/) to test with a variety of Python versions. See the Makefile for example test targets. A `tox.ini` file is already configured.

When you push your changes they will also be tested using GitHub actions.
When you push your changes they will also be tested using GitHub Actions.


### Documentation
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ test:

# Test with stable Python 2/3 releases.
testpythons:
@echo "Testing with Python 3.4.1:"
@~/.pythonbrew/pythons/Python-3.4.1/bin/py.test -q
@echo "Testing with Python 3.5.0:"
@~/.pythonbrew/pythons/Python-3.5.0/bin/py.test -q
@echo "Testing with Python 3.6.6:"
Expand All @@ -50,6 +48,8 @@ testpythons:
@~/.pythonbrew/pythons/Python-3.8.0/bin/py.test -q
@echo "Testing with Python 3.9.0:"
@~/.pythonbrew/pythons/Python-3.9.0/bin/py.test -q
@echo "Testing with Python 3.10.0:"
@~/.pythonbrew/pythons/Python-3.10.0/bin/py.test -q

test_flake8:
@ls -1 xlsxwriter/*.py | egrep -v "theme|__init__" | xargs flake8 --show-source
Expand Down
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
except ImportError:
from distutils.core import setup, Command

if sys.version_info < (3, 4, 0):
warn("The minimum Python version supported by XlsxWriter is 3.4.1")
if sys.version_info < (3, 5):
warn("The minimum Python version supported by XlsxWriter is 3.5")
exit()


Expand Down Expand Up @@ -42,14 +42,14 @@ def run(self):
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
],
python_requires='>=3.4',
python_requires='>=3.5',
)