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

Jump to bottom

Drop support for PY36 #1259

Merged
merged 5 commits into from May 24, 2022
Merged

Drop support for PY36 #1259

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
237954a
Drop support for PY36
waylan May 24, 2022
a0db920
Remove py36 tests
waylan May 24, 2022
dc89762
Test a more recent pypy version.
waylan May 24, 2022
47886dc
Attempt to test multiple pypy versions
waylan May 24, 2022
d926bfd
Remove pep562 backport
waylan May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/tox.yml
View file
Open in desktop
Expand Up @@ -20,10 +20,8 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
tox-env: [py36, py37, py38, py39, py310, pypy3, pygments]
tox-env: [py37, py38, py39, py310, pypy3, pygments]
include:
- tox-env: py36
python-version: '3.6'
- tox-env: py37
python-version: '3.7'
- tox-env: py38
Expand All @@ -33,7 +31,7 @@ jobs:
- tox-env: py310
python-version: '3.10'
- tox-env: pypy3
python-version: pypy3
python-version: pypy-3.7
Copy link
Member Author

Choose a reason for hiding this comment

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

If we wait for the next release of actions/setup-python, it will presumably include the changes in actions/setup-python#349. Then we can exclude the - from the version (like this pypy3.7), which is more consistent with all other version indicators.

Additionally, I wonder if we should perhaps run pypy tests for all supported versions (3.7, 3.8, 3.9).

- tox-env: pygments
python-version: '3.7'

Expand All @@ -43,7 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/change_log/release-3.4.md
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ title: Release Notes for v3.4

# Python-Markdown 3.4 Release Notes

Python-Markdown version 3.4 supports Python versions 3.6, 3.7, 3.8, 3.9, 3.10 and
Python-Markdown version 3.4 supports Python versions 3.7, 3.8, 3.9, 3.10 and
PyPy3.

## Backwards-incompatible changes
Expand Down
2 changes: 1 addition & 1 deletion markdown/__meta__.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
# (1, 2, 0, 'beta', 2) => "1.2b2"
# (1, 2, 0, 'rc', 4) => "1.2rc4"
# (1, 2, 0, 'final', 0) => "1.2"
__version_info__ = (3, 3, 7, 'final', 0)
__version_info__ = (3, 4, 0, 'dev', 0)


def _get_version(version_info):
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ def get_version():
maintainer_email='python.markdown@gmail.com',
license='BSD License',
packages=['markdown', 'markdown.extensions'],
python_requires='>=3.6',
python_requires='>=3.7',
install_requires=["importlib-metadata>=4.4;python_version<'3.10'"],
extras_require={
'testing': [
Expand Down Expand Up @@ -113,7 +113,6 @@ def get_version():
'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 Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
@@ -1,5 +1,5 @@
[tox]
envlist = py36, py37, py38, py39, py310, pypy3, pygments, flake8, checkspelling, pep517check, checklinks
envlist = py37, py38, py39, py310, pypy3, pygments, flake8, checkspelling, pep517check, checklinks
isolated_build = True

[testenv]
Expand Down