Skip to content

Commit

Permalink
Merge pull request #197 from johnthagen/drop-py3.6
Browse files Browse the repository at this point in the history
Drop Python 3.6 support
  • Loading branch information
Natim committed Aug 4, 2022
2 parents a6975d9 + d19e4be commit 64e3682
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 16 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10']
django-version: ['2.2', '3.1', '3.2', '4.0', 'main']
exclude:
# Django prior to 3.2 does not support Python 3.10
Expand All @@ -18,10 +18,6 @@ jobs:
- django-version: '3.1'
python-version: '3.10'
# Django after 3.2 dropped support for Python prior to 3.8
- django-version: '4.0'
python-version: '3.6'
- django-version: 'main'
python-version: '3.6'
- django-version: '4.0'
python-version: '3.7'
- django-version: 'main'
Expand Down
12 changes: 7 additions & 5 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@ This document describes changes between past releases. For information about
future releases, check `milestones`_ and :doc:`/about/vision`.


2.3 (unreleased)
2.4 (Unreleased)
----------------

- Drop support for Python 3.6


2.3 (2022-01-11)
----------------

- Drop Django 3.0 support
- Add Django 3.2 support
- Add support for Python 3.10
- Add support for Django 4.0

2.2 (unreleased)
----------------

- Remove support for Python 3.5 and Django 1.11
- Add support for Python 3.9 and Django 3.1
- Remove old urls syntax and adopt the new one
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Install
Requirements
************

`django-downloadview` has been tested with `Python`_ 3.6, 3.7 and 3.8. Other
versions may work, but they are not part of the test suite at the moment.
`django-downloadview` has been tested with `Python`_ 3.7, 3.8, 3.9 and 3.10.
Other versions may work, but they are not part of the test suite at the moment.

Installing `django-downloadview` will automatically trigger the installation of
the following requirements:
Expand Down
2 changes: 1 addition & 1 deletion demo/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Deploy the demo

System requirements:

* `Python`_ version 3.6+, available as ``python`` command.
* `Python`_ version 3.7+, available as ``python`` command.

.. note::

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
envlist =
py{36,37,38,39,310}-dj{22,31,32}
py{37,38,39,310}-dj{22,31,32}
py{38,39,310}-dj{40,main}
lint
sphinx
readme

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38, lint, sphinx, readme
3.9: py39
Expand Down

0 comments on commit 64e3682

Please sign in to comment.