Support Python 3.12 (#735)

Fixes #734

Author: chrisrink10

.github/workflows/run-tests.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        version: ['3.8', '3.9', '3.10', '3.11']
+        version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         include:
           - version: '3.8'
             tox-env: py38,py38-mypy,py38-lint,safety
@@ -25,13 +25,15 @@ jobs:
           - version: '3.10'
             tox-env: py310,py310-mypy,py310-lint,safety
           - version: '3.11'
-            tox-env: py311,py311-mypy,py311-lint,format,safety
+            tox-env: py311,py311-mypy,py311-lint,safety
+          - version: '3.12'
+            tox-env: py312,py312-mypy,format,safety
           - os: windows-latest
-            version: '3.11'
-            tox-env: py311,safety
+            version: '3.12'
+            tox-env: py312,safety
           - os: macos-latest
-            version: '3.11'
-            tox-env: py311,safety
+            version: '3.12'
+            tox-env: py312,safety
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
  * Added rudimentary support for `clojure.stacktrace` with `print-cause-trace` (part of #721)
  * Added support for `bytes` literals using a `#b` prefix (#732)
+ * Added support for Python 3.12 (#734)
 
 ### Changed
  * Basilisp now supports PyTest 7.0+ (#660)

docs/pyinterop.rst

@@ -27,7 +27,7 @@ When compiled, a ``kebab-case`` identifier always becomes a ``snake_case`` ident
 Python Builtins
 ---------------
 
-Python features a collection of `builtin <https://docs.python.org/3.8/library/functions.html>`_ functions which are available by default without module qualification in all Python scripts.
+Python features a collection of `builtin <https://docs.python.org/3/library/functions.html>`_ functions which are available by default without module qualification in all Python scripts.
 Python builtins are available in all Basilisp code as qualified symbols with the ``python`` namespace portion.
 It is not required to import anything to enable this functionality.
 

pyproject.toml

@@ -22,6 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Compilers",
@@ -31,7 +32,7 @@ include = ["README.md", "LICENSE"]
 [tool.poetry.dependencies]
 python = "^3.8"
 attrs = ">=20.1.0"
-immutables = "^0.15"
+immutables = "^0.20"
 prompt-toolkit = "^3.0.0"
 pyrsistent = "^0.18.0"
 python-dateutil = "^2.8.1"
@@ -68,7 +69,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 88
-target-version = ["py36"]
+target-version = ["py38"]
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -148,10 +149,8 @@ warn_unused_ignores = true
 module = [
     "astor.*",
     "prompt_toolkit.*",
-    "py.*",
     "pygments.*",
     "pytest.*",
-    "_pytest.*",
     "sphinx.*"
 ]
 ignore_missing_imports = true

src/basilisp/lang/map.py

@@ -2,6 +2,7 @@
 from typing import Callable, Iterable, Mapping, Optional, Tuple, TypeVar, Union, cast
 
 from immutables import Map as _Map
+from immutables import MapMutation
 
 from basilisp.lang.interfaces import (
     IEvolveableCollection,
@@ -18,12 +19,6 @@
 from basilisp.lang.vector import MapEntry
 from basilisp.util import partition
 
-try:
-    from immutables._map import MapMutation
-except ImportError:
-    from immutables.map import MapMutation  # type: ignore[assignment]
-
-
 T = TypeVar("T")
 K = TypeVar("K")
 V = TypeVar("V")
@@ -208,7 +203,7 @@ def update(self, *maps: Mapping[K, V]) -> "PersistentMap":
         m: _Map = self._inner.update(*(m.items() for m in maps))
         return PersistentMap(m)
 
-    def update_with(
+    def update_with(  # type: ignore[return]
         self, merge_fn: Callable[[V, V], V], *maps: Mapping[K, V]
     ) -> "PersistentMap[K, V]":
         with self._inner.mutate() as m:
@@ -217,7 +212,7 @@ def update_with(
                     m.set(k, merge_fn(m[k], v) if k in m else v)
             return PersistentMap(m.finish())
 
-    def cons(  # type: ignore[override]
+    def cons(  # type: ignore[override, return]
         self,
         *elems: Union[
             IPersistentMap[K, V],
@@ -279,7 +274,7 @@ def m(**kvs) -> PersistentMap[str, V]:
     return PersistentMap.from_coll(kvs)
 
 
-def from_entries(entries: Iterable[MapEntry[K, V]]) -> PersistentMap[K, V]:
+def from_entries(entries: Iterable[MapEntry[K, V]]) -> PersistentMap[K, V]:  # type: ignore[return]
     with _Map().mutate() as m:  # type: ignore[var-annotated]
         for entry in entries:
             m.set(entry.key, entry.value)

src/basilisp/lang/runtime.py

@@ -71,7 +71,7 @@
 NS_VAR_SYM = sym.symbol(NS_VAR_NAME, ns=CORE_NS)
 NS_VAR_NS = CORE_NS
 REPL_DEFAULT_NS = "basilisp.user"
-SUPPORTED_PYTHON_VERSIONS = frozenset({(3, 8), (3, 9), (3, 10), (3, 11)})
+SUPPORTED_PYTHON_VERSIONS = frozenset({(3, 8), (3, 9), (3, 10), (3, 11), (3, 12)})
 
 # Public basilisp.core symbol names
 COMPILER_OPTIONS_VAR_NAME = "*compiler-options*"

src/basilisp/lang/set.py

@@ -2,6 +2,7 @@
 from typing import AbstractSet, Iterable, Optional, TypeVar
 
 from immutables import Map as _Map
+from immutables import MapMutation
 
 from basilisp.lang.interfaces import (
     IEvolveableCollection,
@@ -15,12 +16,6 @@
 from basilisp.lang.obj import seq_lrepr as _seq_lrepr
 from basilisp.lang.seq import sequence
 
-try:
-    from immutables._map import MapMutation
-except ImportError:
-    from immutables.map import MapMutation  # type: ignore[assignment]
-
-
 T = TypeVar("T")
 
 
@@ -153,13 +148,13 @@ def meta(self) -> Optional[IPersistentMap]:
     def with_meta(self, meta: Optional[IPersistentMap]) -> "PersistentSet[T]":
         return set(self._inner, meta=meta)
 
-    def cons(self, *elems: T) -> "PersistentSet[T]":
+    def cons(self, *elems: T) -> "PersistentSet[T]":  # type: ignore[return]
         with self._inner.mutate() as m:
             for elem in elems:
                 m.set(elem, elem)
             return PersistentSet(m.finish(), meta=self.meta)
 
-    def disj(self, *elems: T) -> "PersistentSet[T]":
+    def disj(self, *elems: T) -> "PersistentSet[T]":  # type: ignore[return]
         with self._inner.mutate() as m:
             for elem in elems:
                 try:

tests/basilisp/compiler_test.py

@@ -11,7 +11,6 @@
 from unittest.mock import Mock
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
 from dateutil import parser as dateparser
 
 from basilisp.lang import compiler as compiler
@@ -5402,7 +5401,7 @@ def test_local_deftype_staticmethod_resolves(self, lcompile: CompileFn):
             lcompile("(Point/do-non-static 1 2)")
 
     def test_aliased_namespace_not_hidden_by_python_module(
-        self, lcompile: CompileFn, monkeypatch: MonkeyPatch
+        self, lcompile: CompileFn, monkeypatch: pytest.MonkeyPatch
     ):
         with TemporaryDirectory() as tmpdir:
             cwd = os.getcwd()

tests/basilisp/runtime_test.py

@@ -39,6 +39,7 @@ def test_is_supported_python_version():
                     "lpy39-",
                     "lpy310-",
                     "lpy311-",
+                    "lpy312-",
                 ],
             )
         ),
@@ -54,6 +55,7 @@ def test_is_supported_python_version():
                     "lpy38+",
                     "lpy310-",
                     "lpy311-",
+                    "lpy312-",
                 ],
             )
         ),
@@ -64,6 +66,7 @@ def test_is_supported_python_version():
                     "lpy310",
                     "default",
                     "lpy",
+                    "lpy312-",
                     "lpy311-",
                     "lpy310+",
                     "lpy310-",
@@ -80,13 +83,30 @@ def test_is_supported_python_version():
                     "default",
                     "lpy",
                     "lpy311+",
+                    "lpy312-",
                     "lpy311-",
                     "lpy310+",
                     "lpy39+",
                     "lpy38+",
                 ],
             )
         ),
+        (3, 12): frozenset(
+            map(
+                kw.keyword,
+                [
+                    "lpy312",
+                    "default",
+                    "lpy",
+                    "lpy311+",
+                    "lpy312+",
+                    "lpy312-",
+                    "lpy311+",
+                    "lpy39+",
+                    "lpy38+",
+                ],
+            )
+        ),
     }[(sys.version_info.major, sys.version_info.minor)],
 )
 def test_reader_default_featureset(feature):

tests/basilisp/testrunner_test.py

@@ -2,15 +2,14 @@
 import sys
 
 import pytest
-from _pytest.pytester import Pytester, RunResult
 
 from basilisp.lang import runtime
 from basilisp.lang import symbol as sym
 
 
 class TestTestrunner:
     @pytest.fixture
-    def run_result(self, pytester: Pytester) -> RunResult:
+    def run_result(self, pytester: pytest.Pytester) -> pytest.RunResult:
         code = """
         (ns test-testrunner
           (:require
@@ -44,10 +43,10 @@ def run_result(self, pytester: Pytester) -> RunResult:
         yield pytester.runpytest()
         runtime.Namespace.remove(sym.symbol("test-testrunner"))
 
-    def test_outcomes(self, run_result: RunResult):
+    def test_outcomes(self, run_result: pytest.RunResult):
         run_result.assert_outcomes(passed=1, failed=2)
 
-    def test_failure_repr(self, run_result: RunResult):
+    def test_failure_repr(self, run_result: pytest.RunResult):
         run_result.stdout.fnmatch_lines(
             [
                 "FAIL in (assertion-test) (test_testrunner.lpy:8)",
@@ -89,7 +88,7 @@ def test_failure_repr(self, run_result: RunResult):
             "further investigation."
         ),
     )
-    def test_error_repr(self, run_result: RunResult):
+    def test_error_repr(self, run_result: pytest.RunResult):
         if sys.version_info < (3, 11):
             expected = [
                 "ERROR in (assertion-test) (test_testrunner.lpy:12)",
@@ -126,7 +125,7 @@ def test_error_repr(self, run_result: RunResult):
         )
 
 
-def test_fixtures(pytester: Pytester):
+def test_fixtures(pytester: pytest.Pytester):
     code = """
     (ns test-fixtures
       (:require
@@ -167,7 +166,7 @@ def test_fixtures(pytester: Pytester):
     """
     pytester.makefile(".lpy", test_fixtures=code)
     pytester.syspathinsert()
-    result: pytester.RunResult = pytester.runpytest()
+    result: pytest.RunResult = pytester.runpytest()
     result.assert_outcomes(passed=1, failed=1)
 
     get_volatile = lambda vname: runtime.Var.find_safe(
@@ -189,7 +188,7 @@ def test_fixtures(pytester: Pytester):
     ],
 )
 def test_fixtures_with_errors(
-    pytester: Pytester,
+    pytester: pytest.Pytester,
     fixture: str,
     style: str,
     errors: int,
@@ -219,5 +218,5 @@ def test_fixtures_with_errors(
     """
     pytester.makefile(".lpy", test_fixtures_with_errors=code)
     pytester.syspathinsert()
-    result: pytester.RunResult = pytester.runpytest()
+    result: pytest.RunResult = pytester.runpytest()
     result.assert_outcomes(passed=passes, failed=failures, errors=errors)