From dbde049200bf8203d76c15e92c9fd8b2ffae8171 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:36:51 +0100 Subject: [PATCH 1/5] Move metadata to pyproject Co-authored-by: Ran Benita --- MANIFEST.in | 1 - pyproject.toml | 34 ++++++++++++++++++++++++++++++++++ setup.cfg | 2 -- setup.py | 40 ---------------------------------------- 4 files changed, 34 insertions(+), 43 deletions(-) delete mode 100644 MANIFEST.in create mode 100644 pyproject.toml delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 1aba38f..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include LICENSE diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a51c3c2 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,34 @@ +[build-system] +requires = ["setuptools>=75.0"] +build-backend = "setuptools.build_meta" + +[project] +name = "mypy_extensions" +version = "1.0.0-dev" +description = "Type system extensions for programs checked with the mypy type checker." +readme = "README.md" +authors = [ + {name = "The mypy developers", email = "jukka.lehtosalo@iki.fi"} +] +license = {text = "MIT"} +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "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 :: 3.12", + "Topic :: Software Development", +] +requires-python = ">=3.7" + +[project.urls] +Homepage = "https://github.com/python/mypy_extensions" + +[tool.setuptools] +py-modules = ["mypy_extensions"] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index aa76bae..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[bdist_wheel] -universal=0 diff --git a/setup.py b/setup.py deleted file mode 100644 index 259d058..0000000 --- a/setup.py +++ /dev/null @@ -1,40 +0,0 @@ -from setuptools import setup - -version = '1.0.0-dev' -description = 'Type system extensions for programs checked with the mypy type checker.' -long_description = ''' -Mypy Extensions -=============== - -The "mypy_extensions" module defines extensions to the standard "typing" module -that are supported by the mypy type checker and the mypyc compiler. -'''.lstrip() - -classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 3', - '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 :: 3.12', - 'Topic :: Software Development', -] - -setup( - name='mypy_extensions', - python_requires='>=3.7', - version=version, - description=description, - long_description=long_description, - author='The mypy developers', - author_email='jukka.lehtosalo@iki.fi', - url='https://github.com/python/mypy_extensions', - license='MIT License', - py_modules=['mypy_extensions'], - classifiers=classifiers, -) From 43ed8a9787d39fb4de1485f58a591810f58cecb7 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:11:02 +0100 Subject: [PATCH 2/5] Include test files in sdist --- MANIFEST.in | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..d0bc2e5 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,6 @@ +# files necessary for testing sdist +graft tests +include tox.ini + +global-exclude *.py[cod] +global-exclude .DS_Store From 5a7921dfa062781181a14f259668c8cc65dde12e Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 21 Jan 2025 00:58:12 +0100 Subject: [PATCH 3/5] Drop Python 3.7 + 3.8 and add 3.13 --- .github/workflows/test.yml | 12 +++++------- pyproject.toml | 5 ++--- tox.ini | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 206d3af..75dc313 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ permissions: {} jobs: lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest timeout-minutes: 10 permissions: contents: read @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.11 @@ -37,7 +37,7 @@ jobs: run: tox -e lint test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest timeout-minutes: 10 permissions: contents: read @@ -46,19 +46,17 @@ jobs: fail-fast: false matrix: python: [ - "3.7.1", - "3.7", - "3.8", "3.9", "3.10", "3.11", "3.12", + "3.13", ] steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} allow-prereleases: true diff --git a/pyproject.toml b/pyproject.toml index a51c3c2..7815c35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,15 +17,14 @@ classifiers = [ "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", - "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 :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Software Development", ] -requires-python = ">=3.7" +requires-python = ">=3.9" [project.urls] Homepage = "https://github.com/python/mypy_extensions" diff --git a/tox.ini b/tox.ini index d62caa1..1b09420 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] -minversion = 2.9.1 +minversion = 4.4.4 skip_missing_interpreters = true -envlist = py37, py38, py39, py310, py311, py312 +envlist = py39, py310, py311, py312, py313 [testenv] description = run the test driver with {basepython} From 50475f3251378608eebbb2c3557c40b157a32352 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 21 Jan 2025 01:01:50 +0100 Subject: [PATCH 4/5] Add back support for 3.8 --- .github/workflows/test.yml | 1 + pyproject.toml | 1 + tox.ini | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75dc313..7168992 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,6 +46,7 @@ jobs: fail-fast: false matrix: python: [ + "3.8", "3.9", "3.10", "3.11", diff --git a/pyproject.toml b/pyproject.toml index 7815c35..fd8a5d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,7 @@ classifiers = [ "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/tox.ini b/tox.ini index 1b09420..3412839 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 4.4.4 skip_missing_interpreters = true -envlist = py39, py310, py311, py312, py313 +envlist = py38, py39, py310, py311, py312, py313 [testenv] description = run the test driver with {basepython} From 8eff3b88fef137ec40f30377dd15bbbcd9ad108e Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 21 Jan 2025 01:26:13 +0100 Subject: [PATCH 5/5] Fix --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fd8a5d1..1e24d57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", "Topic :: Software Development", ] -requires-python = ">=3.9" +requires-python = ">=3.8" [project.urls] Homepage = "https://github.com/python/mypy_extensions"