Merge pull request #229 from ivanyu/python3-12

Support Python 3.12
ivanyu · Nov 14, 2023 · cb8e23d · cb8e23d
2 parents e73534d + c8a20d3
commit cb8e23d
Show file tree

Hide file tree

Showing 9 changed files with 324 additions and 383 deletions.
diff --git a/.github/workflows/pr_and_main_push.yml b/.github/workflows/pr_and_main_push.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
 
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
 
@@ -73,7 +73,7 @@ jobs:
       - check_and_test_pyheap_ui
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
 

diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ dumper-docker-image:
 	(cd pyheap && $(MAKE) docker-image)
 
 .PHONY: integration-tests
-integration-tests: integration-tests-3-8 integration-tests-3-9 integration-tests-3-10 integration-tests-3-11
+integration-tests: integration-tests-3-8 integration-tests-3-9 integration-tests-3-10 integration-tests-3-11 integration-tests-3-12
 
 define run_integration_test
 	cd integration_tests && \
@@ -53,3 +53,7 @@ integration-tests-3-10: pyheap/dist/pyheap_dump dumper-docker-image
 .PHONY: integration-tests-3-11
 integration-tests-3-11: pyheap/dist/pyheap_dump dumper-docker-image
 	$(call run_integration_test,3.11,test-target-docker-images-3-11)
+
+.PHONY: integration-tests-3-12
+integration-tests-3-12: pyheap/dist/pyheap_dump dumper-docker-image
+	$(call run_integration_test,3.12,test-target-docker-images-3-12)
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ It does not require any modification to the target program code, CPython code or
 
 The dumper needs the following:
 1. GDB must be installed where the dumper runs (e.g. on the machine host), but is not needed near a target process (e.g. in a container).
-2. CPython 3.8 - 3.11.
+2. CPython 3.8 - 3.12.
 3. Docker CLI for working with Docker containers directly (e.g. calling `docker inspect`).
 
 ## Compatibility
@@ -21,7 +21,7 @@ The dumper needs the following:
 
 The dumper has been tested on x86 (x86_64) and ARM (AArch64) processors.
 
-The dumper is compatible with a target process running on CPython 3.8 - 3.11.
+The dumper is compatible with a target process running on CPython 3.8 - 3.12.
 
 The target process were tested in the following OSes:
 - Alpine Linux;
@@ -206,7 +206,7 @@ Integration tests run on CI. However, end-to-end tests that use the real GDB can
 make clean integration-tests
 ```
 
-You need [pyenv](https://github.com/pyenv/pyenv) with Python 3.8, 3.9, 3.10, and 3.11 installed and [Poetry](https://python-poetry.org/).
+You need [pyenv](https://github.com/pyenv/pyenv) with Python 3.8, 3.9, 3.10, 3.11, and 3.12 installed and [Poetry](https://python-poetry.org/).
 
 ## License
 

diff --git a/integration_tests/Makefile b/integration_tests/Makefile
@@ -54,5 +54,12 @@ test-target-docker-images-3-11: e2e_docker/inferior-simple.py
 	$(call build_image,3.11,ubuntu,22.04)
 	$(call build_image,3.11,fedora,36)
 
+.PHONY: test-target-docker-images-3-12
+test-target-docker-images-3-12: e2e_docker/inferior-simple.py
+	$(call build_image,3.12,alpine,3.12.0-alpine3.18)
+	$(call build_image,3.12,debian,3.12-slim-bullseye)
+	$(call build_image,3.12,ubuntu,23.10)
+	$(call build_image,3.12,fedora,39)
+
 e2e_docker/inferior-simple.py:
 	cp ../test_inferiors/inferior-simple.py $@
diff --git a/pyheap-ui/poetry.lock b/pyheap-ui/poetry.lock
diff --git a/pyheap-ui/pyproject.toml b/pyheap-ui/pyproject.toml
@@ -10,7 +10,7 @@ packages = [{include = "pyheap_ui", from = "src"}]
 python = "^3.8"
 Flask = "^2.2.2"
 Jinja2 = "^3.1.2"
-typing-extensions = "^4.4.0"
+typing-extensions = "^4.8.0"
 tqdm = "^4.64.1"
 
 [tool.poetry.dev-dependencies]

diff --git a/pyheap/Makefile b/pyheap/Makefile
@@ -23,6 +23,7 @@ dist/pyheap_dump: build/requirements.txt build-src
 	mkdir -p dist
 	poetry run pex \
 		--requirement=build/requirements.txt \
+		--python-shebang '#!/usr/bin/env python' \
 		--sources-directory=build/src \
 		--entry-point=pyheap_dump:main \
 		--output-file=$@

diff --git a/pyheap/poetry.lock b/pyheap/poetry.lock
diff --git a/pyheap/pyproject.toml b/pyheap/pyproject.toml
@@ -6,12 +6,12 @@ authors = ["Ivan Yurchenko <ivan@ivanyu.me>"]
 license = "Apache License 2.0"
 
 [tool.poetry.dependencies]
-python = ">=3.8,<3.12"
-pyelftools = "^0.29"
+python = ">=3.8,<3.13"
+pyelftools = "^0.30"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1"
-black = "^22.6"
+black = "^23.10"
 pex = "^2.1"
 
 [tool.pytest.ini_options]