From 497f94d950ad1d51dcc3f3fe9509693b82d58f86 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 14 Nov 2021 16:33:35 +0200 Subject: [PATCH 1/2] Drop support for EOL Python 3.4 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/python-app.yml | 3 ++- CONTRIBUTING.md | 2 +- Makefile | 4 ++-- setup.py | 8 ++++---- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e11f342aa..c3f933a91 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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. -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 diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index bc1518862..61e5a2145 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7576446a4..2231ed5dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/Makefile b/Makefile index e04860039..357721613 100644 --- a/Makefile +++ b/Makefile @@ -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:" @@ -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 diff --git a/setup.py b/setup.py index 5e2da350e..8874f21ff 100644 --- a/setup.py +++ b/setup.py @@ -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() @@ -42,8 +42,8 @@ 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', @@ -51,5 +51,5 @@ def run(self): 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', ], - python_requires='>=3.4', + python_requires='>=3.5', ) From fed762d8049d2a53c3c16d74dbe833b97671edd4 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 12 Aug 2022 08:59:43 +0300 Subject: [PATCH 2/2] Drop support for EOL Python 3.5 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/python-app.yml | 2 +- CONTRIBUTING.md | 2 +- Makefile | 4 +--- setup.py | 7 +++---- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c3f933a91..50b2ec425 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -37,7 +37,7 @@ There is a make target that will verify the source and test files using [flake8] ### Running tests -As a minimum, tests should be run using Python 3.5+. +As a minimum, tests should be run using Python 3.6+. make test diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 61e5a2145..3823a13a9 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["pypy-3.8", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["pypy-3.8", "3.6", "3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2231ed5dd..867085ab8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,7 +101,7 @@ There is a make target that will verify the source and test files using [flake8] ### Running tests -As a minimum, tests should be run using Python 3.5+. +As a minimum, tests should be run using Python 3.6+. make test # or diff --git a/Makefile b/Makefile index 1682794f2..d61aeda3c 100644 --- a/Makefile +++ b/Makefile @@ -36,10 +36,8 @@ install: test: @~/.pythonbrew/pythons/Python-3.9.0/bin/python -m unittest discover -# Test with stable Python 2/3 releases. +# Test with stable Python 3 releases. testpythons: - @echo "Testing with Python 3.5.0:" - @~/.pythonbrew/pythons/Python-3.5.0/bin/py.test -q @echo "Testing with Python 3.6.6:" @~/.pythonbrew/pythons/Python-3.6.6/bin/py.test -q @echo "Testing with Python 3.7.0:" diff --git a/setup.py b/setup.py index f576b0d33..0339740f0 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,8 @@ except ImportError: from distutils.core import setup, Command -if sys.version_info < (3, 5): - warn("The minimum Python version supported by XlsxWriter is 3.5") +if sys.version_info < (3, 6): + warn("The minimum Python version supported by XlsxWriter is 3.6") exit() @@ -44,12 +44,11 @@ def run(self): 'Programming Language :: Python', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3', - '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.5', + python_requires='>=3.6', )