Merge branch 'main' of https://github.com/ApeWorX/ape-polygon into fe…

…at/pol-update
ApeWorX · Sep 10, 2024 · 115a3c4 · 115a3c4
2 parents ff270da + 945142d
commit 115a3c4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -22,7 +22,9 @@ jobs:
               python-version: "3.10"
 
         - name: Install Dependencies
-          run: pip install .[lint]
+          run: |
+            python -m pip install --upgrade pip
+            pip install .[lint]
 
         - name: Run Black
           run: black --check .
@@ -48,7 +50,9 @@ jobs:
               python-version: "3.10"
 
         - name: Install Dependencies
-          run: pip install .[lint,test]  # Might need test deps
+          run: |
+            python -m pip install --upgrade pip
+            pip install .[lint,test]  # Might need test deps
 
         - name: Run MyPy
           run: mypy .
@@ -70,7 +74,9 @@ jobs:
               python-version: ${{ matrix.python-version }}
 
         - name: Install Dependencies
-          run: pip install .[test]
+          run: |
+            python -m pip install --upgrade pip
+            pip install .[test]
 
         - name: Run Tests
           run: pytest -m "not fuzzing" -n 0 -s --cov

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,18 +10,18 @@ repos:
       - id: isort
 
 -   repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
       - id: black
         name: black
 
 -   repo: https://github.com/pycqa/flake8
-    rev: 7.1.0
+    rev: 7.1.1
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.1
+    rev: v1.11.2
     hooks:
     -   id: mypy
         additional_dependencies: [types-setuptools, pydantic]

diff --git a/ape_polygon/ecosystem.py b/ape_polygon/ecosystem.py
@@ -1,4 +1,4 @@
-from typing import ClassVar, Dict, Tuple, cast
+from typing import ClassVar, cast
 
 from ape_ethereum.ecosystem import (
     BaseEthereumConfig,
@@ -15,7 +15,7 @@
 
 
 class PolygonConfig(BaseEthereumConfig):
-    NETWORKS: ClassVar[Dict[str, Tuple[int, int]]] = NETWORKS
+    NETWORKS: ClassVar[dict[str, tuple[int, int]]] = NETWORKS
     mainnet: NetworkConfig = create_network_config(block_time=2, required_confirmations=1)
     amoy: NetworkConfig = create_network_config(block_time=2, required_confirmations=1)
 

diff --git a/setup.py b/setup.py
@@ -10,10 +10,10 @@
         "hypothesis>=6.2.0,<7",  # Strategy-based fuzzer
     ],
     "lint": [
-        "black>=24.4.2,<25",  # Auto-formatter and linter
-        "mypy>=1.10.1,<2",  # Static type analyzer
+        "black>=24.8.0,<25",  # Auto-formatter and linter
+        "mypy>=1.11.2,<2",  # Static type analyzer
         "types-setuptools",  # Needed for mypy type shed
-        "flake8>=7.1.0,<8",  # Style linter
+        "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
         "isort>=5.13.2,<6",  # Import sorting linter
@@ -62,6 +62,7 @@
     install_requires=[
         "eth-ape>=0.8.1,<0.9",
         "ethpm-types",  # Use same version as eth-ape
+        "pydantic_settings>=2.4.0,<2.5",  # Bug in pydantic-settings
     ],
     python_requires=">=3.9,<4",
     extras_require=extras_require,