From 36b5fbbee3e966304db4e776e0da86d6166b7912 Mon Sep 17 00:00:00 2001 From: slush Date: Tue, 10 Dec 2024 19:33:55 -0600 Subject: [PATCH 1/4] feat: pep-625 compliance and enabling python 3.13 --- .github/workflows/test.yaml | 2 +- pyproject.toml | 4 ++-- setup.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 64b856f..621affa 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] # eventually add `windows-latest` - python-version: ["3.10", "3.11", "3.12"] + python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] env: GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pyproject.toml b/pyproject.toml index 67afbd8..88a92f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=51.1.1", "wheel", "setuptools_scm[toml]>=5.0"] +requires = ["setuptools>=75.6.0", "wheel", "setuptools_scm[toml]>=5.0"] [tool.mypy] exclude = "build/" @@ -15,7 +15,7 @@ write_to = "ape_vyper/version.py" [tool.black] line-length = 100 -target-version = ['py310', 'py311', 'py312'] +target-version = ['py39', 'py310', 'py311', 'py312', 'py313'] include = '\.pyi?$' [tool.pytest.ini_options] diff --git a/setup.py b/setup.py index 7289746..b26dc4f 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "mdformat-pyproject>=0.0.2", # Allows configuring in pyproject.toml ], "release": [ # `release` GitHub Action job uses this - "setuptools", # Installation tool + "setuptools>=75.6.0", # Installation tool "wheel", # Packaging tool "twine", # Package upload tool ], @@ -88,8 +88,10 @@ "Operating System :: MacOS", "Operating System :: POSIX", "Programming Language :: Python :: 3", + "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", ], ) From 1f9b3d2018e7eb4e44dec37dc2fe075755f85a50 Mon Sep 17 00:00:00 2001 From: slush Date: Tue, 10 Dec 2024 19:35:02 -0600 Subject: [PATCH 2/4] feat: update dep --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index b26dc4f..3fea7eb 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,8 @@ "mypy>=1.13.0,<2", # Static type analyzer "types-setuptools", # Needed due to mypy typeshed "flake8>=7.1.1,<8", # Style linter + "flake8-breakpoint>=1.1.0,<2", # Detect breakpoints left in code + "flake8-print>=5.0.0,<6", # Detect print statements left in code "flake8-pydantic", # For detecting issues with Pydantic models "flake8-type-checking", # Detect imports to move in/out of type-checking blocks "isort>=5.13.2", # Import sorting linter From 2b45a34dddd0460bdf1fd69bcc9db543985311cf Mon Sep 17 00:00:00 2001 From: slush Date: Tue, 10 Dec 2024 19:41:49 -0600 Subject: [PATCH 3/4] chore: typo fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3fea7eb..c660e64 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ "vvm>=0.2.0,<0.3", "vyper>=0.3.7,<0.5", ], - python_requires=">=3.10,<4", + python_requires=">=3.9,<4", extras_require=extras_require, py_modules=["ape_vyper"], entry_points={ From 383614864bf3b357aa1debaece845188c07ccb98 Mon Sep 17 00:00:00 2001 From: slush Date: Tue, 10 Dec 2024 19:51:32 -0600 Subject: [PATCH 4/4] chore: add back in 3.10 minimum --- .github/workflows/test.yaml | 2 +- pyproject.toml | 2 +- setup.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 621affa..a690eca 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -66,7 +66,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] # eventually add `windows-latest` - python-version: [3.9, "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13"] env: GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/pyproject.toml b/pyproject.toml index 88a92f9..d0fa622 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ write_to = "ape_vyper/version.py" [tool.black] line-length = 100 -target-version = ['py39', 'py310', 'py311', 'py312', 'py313'] +target-version = ['py310', 'py311', 'py312', 'py313'] include = '\.pyi?$' [tool.pytest.ini_options] diff --git a/setup.py b/setup.py index c660e64..1aef835 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ "vvm>=0.2.0,<0.3", "vyper>=0.3.7,<0.5", ], - python_requires=">=3.9,<4", + python_requires=">=3.10,<4", extras_require=extras_require, py_modules=["ape_vyper"], entry_points={ @@ -90,7 +90,6 @@ "Operating System :: MacOS", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12",