Skip to content

Commit 1831e01

Browse files
authored
Merge pull request #131 from nexB/prep_release_v0.9.7
Prepare for release v0.9.7
2 parents cb19215 + 4a8cac6 commit 1831e01

21 files changed

+100
-94
lines changed

CHANGELOG.rst

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ Changelog
22
=========
33

44

5+
v0.9.7
6+
-------------
7+
8+
- Fix resolution of setup files which partially have dynamic dependencies.
9+
10+
511
v0.9.6
612
-------------
713

src/python_inspector/resolve_cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
TRACE = False
2222

23-
__version__ = "0.9.6"
23+
__version__ = "0.9.7"
2424

2525
DEFAULT_PYTHON_VERSION = "38"
2626
PYPI_SIMPLE_URL = "https://pypi.org/simple"

tests/data/azure-devops.req-310-expected.json

+38-38
Large diffs are not rendered by default.

tests/data/azure-devops.req-38-expected.json

+38-38
Large diffs are not rendered by default.

tests/data/default-url-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--specifier zipp==3.8.0",
88
"--index-url https://pypi.org/simple",

tests/data/environment-marker-test-requirements.txt-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/environment-marker-test-requirements.txt",
88
"--index-url https://pypi.org/simple",

tests/data/frozen-requirements.txt-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/frozen-requirements.txt",
88
"--index-url https://pypi.org/simple",

tests/data/insecure-setup-2/setup.py-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--index-url https://pypi.org/simple",
88
"--python-version 27",

tests/data/insecure-setup/setup.py-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--index-url https://pypi.org/simple",
88
"--python-version 27",

tests/data/pdt-requirements.txt-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pdt-requirements.txt",
88
"--index-url https://pypi.org/simple",

tests/data/pinned-pdt-requirements.txt-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-pdt-requirements.txt",
88
"--index-url https://pypi.org/simple",

tests/data/pinned-requirements.txt-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-requirements.txt",
88
"--index-url https://pypi.org/simple",

tests/data/prefer-source-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--specifier zipp==3.8.0",
88
"--index-url https://pypi.org/simple",

tests/data/setup/no-direct-dependencies-setup.py-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--index-url https://pypi.org/simple",
88
"--python-version 27",

tests/data/setup/simple-setup.py-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--index-url https://pypi.org/simple",
88
"--python-version 27",

tests/data/setup/spdx-setup.py-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--index-url https://pypi.org/simple",
88
"--python-version 27",

tests/data/single-url-except-simple-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--specifier flask",
88
"--index-url https://thirdparty.aboutcode.org/pypi/simple/",

tests/data/single-url-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--specifier zipp==3.8.0",
88
"--index-url https://pypi.org/simple",

tests/data/tilde_req-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"headers": {
33
"tool_name": "python-inspector",
44
"tool_homepageurl": "https://github.com/nexB/python-inspector",
5-
"tool_version": "0.9.6",
5+
"tool_version": "0.9.7",
66
"options": [
77
"--specifier zipp~=3.8.0",
88
"--index-url https://pypi.org/simple",

tests/test_cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def test_passing_of_json_pdt_and_json_flags():
373373
def test_version_option():
374374
options = ["--version"]
375375
result = run_cli(options=options)
376-
assert "0.9.6" in result.output
376+
assert "0.9.7" in result.output
377377

378378

379379
def test_passing_of_netrc_file_that_does_not_exist():

tests/test_resolution.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def test_without_supported_wheels():
147147
assert plist == [
148148
"pkg:pypi/[email protected]",
149149
"pkg:pypi/[email protected]",
150-
"pkg:pypi/[email protected].1",
150+
"pkg:pypi/[email protected].2",
151151
"pkg:pypi/[email protected]",
152152
"pkg:pypi/[email protected]",
153153
"pkg:pypi/[email protected]",

0 commit comments

Comments
 (0)