Merge pull request #29 from vmalloc/fix-python3.13

Author: vmalloc

.github/workflows/main.yml

@@ -13,20 +13,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+    env:
+      UV_PYTHON: ${{ matrix.python-version }}
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
+      - name: Checkout the repository
+        uses: actions/checkout@main
+      - name: Install the default version of uv
+        id: setup-uv
+        uses: astral-sh/setup-uv@v3
+      - name: Print the installed version
+        run: echo "Installed uv version is ${{ steps.setup-uv.outputs.uv-version }}"
+      - name: Install Python ${{ matrix.python-version }}
+        run: uv python install  ${{ matrix.python-version }}
       - name: Install dependencies
         run: make env
       - name: Test with pytest
         run: make test
-      - name: Publish package
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}

Makefile

@@ -1,12 +1,8 @@
 default: test
 
 test: env
-	.env/bin/pytest -v
-
-env: .env/.up-to-date
-
-.env/.up-to-date: setup.py Makefile
-	python -m venv .env
-	.env/bin/pip install -e ".[testing]"
-	touch $@
+	uv run --extra testing pytest tests
 
+env:
+	uv venv
+	uv pip install -e ".[testing]"

forge/__version__.py

@@ -1,3 +1,9 @@
-import pkg_resources
+import sys
+if sys.version_info < (3, 8):
+   import pkg_resources
+   get_distribution = pkg_resources.get_distribution
+else:
+   from importlib.metadata import distribution
+   get_distribution = distribution
 
-__version__ = pkg_resources.get_distribution('pyforge').version
+__version__ = get_distribution('pyforge').version

pyproject.toml

@@ -0,0 +1,34 @@
+[build-system]
+requires = ["hatchling>=0.25.1", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[project]
+name = "pyforge"
+description = "Python mocking framework"
+readme = "README.rst"
+requires-python = ">=3.8"
+license = { text = "BSD 3-Clause License" }
+
+classifiers = [
+    "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",
+]
+dependencies = ["sentinels>=0.0.4"]
+dynamic = ["version"]
+
+authors = [{ name = "Rotem Yaari", email = "[email protected]" }]
+
+[project.urls]
+"Homepage" = "https://github.com/vmalloc/pyforge"
+
+[project.optional-dependencies]
+testing = ["pytest"]
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.hatch.build.targets.wheel]
+packages = ["forge"]

requirements.txt

@@ -1,4 +1,5 @@
 import time
+import sys
 from .ut_utils import TestCase
 from forge.signature import FunctionSignature
 from forge.exceptions import SignatureException, InvalidKeywordArgument, FunctionCannotBeBound
@@ -126,11 +127,26 @@ def test__copy(self):
         self.assertIsNot(f._args, f2._args)
 
 class BinaryFunctionSignatureTest(TestCase):
-    def test__binary_global_function(self):
+    def test__binary_global_function_with_no_parameters(self):
         sig = FunctionSignature(time.time)
         self.assertEqual(sig._args, [])
-        self.assertTrue(sig.has_variable_args())
-        self.assertTrue(sig.has_variable_kwargs())
+        if sys.version_info[:2] < (3, 13):
+            self.assertTrue(sig.has_variable_args())
+            self.assertTrue(sig.has_variable_kwargs())
+        else:
+            # Starting 3.13, inspect succeed (not raise TypeError) for buildin functions, like `time.time`
+            self.assertFalse(sig.has_variable_args())
+            self.assertFalse(sig.has_variable_kwargs())
+    def test__binary_global_function_with_parameters(self):
+        sig = FunctionSignature(time.sleep)
+        if sys.version_info[:2] < (3, 13):
+            self.assertEqual(sig._args, [])
+            self.assertTrue(sig.has_variable_args())
+            self.assertTrue(sig.has_variable_kwargs())
+        else:
+            self.assertEqual(len(sig._args), 1)
+            self.assertFalse(sig.has_variable_args())
+            self.assertFalse(sig.has_variable_kwargs())
     def test__object_method_placeholders(self):
         class SomeObject(object):
             pass

setup.cfg

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,py310
+envlist = py38,py39,py310,py311,py312,py313
 
 [testenv]
 deps=pytest