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.

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

Declare support for Python 3.11, test 3.12-dev, drop EOL 3.6 #2324

Merged
merged 5 commits into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Pygments

on: [push, pull_request]

env:
FORCE_COLOR: 1

permissions:
contents: read # to fetch code (actions/checkout)

Expand All @@ -10,15 +13,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
exclude:
- os: ubuntu-latest
python-version: "3.6"
include:
- os: ubuntu-20.04
python-version: "3.6"
max-parallel: 4
os: [windows-latest, ubuntu-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]

steps:
- uses: actions/checkout@v3
Expand All @@ -39,6 +35,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Run make check
run: make check
- name: Fail if the basic checks failed
Expand All @@ -50,6 +48,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.x"
- name: Regenerate mapfiles
run: make mapfiles
- name: Fail if mapfiles changed
Expand All @@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: "3.x"
- name: Check out regexlint
run: git clone https://github.com/pygments/regexlint
- name: Run regexlint
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches:
- master

env:
FORCE_COLOR: 1

permissions: {}
jobs:
build:
Expand All @@ -14,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.x"
- name: Checkout Pygments
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Sphinx & WCAG contrast ratio
run: pip install Sphinx wcag-contrast-ratio
- name: Create Pyodide WASM package
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ 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
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Text Processing :: Filters
Expand All @@ -38,7 +38,7 @@ project_urls =
packages = find:
zip_safe = false
include_package_data = true
python_requires = >=3.6
python_requires = >=3.7

[options.packages.find]
include =
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36, 37, 38, 39, 310}, lint
envlist = py{37, 38, 39, 310, 311, 312}, lint

[testenv]
deps =
Expand Down