Address review comments

TG1999 · TG1999 · commit 18d20a18b944 · 2022-10-07T21:18:52.000+05:30
Signed-off-by: Tushar Goel &lt;tushar.goel.dav@gmail.com&gt;
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@ Changelog
 =========
 
 
+v0.8.2
+------
+
+- For a package that doesn't have a single stable release use the latest pre-release version.
+
+
 v0.8.1
 ------
 
diff --git a/src/python_inspector/resolution.py b/src/python_inspector/resolution.py
@@ -464,9 +464,7 @@ def get_candidates(
                 bad_versions=bad_versions,
             ):
                 valid_versions.append(parsed_version)
-        if all(version.is_prerelease for version in valid_versions):
-            pass
-        else:
+        if not all(version.is_prerelease for version in valid_versions):
             valid_versions = [version for version in valid_versions if not version.is_prerelease]
         for version in valid_versions:
             yield Candidate(name=name, version=version, extras=extras)
diff --git a/src/python_inspector/resolve_cli.py b/src/python_inspector/resolve_cli.py
@@ -36,7 +36,7 @@
 
 TRACE = False
 
-__version__ = "0.8.1"
+__version__ = "0.8.2"
 
 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
@@ -2,7 +2,7 @@
   "headers": {
     "tool_name": "python-inspector",
     "tool_homepageurl": "https://github.com/nexB/python-inspector",
-    "tool_version": "0.8.1",
+    "tool_version": "0.8.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/azure-devops.req.txt",
       "--index-url https://pypi.org/simple",
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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "options": [
       "--requirement /home/tg1999/Desktop/python-inspector-1/tests/data/pinned-requirements.txt",
       "--index-url https://pypi.org/simple",
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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "options": [
       "--specifier flask",
       "--index-url https://pypi.org/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.8.1",
+    "tool_version": "0.8.2",
     "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.8.1",
+    "tool_version": "0.8.2",
     "options": [
       "--specifier zipp~=3.8.0",
       "--index-url https://pypi.org/simple",
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -163,9 +163,9 @@ def test_cli_with_environment_marker_and_complex_ranges():
 
 
 @pytest.mark.online
-def test_cli_with_azure_devops():
+def test_cli_with_azure_devops_with_python_310():
     requirements_file = test_env.get_test_loc("azure-devops.req.txt")
-    expected_file = test_env.get_test_loc("azure-devops.req-expected.json", must_exist=False)
+    expected_file = test_env.get_test_loc("azure-devops.req-310-expected.json", must_exist=False)
     extra_options = [
         "--operating-system",
         "linux",
@@ -181,9 +181,9 @@ def test_cli_with_azure_devops():
 
 
 @pytest.mark.online
-def test_cli_with_azure_devops():
+def test_cli_with_azure_devops_with_python_38():
     requirements_file = test_env.get_test_loc("azure-devops.req.txt")
-    expected_file = test_env.get_test_loc("azure-devops.req-expected.json", must_exist=False)
+    expected_file = test_env.get_test_loc("azure-devops.req-38-expected.json", must_exist=False)
     extra_options = [
         "--operating-system",
         "linux",
@@ -340,7 +340,7 @@ def test_passing_of_json_pdt_and_json_flags():
 def test_version_option():
     options = ["--version"]
     result = run_cli(options=options)
-    assert "0.8.1" in result.output
+    assert "0.8.2" 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
@@ -160,6 +160,22 @@ def test_is_valid_version():
     assert is_valid_version(parsed_version, requirements, identifier, bad_versions)
 
 
+def test_is_valid_version_with_no_specifier():
+    parsed_version = packaging.version.parse("2.1.2")
+    requirements = {"flask": [Requirement("flask")]}
+    bad_versions = []
+    identifier = "flask"
+    assert is_valid_version(parsed_version, requirements, identifier, bad_versions)
+
+
+def test_is_valid_version_with_no_specifier_and_pre_release():
+    parsed_version = packaging.version.parse("1.0.0b4")
+    requirements = {"flask": [Requirement("flask")]}
+    bad_versions = []
+    identifier = "flask"
+    assert is_valid_version(parsed_version, requirements, identifier, bad_versions)
+
+
 def test_get_requirements_from_dependencies():
     dependencies = [
         models.DependentPackage(
