Merge pull request aboutcode-org#131 from nexB/prep_release_v0.9.7

Prepare for release v0.9.7
bennati · Apr 14, 2023 · 1831e01 · 1831e01
2 parents cb19215 + 4a8cac6
commit 1831e01
Show file tree

Hide file tree

Showing 21 changed files with 100 additions and 94 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@ Changelog
 =========
 
 
+v0.9.7
+-------------
+
+- Fix resolution of setup files which partially have dynamic dependencies.
+
+
 v0.9.6
 -------------
 

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

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-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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
       "--index-url https://pypi.org/simple",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/frozen-requirements.txt",
       "--index-url https://pypi.org/simple",

diff --git a/tests/data/insecure-setup-2/setup.py-expected.json b/tests/data/insecure-setup-2/setup.py-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
       "--index-url https://pypi.org/simple",

diff --git a/tests/data/pinned-pdt-requirements.txt-expected.json b/tests/data/pinned-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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-pdt-requirements.txt",
       "--index-url https://pypi.org/simple",

diff --git a/tests/data/pinned-requirements.txt-expected.json b/tests/data/pinned-requirements.txt-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-requirements.txt",
       "--index-url https://pypi.org/simple",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",

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.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--index-url https://pypi.org/simple",
       "--python-version 27",

diff --git a/tests/data/single-url-except-simple-expected.json b/tests/data/single-url-except-simple-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--specifier flask",
       "--index-url https://thirdparty.aboutcode.org/pypi/simple/",

diff --git a/tests/data/single-url-expected.json b/tests/data/single-url-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--specifier zipp==3.8.0",
       "--index-url https://pypi.org/simple",

diff --git a/tests/data/tilde_req-expected.json b/tests/data/tilde_req-expected.json
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.9.6",
+    "tool_version": "0.9.7",
     "options": [
       "--specifier zipp~=3.8.0",
       "--index-url https://pypi.org/simple",

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -373,7 +373,7 @@ def test_passing_of_json_pdt_and_json_flags():
 def test_version_option():
     options = ["--version"]
     result = run_cli(options=options)
-    assert "0.9.6" in result.output
+    assert "0.9.7" in result.output
 
 
 def test_passing_of_netrc_file_that_does_not_exist():

diff --git a/tests/test_resolution.py b/tests/test_resolution.py
@@ -147,7 +147,7 @@ def test_without_supported_wheels():
     assert plist == [
         "pkg:pypi/[email protected]",
         "pkg:pypi/[email protected]",
-        "pkg:pypi/[email protected].1",
+        "pkg:pypi/[email protected].2",
         "pkg:pypi/[email protected]",
         "pkg:pypi/[email protected]",
         "pkg:pypi/[email protected]",