From 8c8d4463ac9e68160c54d4fc541ee0896d16b27b Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Mon, 4 Sep 2023 19:16:47 -0400 Subject: [PATCH] Drop Python 3.6, add 3.11 --- .github/workflows/build-wheels.yml | 1 - .github/workflows/{tests.yml => run-tests.yml} | 20 +++++++++----------- .pre-commit-config.yaml | 2 +- CHANGELOG | 4 +++- appveyor.yml | 8 -------- docs/changelog.rst | 6 ++++-- setup.py | 6 +++--- 7 files changed, 20 insertions(+), 27 deletions(-) rename .github/workflows/{tests.yml => run-tests.yml} (77%) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index d9d78b4..7e4c8a3 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -1,5 +1,4 @@ name: Build wheels - on: push jobs: diff --git a/.github/workflows/tests.yml b/.github/workflows/run-tests.yml similarity index 77% rename from .github/workflows/tests.yml rename to .github/workflows/run-tests.yml index 1003f71..9193884 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,20 +1,18 @@ -name: Tests +name: Run tests on: [push, pull_request] jobs: test: + runs-on: ubuntu-latest strategy: matrix: python-version: - - 3.6 - - 3.7 - - 3.8 - - 3.9 - - "3.10" - with-extension: ["0", "1"] - - runs-on: ubuntu-18.04 - + - '3.7' + - '3.8' + - '3.9' + - '3.10' + - '3.11' + with-extension: ['0', '1'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -35,4 +33,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - coveralls + coveralls --service=github diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index daac892..44afee4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 21.8b0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/doublify/pre-commit-clang-format diff --git a/CHANGELOG b/CHANGELOG index 6d716be..19641b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ -v0.7 (unreleased): +v0.6.5 (unreleased): +- Dropped support for end-of-life Python 3.6. +- Added support for Python 3.11. - Fixed parsing of leading zeros in named HTML entities. (#288) - Fixed memory leak parsing tags. (#303) diff --git a/appveyor.yml b/appveyor.yml index c8436f5..7f4ad23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,14 +21,6 @@ environment: secure: w9ql7j0y9fatBSCgsUn1MDFsDvc0WXY88K8hNBHZzq6uBPxWMd7ZblMZSJv4Nywr6ViudQCn4qM/Emm7R8UgKGnHeSX+B8V41ywKgbszEh9wKtuMWI5htsfjaD3Yib/dz/ynGDKEf3nkE6rP2j9bfVLMUARHmvztL+G2rUrjj2GQTqs0ddJ16OudDo2aA/ClsW1Zexc5GPgkun5+JFneUeVV59/bwORGfSjgEtoMyIQ8mdFs/My4sImC+jXFfSHD6s08anIuNX5KO6SSg5mwcxZq+1PweceHivJ87VvCI7w= matrix: - - PYTHON: "C:\\Python36" - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "32" - - - PYTHON: "C:\\Python36-x64" - PYTHON_VERSION: "3.6" - PYTHON_ARCH: "64" - - PYTHON: "C:\\Python37" PYTHON_VERSION: "3.7" PYTHON_ARCH: "32" diff --git a/docs/changelog.rst b/docs/changelog.rst index 21007c3..e2af82d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,12 +1,14 @@ Changelog ========= -v0.7 ----- +v0.6.5 +------ Unreleased (`changes `__): +- Dropped support for end-of-life Python 3.6. +- Added support for Python 3.11. - Fixed parsing of leading zeros in named HTML entities. (`#288 `_) - Fixed memory leak parsing tags. diff --git a/setup.py b/setup.py index 203b95a..68c22aa 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #! /usr/bin/env python # -# Copyright (C) 2012-2021 Ben Kurtovic +# Copyright (C) 2012-2023 Ben Kurtovic # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -87,7 +87,7 @@ setup( else [], tests_require=["pytest"], version=__version__, - python_requires=">= 3.6", + python_requires=">= 3.7", author="Ben Kurtovic", author_email="ben.kurtovic@gmail.com", url="https://github.com/earwig/mwparserfromhell", @@ -105,11 +105,11 @@ setup( "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "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", "Topic :: Text Processing :: Markup", ], )