fix: add missing environment and resolver_options (#226)

#211 (comment) Adds missing `resolver_options` and `environment` lost from json to toml conversion
astral-sh · Nov 4, 2024 · cb942f0 · cb942f0
1 parent e220329
commit cb942f0
Show file tree

Hide file tree

Showing 24 changed files with 100 additions and 0 deletions.
diff --git a/scenarios/prereleases/package-prereleases-boundary.toml b/scenarios/prereleases/package-prereleases-boundary.toml
@@ -16,3 +16,6 @@ a = "0.1.0"
 [packages.a.versions."0.2.0a1"]
 
 [packages.a.versions."0.3.0"]
+
+[resolver_options]
+prereleases = true
diff --git a/scenarios/prereleases/package-prereleases-global-boundary.toml b/scenarios/prereleases/package-prereleases-global-boundary.toml
@@ -16,3 +16,6 @@ a = "0.1.0"
 [packages.a.versions."0.2.0a1"]
 
 [packages.a.versions."0.3.0"]
+
+[resolver_options]
+prereleases = true
diff --git a/scenarios/prereleases/requires-package-only-prereleases-in-range-global-opt-in.toml b/scenarios/prereleases/requires-package-only-prereleases-in-range-global-opt-in.toml
@@ -13,3 +13,6 @@ a = "1.0.0a1"
 [packages.a.versions."0.1.0"]
 
 [packages.a.versions."1.0.0a1"]
+
+[resolver_options]
+prereleases = true
diff --git a/scenarios/requires_python/compatible-python-incompatible-override.toml b/scenarios/requires_python/compatible-python-incompatible-override.toml
@@ -9,3 +9,9 @@ satisfiable = false
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
+
+[resolver_options]
+python = "3.9"
+
+[environment]
+python = "3.11"
diff --git a/scenarios/requires_python/incompatible-python-compatible-override-available-no-wheels.toml b/scenarios/requires_python/incompatible-python-compatible-override-available-no-wheels.toml
@@ -14,3 +14,10 @@ a = "1.0.0"
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
 wheel = false
+
+[resolver_options]
+python = "3.11"
+
+[environment]
+python = "3.9"
+additional_python = ["3.11"]
diff --git a/scenarios/requires_python/incompatible-python-compatible-override-no-compatible-wheels.toml b/scenarios/requires_python/incompatible-python-compatible-override-no-compatible-wheels.toml
@@ -11,3 +11,9 @@ explanation = "Since there are no compatible wheels for the package and it is no
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
 wheel_tags = ["foo-none-any"]
+
+[resolver_options]
+python = "3.11"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/incompatible-python-compatible-override-other-wheel.toml b/scenarios/requires_python/incompatible-python-compatible-override-other-wheel.toml
@@ -14,3 +14,9 @@ wheel = false
 
 [packages.a.versions."2.0.0"]
 requires_python = ">=3.12"
+
+[resolver_options]
+python = "3.11"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/incompatible-python-compatible-override-unavailable-no-wheels.toml b/scenarios/requires_python/incompatible-python-compatible-override-unavailable-no-wheels.toml
@@ -11,3 +11,9 @@ explanation = "Since there are no wheels for the package and it is not compatibl
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
 wheel = false
+
+[resolver_options]
+python = "3.11"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/incompatible-python-compatible-override.toml b/scenarios/requires_python/incompatible-python-compatible-override.toml
@@ -12,3 +12,9 @@ a = "1.0.0"
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
+
+[resolver_options]
+python = "3.11"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-greater-than-current-backtrack.toml b/scenarios/requires_python/python-greater-than-current-backtrack.toml
@@ -21,3 +21,6 @@ requires_python = ">=3.11"
 
 [packages.a.versions."4.0.0"]
 requires_python = ">=3.12"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-greater-than-current-excluded.toml b/scenarios/requires_python/python-greater-than-current-excluded.toml
@@ -18,3 +18,6 @@ requires_python = ">=3.11"
 
 [packages.a.versions."4.0.0"]
 requires_python = ">=3.12"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-greater-than-current-many.toml b/scenarios/requires_python/python-greater-than-current-many.toml
@@ -42,3 +42,6 @@ requires_python = ">=3.11"
 
 [packages.a.versions."3.5.0"]
 requires_python = ">=3.11"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-greater-than-current-patch.toml b/scenarios/requires_python/python-greater-than-current-patch.toml
@@ -9,3 +9,6 @@ satisfiable = false
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.8.14"
+
+[environment]
+python = "3.8.12"
diff --git a/scenarios/requires_python/python-greater-than-current.toml b/scenarios/requires_python/python-greater-than-current.toml
@@ -9,3 +9,6 @@ satisfiable = false
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.10"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-less-than-current.toml b/scenarios/requires_python/python-less-than-current.toml
@@ -10,3 +10,6 @@ explanation = "We ignore the upper bound on Python requirements"
 
 [packages.a.versions."1.0.0"]
 requires_python = "<=3.8"
+
+[environment]
+python = "3.9"
diff --git a/scenarios/requires_python/python-patch-override-no-patch.toml b/scenarios/requires_python/python-patch-override-no-patch.toml
@@ -10,3 +10,9 @@ explanation = "Since the resolver is asked to solve with 3.8, the minimum compat
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.8.4"
+
+[resolver_options]
+python = "3.8"
+
+[environment]
+python = "3.8.18"
diff --git a/scenarios/requires_python/python-patch-override-patch-compatible.toml b/scenarios/requires_python/python-patch-override-patch-compatible.toml
@@ -12,3 +12,9 @@ a = "1.0.0"
 
 [packages.a.versions."1.0.0"]
 requires_python = ">=3.8.0"
+
+[resolver_options]
+python = "3.8.0"
+
+[environment]
+python = "3.8.18"
diff --git a/scenarios/tag_and_markers/requires-python-wheels.toml b/scenarios/tag_and_markers/requires-python-wheels.toml
@@ -10,3 +10,9 @@ satisfiable = true
 
 [packages.a.versions."1.0.0"]
 wheel_tags = ["cp311-cp311-any", "cp310-cp310-any", "cp39-cp39-any"]
+
+[resolver_options]
+universal = true
+
+[environment]
+python = "3.12"
diff --git a/scenarios/tag_and_markers/unreachable-package.toml b/scenarios/tag_and_markers/unreachable-package.toml
@@ -11,3 +11,6 @@ satisfiable = true
 requires = ["b==1.0.0; sys_platform == 'linux'"]
 
 [packages.b.versions."1.0.0"]
+
+[resolver_options]
+universal = true
diff --git a/scenarios/tag_and_markers/unreachable-wheels.toml b/scenarios/tag_and_markers/unreachable-wheels.toml
@@ -34,3 +34,6 @@ wheel_tags = [
   "cp312-cp312-win_amd64",
   "cp312-cp312-macosx_14_0_x86_64",
 ]
+
+[resolver_options]
+universal = true
diff --git a/scenarios/wheels/no-binary.toml b/scenarios/wheels/no-binary.toml
@@ -9,3 +9,6 @@ satisfiable = true
 explanation = "The source distribution should be used for install"
 
 [packages.a.versions."1.0.0"]
+
+[resolver_options]
+no_binary = ["a"]
diff --git a/scenarios/wheels/no-build.toml b/scenarios/wheels/no-build.toml
@@ -9,3 +9,6 @@ satisfiable = true
 explanation = "The wheel should be used for install"
 
 [packages.a.versions."1.0.0"]
+
+[resolver_options]
+no_build = ["a"]
diff --git a/scenarios/wheels/no-wheels-no-build.toml b/scenarios/wheels/no-wheels-no-build.toml
@@ -9,3 +9,6 @@ satisfiable = false
 
 [packages.a.versions."1.0.0"]
 wheel = false
+
+[resolver_options]
+no_build = ["a"]
diff --git a/scenarios/wheels/only-wheels-no-binary.toml b/scenarios/wheels/only-wheels-no-binary.toml
@@ -9,3 +9,6 @@ satisfiable = false
 
 [packages.a.versions."1.0.0"]
 sdist = false
+
+[resolver_options]
+no_binary = ["a"]