Add support for Python3.12 (#174)

* Add support for Python3.12 Signed-off-by: tdruez <[email protected]> * Fix tests Signed-off-by: Tushar Goel <[email protected]> * Update initbitset Signed-off-by: Tushar Goel <[email protected]> * Fix tests Signed-off-by: Tushar Goel <[email protected]> * Prepare for release v0.12.0 Signed-off-by: Tushar Goel <[email protected]> --------- Signed-off-by: tdruez <[email protected]> Signed-off-by: Tushar Goel <[email protected]> Co-authored-by: Tushar Goel <[email protected]>
aboutcode-org · Mar 28, 2024 · b4fa534 · b4fa534
1 parent 609a81a
commit b4fa534
Show file tree

Hide file tree

Showing 27 changed files with 3,021 additions and 394 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v0.12.0
+-----------
+
+- Add support for Python3.12
+
+
 v0.11.0
 -----------
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,54 +11,54 @@ jobs:
       parameters:
           job_name: ubuntu20_cpython
           image_name: ubuntu-20.04
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs --reruns 2
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: ubuntu22_cpython
           image_name: ubuntu-22.04
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs --reruns 2
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos11_cpython
           image_name: macOS-11
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs --reruns 2
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos12_cpython
           image_name: macOS-12
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs --reruns 2
 
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: macos13_cpython
           image_name: macos-13
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pytest -n 2 -vvs --reruns 2
 
     - template: etc/ci/azure-win.yml
       parameters:
           job_name: win2019_cpython
           image_name: windows-2019
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv\Scripts\pytest -n 2 -vvs  --reruns 2
 
     - template: etc/ci/azure-win.yml
       parameters:
           job_name: win2022_cpython
           image_name: windows-2022
-          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11']
+          python_versions: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv\Scripts\pytest -n 2 -vvs --reruns 2
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ commoncode==30.2.0
 dparse2==0.7.0
 idna==3.3
 importlib-metadata==4.12.0
-intbitset==3.0.2
+intbitset==3.1.0
 packageurl-python==0.10.0
 packaging==21.3
 packvers==21.5

diff --git a/src/python_inspector/cli_utils.py b/src/python_inspector/cli_utils.py
@@ -26,7 +26,7 @@ def convert(self, value, param, ctx):
         if value in known_opts:
             self.fail(
                 "Illegal file name conflicting with an option name: "
-                f"{ os.fsdecode(value)}. "
+                f"{os.fsdecode(value)}. "
                 'Use the special "-" file name to print results on screen/stdout.',
                 param,
                 ctx,

diff --git a/src/python_inspector/resolve_cli.py b/src/python_inspector/resolve_cli.py
@@ -19,7 +19,7 @@
 
 TRACE = False
 
-__version__ = "0.11.0"
+__version__ = "0.12.0"
 
 DEFAULT_PYTHON_VERSION = "38"
 PYPI_SIMPLE_URL = "https://pypi.org/simple"

diff --git a/src/python_inspector/utils_pypi.py b/src/python_inspector/utils_pypi.py
@@ -102,16 +102,17 @@
 TRACE_ULTRA_DEEP = False
 
 # Supported environments
-PYTHON_VERSIONS = "36", "37", "38", "39", "310", "311", "27"
+PYTHON_VERSIONS = "27", "36", "37", "38", "39", "310", "311", "312"
 
 PYTHON_DOT_VERSIONS_BY_VER = {
+    "27": "2.7",
     "36": "3.6",
     "37": "3.7",
     "38": "3.8",
     "39": "3.9",
     "310": "3.10",
-    "27": "2.7",
     "311": "3.11",
+    "312": "3.12",
 }
 
 valid_python_versions = list(PYTHON_DOT_VERSIONS_BY_VER.keys())
@@ -126,13 +127,14 @@ def get_python_dot_version(version):
 
 
 ABIS_BY_PYTHON_VERSION = {
+    "27": ["cp27", "cp27m"],
     "36": ["cp36", "cp36m", "abi3"],
     "37": ["cp37", "cp37m", "abi3"],
     "38": ["cp38", "cp38m", "abi3"],
     "39": ["cp39", "cp39m", "abi3"],
     "310": ["cp310", "cp310m", "abi3"],
     "311": ["cp311", "cp311m", "abi3"],
-    "27": ["cp27", "cp27m"],
+    "312": ["cp312", "cp312m", "abi3"],
 }
 
 PLATFORMS_BY_OS = {

diff --git a/tests/data/azure-devops.req-310-expected.json b/tests/data/azure-devops.req-310-expected.json
diff --git a/tests/data/azure-devops.req-312-expected.json b/tests/data/azure-devops.req-312-expected.json
diff --git a/tests/data/azure-devops.req-38-expected.json b/tests/data/azure-devops.req-38-expected.json
diff --git a/tests/data/default-url-expected.json b/tests/data/default-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json <file>",
       "--operating-system linux",

diff --git a/tests/data/environment-marker-test-requirements.txt-expected.json b/tests/data/environment-marker-test-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json-pdt <file>",
       "--operating-system linux",

diff --git a/tests/data/example-requirements-ignore-errors-expected.json b/tests/data/example-requirements-ignore-errors-expected.json
diff --git a/tests/data/frozen-requirements.txt-expected.json b/tests/data/frozen-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json-pdt <file>",
       "--operating-system linux",

diff --git a/tests/data/insecure-setup/setup.py-expected.json b/tests/data/insecure-setup/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--analyze-setup-py-insecurely",
       "--json <file>",

diff --git a/tests/data/pdt-requirements.txt-expected.json b/tests/data/pdt-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json-pdt <file>",
       "--operating-system linux",

diff --git a/tests/data/pinned-pdt-requirements.txt-expected.json b/tests/data/pinned-pdt-requirements.txt-expected.json
diff --git a/tests/data/pinned-requirements.txt-expected.json b/tests/data/pinned-requirements.txt-expected.json
diff --git a/tests/data/prefer-source-expected.json b/tests/data/prefer-source-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json <file>",
       "--operating-system linux",

diff --git a/tests/data/setup/no-direct-dependencies-setup.py-expected.json b/tests/data/setup/no-direct-dependencies-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--analyze-setup-py-insecurely",
       "--json <file>",

diff --git a/tests/data/setup/simple-setup.py-expected.json b/tests/data/setup/simple-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--json <file>",
       "--operating-system linux",

diff --git a/tests/data/setup/spdx-setup.py-expected.json b/tests/data/setup/spdx-setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.11.0",
+    "tool_version": "0.12.0",
     "options": [
       "--analyze-setup-py-insecurely",
       "--json-pdt <file>",