Skip to content

Commit

Permalink
refactor: drop support for Python 3.6
Browse files Browse the repository at this point in the history
BREAKING CHANGE: bleach 5 doesn't support Python 3.6
  • Loading branch information
henri-hulski committed May 12, 2022
1 parent 0d5434b commit fe094f5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,27 @@ jobs:
matrix:
include:
# Django 2.2
- tox-env: "py36-dj22"
python-version: "3.6"
- tox-env: "py37-dj22"
python-version: "3.7"
- tox-env: "py38-dj22"
python-version: "3.8"
- tox-env: "py39-dj22"
python-version: "3.9"
# Django 3.0
- tox-env: "py36-dj30"
python-version: "3.6"
- tox-env: "py37-dj30"
python-version: "3.7"
- tox-env: "py38-dj30"
python-version: "3.8"
- tox-env: "py39-dj30"
python-version: "3.9"
# Django 3.1
- tox-env: "py36-dj31"
python-version: "3.6"
- tox-env: "py37-dj31"
python-version: "3.7"
- tox-env: "py38-dj31"
python-version: "3.8"
- tox-env: "py39-dj31"
python-version: "3.9"
# Django 3.2
- tox-env: "py36-dj32"
python-version: "3.6"
- tox-env: "py37-dj32"
python-version: "3.7"
- tox-env: "py38-dj32"
Expand Down
2 changes: 1 addition & 1 deletion docs/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ standard Django environment), with the following dependencies, which
unless noted as optional, should be installed automatically following
the above instructions:

* `Python`_ 3.6 to 3.10
* `Python`_ 3.7 to 3.10
* `Django`_ 2.2 to 4.0
* `django-contrib-comments`_ - for built-in threaded comments
* `Pillow`_ - for image resizing (`Python Imaging Library`_ fork)
Expand Down
2 changes: 1 addition & 1 deletion mezzanine/bin/management/commands/mezzanine_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def handle(self, *args, **options):

# The project template dir in Mezzanine requires __init__.py so that
# the documentation can be generated, but including it in new projects
# causes issues with running tests under Python >= 3.6, so remove it.
# causes issues with running tests under Python >= 3.7, so remove it.
os.remove(os.path.join(project_dir, "__init__.py"))

def get_project_directory(self, name, target):
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Expand All @@ -36,7 +35,7 @@ classifiers =
Topic :: Software Development :: Libraries :: Python Modules

[options]
python_requires = >=3.6
python_requires = >=3.7
packages = mezzanine
include_package_data = true
install_requires =
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{36,37,38,39,310}-dj{22,30,31,32,40}
py{37,38,39,310}-dj{22,30,31,32,40}
package
lint

Expand Down Expand Up @@ -42,7 +42,7 @@ skip_install = true
allowlist_externals = sh
deps = .[codestyle]
commands =
sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} +'
sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py37-plus \{\} +'

[testenv:format]
# This env is not run by default. It's provided here for you to easily
Expand All @@ -51,7 +51,7 @@ skip_install = true
allowlist_externals = sh
deps = .[codestyle]
commands =
sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} \;'
sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py37-plus \{\} \;'
isort --atomic .
black .

Expand Down

0 comments on commit fe094f5

Please sign in to comment.