From 5994f701c680eee291b94a1bf46e321d30a78e45 Mon Sep 17 00:00:00 2001 From: Juliya Smith Date: Mon, 20 May 2024 12:09:55 -0500 Subject: [PATCH 1/2] feat: 08 upgrade --- .github/workflows/test.yaml | 2 +- .pre-commit-config.yaml | 2 +- ape_tokens/converters.py | 3 ++- pyproject.toml | 2 +- setup.py | 4 +--- tests/test_integration.py | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aa36e33..af337dc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -65,7 +65,7 @@ jobs: # TODO: Replace with macos-latest when works again. # https://github.com/actions/setup-python/issues/808 os: [ubuntu-latest, macos-12] # eventually add `windows-latest` - python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] + python-version: [3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3919289..a35de4c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: rev: 0.7.17 hooks: - id: mdformat - additional_dependencies: [mdformat-gfm, mdformat-frontmatter] + additional_dependencies: [mdformat-gfm, mdformat-frontmatter, mdformat-pyproject] default_language_version: python: python3 diff --git a/ape_tokens/converters.py b/ape_tokens/converters.py index d47c936..595b1fb 100644 --- a/ape_tokens/converters.py +++ b/ape_tokens/converters.py @@ -1,5 +1,6 @@ +from collections.abc import Iterator from decimal import Decimal -from typing import Any, Iterator +from typing import Any from ape.api import ConverterAPI from ape.exceptions import ConversionError, ProviderNotConnectedError diff --git a/pyproject.toml b/pyproject.toml index 1242a30..0aa82b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ write_to = "ape_tokens/version.py" [tool.black] line-length = 100 -target-version = ['py38', 'py39', 'py310', 'py311', 'py312'] +target-version = ['py39', 'py310', 'py311', 'py312'] include = '\.pyi?$' [tool.pytest.ini_options] diff --git a/setup.py b/setup.py index 1bfab7b..0de62a0 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- from setuptools import find_packages, setup @@ -63,7 +62,7 @@ author_email="admin@apeworx.io", url="https://github.com/ApeWorX/ape-tokens", include_package_data=True, - python_requires=">=3.8,<4", + python_requires=">=3.9,<4", install_requires=[ "eth-ape>=0.7.0,<0.8", "tokenlists>=0.1.7", @@ -88,7 +87,6 @@ "Operating System :: MacOS", "Operating System :: POSIX", "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/tests/test_integration.py b/tests/test_integration.py index b6b12b2..5e31f98 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -2,5 +2,5 @@ def test_help(runner): - result = runner.invoke(cli, ["tokens", "--help"]) + result = runner.invoke(cli, ("tokens", "--help")) assert result.exit_code == 0, result.output From 71fb7530e740be47e3d30da8cb030d6e15c7b1af Mon Sep 17 00:00:00 2001 From: Dalena Date: Fri, 31 May 2024 15:28:12 -0500 Subject: [PATCH 2/2] chore: bump ape --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0de62a0..0669ade 100644 --- a/setup.py +++ b/setup.py @@ -64,7 +64,7 @@ include_package_data=True, python_requires=">=3.9,<4", install_requires=[ - "eth-ape>=0.7.0,<0.8", + "eth-ape>=0.8.1,<0.9", "tokenlists>=0.1.7", ], entry_points={