Commit a770b3ac by David Hotham Committed by GitHub

package category is not useful (#7637)

package.category doesn't make a lot of sense in the richer world of dependency groups.

The only use that is made of the category in poetry and poetry-core is that it is written to and read back from the lockfile. But no use is made of that information.
parent ec35b837
......@@ -126,7 +126,6 @@ class Locker:
source_subdirectory=source.get("subdirectory"),
)
package.description = info.get("description", "")
package.category = info.get("category", "main")
package.optional = info["optional"]
metadata = cast("dict[str, Any]", lock_data["metadata"])
......@@ -425,7 +424,6 @@ class Locker:
"name": package.pretty_name,
"version": package.pretty_version,
"description": package.description or "",
"category": package.category,
"optional": package.optional,
"python-versions": package.python_versions,
"files": sorted(
......
......@@ -9,8 +9,6 @@ from typing import FrozenSet
from typing import Tuple
from typing import TypeVar
from poetry.core.packages.dependency_group import MAIN_GROUP
from poetry.mixology import resolve_version
from poetry.mixology.failure import SolveFailure
from poetry.puzzle.exceptions import OverrideNeeded
......@@ -273,11 +271,9 @@ class PackageNode(DFSNode):
self.depth = -1
if not previous:
self.category = "dev"
self.groups: frozenset[str] = frozenset()
self.optional = True
elif dep:
self.category = "main" if MAIN_GROUP in dep.groups else "dev"
self.groups = dep.groups
self.optional = dep.is_optional()
else:
......@@ -327,14 +323,11 @@ def aggregate_package_nodes(nodes: list[PackageNode]) -> tuple[Package, int]:
for node in nodes:
groups.extend(node.groups)
category = "main" if any(MAIN_GROUP in node.groups for node in nodes) else "dev"
optional = all(node.optional for node in nodes)
for node in nodes:
node.depth = depth
node.category = category
node.optional = optional
package.category = category
package.optional = optional
return package, depth
......@@ -45,7 +45,6 @@ def install_plugin(installed: Repository) -> None:
{
"name": "poetry-plugin",
"version": "1.2.3",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......
......@@ -44,7 +44,6 @@ def test_show_basic_with_installed_packages(
pytest_373 = get_package("pytest", "3.7.3")
pytest_373.description = "Pytest package"
pytest_373.category = "dev"
installed.add_package(cachy_010)
installed.add_package(pendulum_200)
......@@ -57,7 +56,6 @@ def test_show_basic_with_installed_packages(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -67,7 +65,6 @@ def test_show_basic_with_installed_packages(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -77,7 +74,6 @@ def test_show_basic_with_installed_packages(
"name": "pytest",
"version": "3.7.3",
"description": "Pytest package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -121,11 +117,9 @@ def _configure_project_with_groups(poetry: Poetry, installed: Repository) -> Non
pendulum_200 = get_package("pendulum", "2.0.0")
pendulum_200.description = "Pendulum package"
pendulum_200.category = "dev"
pytest_373 = get_package("pytest", "3.7.3")
pytest_373.description = "Pytest package"
pytest_373.category = "dev"
installed.add_package(cachy_010)
installed.add_package(pendulum_200)
......@@ -138,7 +132,6 @@ def _configure_project_with_groups(poetry: Poetry, installed: Repository) -> Non
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -148,7 +141,6 @@ def _configure_project_with_groups(poetry: Poetry, installed: Repository) -> Non
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -158,7 +150,6 @@ def _configure_project_with_groups(poetry: Poetry, installed: Repository) -> Non
"name": "pytest",
"version": "3.7.3",
"description": "Pytest package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -283,7 +274,6 @@ def test_show_basic_with_installed_packages_single(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -325,7 +315,6 @@ def test_show_basic_with_installed_packages_single_canonicalized(
"name": "foo-bar",
"version": "0.1.0",
"description": "Foobar package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -370,7 +359,6 @@ def test_show_basic_with_not_installed_packages_non_decorated(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -380,7 +368,6 @@ def test_show_basic_with_not_installed_packages_non_decorated(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -426,7 +413,6 @@ def test_show_basic_with_not_installed_packages_decorated(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -436,7 +422,6 @@ def test_show_basic_with_not_installed_packages_decorated(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -496,7 +481,6 @@ def test_show_latest_non_decorated(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -506,7 +490,6 @@ def test_show_latest_non_decorated(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -566,7 +549,6 @@ def test_show_latest_decorated(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -576,7 +558,6 @@ def test_show_latest_decorated(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -635,7 +616,6 @@ def test_show_outdated(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -645,7 +625,6 @@ def test_show_outdated(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -689,7 +668,6 @@ def test_show_outdated_with_only_up_to_date_packages(
"name": "cachy",
"version": "0.2.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -748,7 +726,6 @@ def test_show_outdated_has_prerelease_but_not_allowed(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -758,7 +735,6 @@ def test_show_outdated_has_prerelease_but_not_allowed(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -823,7 +799,6 @@ def test_show_outdated_has_prerelease_and_allowed(
"name": "cachy",
"version": "0.1.0.dev1",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -833,7 +808,6 @@ def test_show_outdated_has_prerelease_and_allowed(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -892,7 +866,6 @@ def test_show_outdated_formatting(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -902,7 +875,6 @@ def test_show_outdated_formatting(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -975,7 +947,6 @@ def test_show_outdated_local_dependencies(
"name": "cachy",
"version": "0.2.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -985,7 +956,6 @@ def test_show_outdated_local_dependencies(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -995,7 +965,6 @@ def test_show_outdated_local_dependencies(
"name": "demo",
"version": "0.1.0",
"description": "Demo package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1010,7 +979,6 @@ def test_show_outdated_local_dependencies(
"name": "project-with-setup",
"version": "0.1.1",
"description": "Demo project.",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1090,7 +1058,6 @@ def test_show_outdated_git_dev_dependency(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1100,7 +1067,6 @@ def test_show_outdated_git_dev_dependency(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1110,7 +1076,6 @@ def test_show_outdated_git_dev_dependency(
"name": "demo",
"version": "0.1.1",
"description": "Demo package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1126,7 +1091,6 @@ def test_show_outdated_git_dev_dependency(
"name": "pytest",
"version": "3.4.3",
"description": "Pytest",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1190,7 +1154,6 @@ def test_show_outdated_no_dev_git_dev_dependency(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1200,7 +1163,6 @@ def test_show_outdated_no_dev_git_dev_dependency(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1210,7 +1172,6 @@ def test_show_outdated_no_dev_git_dev_dependency(
"name": "demo",
"version": "0.1.1",
"description": "Demo package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1225,7 +1186,6 @@ def test_show_outdated_no_dev_git_dev_dependency(
"name": "pytest",
"version": "3.4.3",
"description": "Pytest",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1276,7 +1236,6 @@ def test_show_hides_incompatible_package(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1286,7 +1245,6 @@ def test_show_hides_incompatible_package(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1332,7 +1290,6 @@ def test_show_all_shows_incompatible_package(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1343,7 +1300,6 @@ def test_show_all_shows_incompatible_package(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1483,7 +1439,6 @@ def test_show_non_dev_with_basic_installed_packages(
pytest_373 = get_package("pytest", "3.7.3")
pytest_373.description = "Pytest package"
pytest_373.category = "dev"
installed.add_package(cachy_010)
installed.add_package(pendulum_200)
......@@ -1496,7 +1451,6 @@ def test_show_non_dev_with_basic_installed_packages(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1506,7 +1460,6 @@ def test_show_non_dev_with_basic_installed_packages(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1516,7 +1469,6 @@ def test_show_non_dev_with_basic_installed_packages(
"name": "pytest",
"version": "3.7.3",
"description": "Pytest package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1559,7 +1511,6 @@ def test_show_with_group_only(
pytest_373 = get_package("pytest", "3.7.3")
pytest_373.description = "Pytest package"
pytest_373.category = "dev"
installed.add_package(cachy_010)
installed.add_package(pendulum_200)
......@@ -1572,7 +1523,6 @@ def test_show_with_group_only(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1582,7 +1532,6 @@ def test_show_with_group_only(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1592,7 +1541,6 @@ def test_show_with_group_only(
"name": "pytest",
"version": "3.7.3",
"description": "Pytest package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1634,7 +1582,6 @@ def test_show_with_optional_group(
pytest_373 = get_package("pytest", "3.7.3")
pytest_373.description = "Pytest package"
pytest_373.category = "dev"
installed.add_package(cachy_010)
installed.add_package(pendulum_200)
......@@ -1647,7 +1594,6 @@ def test_show_with_optional_group(
"name": "cachy",
"version": "0.1.0",
"description": "Cachy package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1657,7 +1603,6 @@ def test_show_with_optional_group(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1667,7 +1612,6 @@ def test_show_with_optional_group(
"name": "pytest",
"version": "3.7.3",
"description": "Pytest package",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1720,7 +1664,6 @@ def test_show_tree(
"name": "cachy",
"version": "0.2.0",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1731,7 +1674,6 @@ def test_show_tree(
"name": "msgpack-python",
"version": "0.5.1",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1779,7 +1721,6 @@ def test_show_tree_no_dev(
"name": "cachy",
"version": "0.2.0",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1790,7 +1731,6 @@ def test_show_tree_no_dev(
"name": "msgpack-python",
"version": "0.5.1",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1800,7 +1740,6 @@ def test_show_tree_no_dev(
"name": "pytest",
"version": "6.1.1",
"description": "",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1965,7 +1904,6 @@ def test_show_required_by_deps(
"name": "cachy",
"version": "0.2.0",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1976,7 +1914,6 @@ def test_show_required_by_deps(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1987,7 +1924,6 @@ def test_show_required_by_deps(
"name": "msgpack-python",
"version": "0.5.1",
"description": "",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2061,7 +1997,6 @@ def test_show_dependency_installed_from_git_in_dev(
"name": "demo",
"version": "0.1.2",
"description": "Demo package",
"category": "main",
"optional": False,
"python-versions": "*",
"develop": False,
......@@ -2076,7 +2011,6 @@ def test_show_dependency_installed_from_git_in_dev(
"name": "pendulum",
"version": "2.0.0",
"description": "Pendulum package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2123,7 +2057,6 @@ def test_url_dependency_is_not_outdated_by_repository_package(
"name": "demo",
"version": "0.1.0",
"description": "Demo package",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......
......@@ -4,7 +4,6 @@
name = "missing"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -4,7 +4,6 @@
name = "missing"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -4,7 +4,6 @@
name = "missing"
version = "1.2.3"
description = ""
category = "dev"
optional = false
python-versions = "*"
files = []
......
......@@ -4,7 +4,6 @@
name = "missing"
version = "1.2.3"
description = ""
category = "dev"
optional = false
python-versions = "*"
files = []
......
[[package]]
category = "main"
description = "A sample Python project"
name = "sampleproject"
optional = false
......
......@@ -4,7 +4,6 @@
name = "quix"
version = "1.2.3"
description = "Some description."
category = "main"
optional = false
python-versions = "~2.7 || ^3.4"
files = []
......
......@@ -2,7 +2,6 @@
name = "certifi"
version = "2020.6.20"
description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false
python-versions = "*"
......@@ -18,7 +17,6 @@ hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"
name = "chardet"
version = "3.0.4"
description = "Universal encoding detector for Python 2 and 3"
category = "main"
optional = false
python-versions = "*"
......@@ -34,7 +32,6 @@ hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"
name = "docker"
version = "4.3.0"
description = "A Python library for the Docker Engine API."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
......@@ -60,7 +57,6 @@ tls = ["pyOpenSSL (>=17.5.0)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"]
name = "idna"
version = "2.10"
description = "Internationalized Domain Names in Applications (IDNA)"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -76,7 +72,6 @@ hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"
name = "pywin32"
version = "227"
description = "Python for Window Extensions"
category = "main"
optional = false
python-versions = "*"
......@@ -132,7 +127,6 @@ hash = "sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c"
name = "requests"
version = "2.24.0"
description = "Python HTTP for Humans."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
......@@ -158,7 +152,6 @@ socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
name = "six"
version = "1.15.0"
description = "Python 2 and 3 compatibility utilities"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
......@@ -174,7 +167,6 @@ hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"
name = "urllib3"
version = "1.25.10"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
......@@ -195,7 +187,6 @@ socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
name = "websocket-client"
version = "0.57.0"
description = "WebSocket client for Python. hybi13 is supported."
category = "main"
optional = false
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......
......@@ -2,7 +2,6 @@
name = "certifi"
version = "2020.12.5"
description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false
python-versions = "*"
......@@ -18,7 +17,6 @@ hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"
name = "chardet"
version = "4.0.0"
description = "Universal encoding detector for Python 2 and 3"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
......@@ -34,7 +32,6 @@ hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"
name = "docker"
version = "4.3.1"
description = "A Python library for the Docker Engine API."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
......@@ -60,7 +57,6 @@ tls = ["pyOpenSSL (>=17.5.0)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"]
name = "idna"
version = "2.10"
description = "Internationalized Domain Names in Applications (IDNA)"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -76,7 +72,6 @@ hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"
name = "pywin32"
version = "227"
description = "Python for Window Extensions"
category = "main"
optional = false
python-versions = "*"
......@@ -132,7 +127,6 @@ hash = "sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c"
name = "requests"
version = "2.25.1"
description = "Python HTTP for Humans."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
......@@ -158,7 +152,6 @@ socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
name = "six"
version = "1.15.0"
description = "Python 2 and 3 compatibility utilities"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
......@@ -174,7 +167,6 @@ hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"
name = "urllib3"
version = "1.26.3"
description = "HTTP library with thread-safe connection pooling, file post, and more."
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
......@@ -195,7 +187,6 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
name = "websocket-client"
version = "0.58.0"
description = "WebSocket client for Python with low level API options"
category = "main"
optional = false
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -20,7 +18,6 @@ files = []
name = "C"
version = "1.0"
description = ""
category = "main"
optional = true
python-versions = "*"
files = []
......@@ -32,7 +29,6 @@ D = "^1.0"
name = "D"
version = "1.1"
description = ""
category = "main"
optional = true
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -20,7 +18,6 @@ files = []
name = "C"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -29,7 +26,6 @@ files = []
name = "D"
version = "1.1"
description = ""
category = "main"
optional = true
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -20,7 +18,6 @@ files = []
name = "C"
version = "1.2"
description = ""
category = "dev"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "attrs"
version = "17.4.0"
description = "Classes Without Boilerplate"
category = "dev"
optional = false
python-versions = "*"
......@@ -15,7 +14,6 @@ tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface"]
name = "colorama"
version = "0.3.9"
description = "Cross-platform colored terminal text."
category = "dev"
marker = "sys_platform == \"win32\""
optional = false
python-versions = "*"
......@@ -24,7 +22,6 @@ python-versions = "*"
name = "funcsigs"
version = "1.0.2"
description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
category = "dev"
marker = "python_version < \"3.0\""
optional = false
python-versions = "*"
......@@ -33,7 +30,6 @@ python-versions = "*"
name = "more-itertools"
version = "4.1.0"
description = "More routines for operating on iterables, beyond itertools"
category = "dev"
optional = false
python-versions = "*"
......@@ -44,7 +40,6 @@ six = ">=1.0.0,<2.0.0"
name = "pluggy"
version = "0.6.0"
description = "plugin and hook calling mechanisms for python"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -52,7 +47,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
name = "py"
version = "1.5.3"
description = "library with cross-python path, ini-parsing, io, code, log facilities"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -60,7 +54,6 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
name = "pytest"
version = "3.5.0"
description = "pytest: simple powerful testing with Python"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -77,7 +70,6 @@ colorama = "*"
name = "six"
version = "1.11.0"
description = "Python 2 and 3 compatibility utilities"
category = "dev"
optional = false
python-versions = "*"
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -18,7 +17,6 @@ foo = ["B"]
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -27,7 +25,6 @@ files = []
name = "C"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -36,7 +33,6 @@ files = []
name = "D"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
[[package]]
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
[[package]]
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
[package.dependencies]
A = "^1.0"
[metadata]
python-versions = "*"
lock-version = "2.0"
content-hash = "123456789"
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = ">=3.5"
files = []
......@@ -14,7 +13,6 @@ python = ">=3.5,<4.0"
name = "A"
version = "1.0.1"
description = ""
category = "main"
optional = false
python-versions = ">=3.6"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -26,7 +24,6 @@ foo = ["C (>=1.0,<2.0)"]
name = "C"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -17,7 +16,6 @@ b = ["B[c] (>=1.0,<2.0)"]
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -32,7 +30,6 @@ c = ["C (>=1.0,<2.0)"]
name = "C"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
[[package]]
category = "main"
description = ""
name = "demo"
optional = false
......@@ -22,7 +21,6 @@ type = "file"
url = "../distributions/demo-0.1.0-py2.py3-none-any.whl"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "inner-directory-project"
......@@ -36,7 +34,6 @@ type = "directory"
url = "project_with_transitive_file_dependencies/inner-directory-project"
[[package]]
category = "main"
description = ""
name = "pendulum"
optional = false
......@@ -45,7 +42,6 @@ files = []
version = "1.4.4"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "project-with-extras"
......@@ -63,7 +59,6 @@ type = "directory"
url = "../project_with_extras"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "project-with-transitive-directory-dependencies"
......@@ -81,7 +76,6 @@ type = "directory"
url = "project_with_transitive_directory_dependencies"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "project-with-transitive-file-dependencies"
......
[[package]]
description = ""
category = "main"
name = "pendulum"
optional = false
python-versions = "*"
......@@ -8,7 +7,6 @@ files = []
version = "1.4.4"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "project-with-extras"
......
......@@ -2,7 +2,6 @@
name = "cachy"
version = "0.2.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -21,7 +19,6 @@ name = "project-with-setup"
version = "0.1.2"
develop = false
description = "Demo project."
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -14,7 +13,6 @@ B = "^2.0"
name = "B"
version = "2.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -26,7 +24,6 @@ C = "1.5"
name = "C"
version = "1.5"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -17,7 +16,6 @@ B = [
name = "B"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -29,7 +27,6 @@ C = "1.2"
name = "B"
version = "2.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -41,7 +38,6 @@ C = "1.5"
name = "C"
version = "1.2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -50,7 +46,6 @@ files = []
name = "C"
version = "1.5"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
[[package]]
category = "main"
description = ""
name = "demo"
optional = false
......@@ -22,7 +21,6 @@ type = "file"
url = "../distributions/demo-0.1.0-py2.py3-none-any.whl"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "inner-directory-project"
......@@ -36,7 +34,6 @@ type = "directory"
url = "project_with_transitive_file_dependencies/inner-directory-project"
[[package]]
category = "main"
description = ""
name = "pendulum"
optional = false
......@@ -45,7 +42,6 @@ files = []
version = "1.4.4"
[[package]]
category = "main"
description = "This is a description"
develop = false
name = "project-with-transitive-file-dependencies"
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......@@ -25,7 +24,6 @@ foo = ["cleo"]
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -18,7 +17,6 @@ C = [
name = "B"
version = "1.1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -27,7 +25,6 @@ files = []
name = "C"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -36,7 +33,6 @@ files = []
name = "C"
version = "2.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = true
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "C"
version = "1.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -23,7 +21,6 @@ D = "^1.2"
name = "D"
version = "1.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = true
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -20,7 +18,6 @@ files = []
name = "C"
version = "1.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -32,7 +29,6 @@ D = "^1.2"
name = "D"
version = "1.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0a2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -4,7 +4,6 @@
name = "attrs"
version = "17.4.0"
description = "Classes Without Boilerplate"
category = "dev"
optional = false
python-versions = "*"
files = [
......@@ -21,7 +20,6 @@ tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface"]
name = "colorama"
version = "0.3.9"
description = "Cross-platform colored terminal text."
category = "dev"
optional = false
python-versions = "*"
files = [
......@@ -33,7 +31,6 @@ files = [
name = "more-itertools"
version = "4.1.0"
description = "More routines for operating on iterables, beyond itertools"
category = "dev"
optional = false
python-versions = "*"
files = [
......@@ -49,7 +46,6 @@ six = ">=1.0.0,<2.0.0"
name = "pluggy"
version = "0.6.0"
description = "plugin and hook calling mechanisms for python"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -60,7 +56,6 @@ files = [
name = "py"
version = "1.5.3"
description = "library with cross-python path, ini-parsing, io, code, log facilities"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -72,7 +67,6 @@ files = [
name = "pytest"
version = "3.5.0"
description = "pytest: simple powerful testing with Python"
category = "dev"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -93,7 +87,6 @@ six = ">=1.10.0"
name = "setuptools"
version = "67.6.1"
description = "Easily download, build, install, upgrade, and uninstall Python packages"
category = "dev"
optional = false
python-versions = ">=3.7"
files = [
......@@ -110,7 +103,6 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (
name = "six"
version = "1.11.0"
description = "Python 2 and 3 compatibility utilities"
category = "dev"
optional = false
python-versions = "*"
files = [
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -11,7 +10,6 @@ files = []
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -20,7 +18,6 @@ files = []
name = "C"
version = "1.2"
description = ""
category = "main"
optional = false
python-versions = "~2.7 || ^3.3"
files = []
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -24,7 +23,6 @@ foo = ["cleo"]
name = "demo"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -45,7 +43,6 @@ foo = ["cleo"]
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "A"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -14,7 +13,6 @@ D = "^1.0"
name = "B"
version = "1.1"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -26,7 +24,6 @@ C = "~1.2"
name = "C"
version = "1.2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -35,7 +32,6 @@ files = []
name = "D"
version = "1.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = [
......@@ -24,7 +23,6 @@ foo = ["cleo"]
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -25,7 +24,6 @@ resolved_reference = "123456"
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -34,7 +32,6 @@ files = []
name = "cleo"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -21,7 +20,6 @@ resolved_reference = "123456"
name = "pendulum"
version = "1.4.4"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -2,7 +2,6 @@
name = "demo"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
......
......@@ -250,7 +250,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -259,7 +258,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -268,7 +266,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "C",
"version": "1.2",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -327,7 +324,6 @@ def _configure_run_install_dev(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -336,7 +332,6 @@ def _configure_run_install_dev(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -345,7 +340,6 @@ def _configure_run_install_dev(
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -457,7 +451,6 @@ def test_run_install_does_not_remove_locked_packages_if_installed_but_not_requir
{
"name": package_a.name,
"version": package_a.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -466,7 +459,6 @@ def test_run_install_does_not_remove_locked_packages_if_installed_but_not_requir
{
"name": package_b.name,
"version": package_b.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -475,7 +467,6 @@ def test_run_install_does_not_remove_locked_packages_if_installed_but_not_requir
{
"name": package_c.name,
"version": package_c.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -528,7 +519,6 @@ def test_run_install_removes_locked_packages_if_installed_and_synchronization_is
{
"name": package_a.name,
"version": package_a.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -537,7 +527,6 @@ def test_run_install_removes_locked_packages_if_installed_and_synchronization_is
{
"name": package_b.name,
"version": package_b.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -546,7 +535,6 @@ def test_run_install_removes_locked_packages_if_installed_and_synchronization_is
{
"name": package_c.name,
"version": package_c.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -599,7 +587,6 @@ def test_run_install_removes_no_longer_locked_packages_if_installed(
{
"name": package_a.name,
"version": package_a.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -608,7 +595,6 @@ def test_run_install_removes_no_longer_locked_packages_if_installed(
{
"name": package_b.name,
"version": package_b.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -617,7 +603,6 @@ def test_run_install_removes_no_longer_locked_packages_if_installed(
{
"name": package_c.name,
"version": package_c.version.text,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -695,7 +680,6 @@ def test_run_install_with_synchronization(
{
"name": pkg.name,
"version": pkg.version,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -739,7 +723,6 @@ def test_run_whitelist_add(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -788,7 +771,6 @@ def test_run_whitelist_remove(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -797,7 +779,6 @@ def test_run_whitelist_remove(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1406,7 +1387,6 @@ def test_run_with_prereleases(
{
"name": "A",
"version": "1.0a2",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1441,53 +1421,6 @@ def test_run_with_prereleases(
assert locker.written_data == expected
def test_run_changes_category_if_needed(
installer: Installer, locker: Locker, repo: Repository, package: ProjectPackage
):
locker.locked(True)
locker.mock_lock_data(
{
"package": [
{
"name": "A",
"version": "1.0",
"category": "dev",
"optional": True,
"platform": "*",
"python-versions": "*",
"checksum": [],
}
],
"metadata": {
"python-versions": "*",
"platform": "*",
"content-hash": "123456789",
"files": {"A": []},
},
}
)
package_a = get_package("A", "1.0")
package_b = get_package("B", "1.1")
package_b.add_dependency(Factory.create_dependency("A", "^1.0"))
repo.add_package(package_a)
repo.add_package(package_b)
package.add_dependency(
Factory.create_dependency(
"A", {"version": "^1.0", "optional": True}, groups=["dev"]
)
)
package.add_dependency(Factory.create_dependency("B", "^1.1"))
installer.update(True)
installer.whitelist(["B"])
installer.run()
expected = fixture("with-category-change")
assert locker.written_data == expected
def test_run_update_all_with_lock(
installer: Installer, locker: Locker, repo: Repository, package: ProjectPackage
) -> None:
......@@ -1498,7 +1431,6 @@ def test_run_update_all_with_lock(
{
"name": "A",
"version": "1.0",
"category": "dev",
"optional": True,
"platform": "*",
"python-versions": "*",
......@@ -1538,7 +1470,6 @@ def test_run_update_with_locked_extras(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1548,7 +1479,6 @@ def test_run_update_with_locked_extras(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1557,7 +1487,6 @@ def test_run_update_with_locked_extras(
{
"name": "C",
"version": "1.1",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1656,7 +1585,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1671,7 +1599,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1682,7 +1609,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "B",
"version": "2.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1693,7 +1619,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1702,7 +1627,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "C",
"version": "1.5",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1768,7 +1692,6 @@ def test_run_update_uninstalls_after_removal_transient_dependency(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1778,7 +1701,6 @@ def test_run_update_uninstalls_after_removal_transient_dependency(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1831,7 +1753,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1846,7 +1767,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1857,7 +1777,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "B",
"version": "2.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1868,7 +1787,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1877,7 +1795,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "C",
"version": "1.5",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2156,7 +2073,6 @@ def test_update_multiple_times_with_split_dependencies_is_idempotent(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2166,7 +2082,6 @@ def test_update_multiple_times_with_split_dependencies_is_idempotent(
{
"name": "B",
"version": "1.0.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
......@@ -2501,7 +2416,6 @@ def test_installer_should_use_the_locked_version_of_git_dependencies(
{
"name": "demo",
"version": "0.1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2517,7 +2431,6 @@ def test_installer_should_use_the_locked_version_of_git_dependencies(
{
"name": "pendulum",
"version": "1.4.4",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -2679,7 +2592,6 @@ def test_installer_distinguishes_locked_packages_by_source(
{
"name": "torch",
"version": "1.11.0",
"category": "main",
"optional": False,
"files": [],
"python-versions": "*",
......@@ -2687,7 +2599,6 @@ def test_installer_distinguishes_locked_packages_by_source(
{
"name": "torch",
"version": "1.11.0+cpu",
"category": "main",
"optional": False,
"files": [],
"python-versions": "*",
......
......@@ -194,7 +194,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -203,7 +202,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -212,7 +210,6 @@ def test_run_update_after_removing_dependencies(
{
"name": "C",
"version": "1.2",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -272,7 +269,6 @@ def test_run_install_no_group(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -281,7 +277,6 @@ def test_run_install_no_group(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -290,7 +285,6 @@ def test_run_install_no_group(
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -387,7 +381,6 @@ def test_run_install_with_synchronization(
{
"name": pkg.name,
"version": pkg.version,
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -434,7 +427,6 @@ def test_run_whitelist_add(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -483,7 +475,6 @@ def test_run_whitelist_remove(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -492,7 +483,6 @@ def test_run_whitelist_remove(
{
"name": "B",
"version": "1.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1032,7 +1022,6 @@ def test_run_with_prereleases(
{
"name": "A",
"version": "1.0a2",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1067,53 +1056,6 @@ def test_run_with_prereleases(
assert locker.written_data == expected
def test_run_changes_category_if_needed(
installer: Installer, locker: Locker, repo: Repository, package: ProjectPackage
):
locker.locked(True)
locker.mock_lock_data(
{
"package": [
{
"name": "A",
"version": "1.0",
"category": "dev",
"optional": True,
"platform": "*",
"python-versions": "*",
"checksum": [],
}
],
"metadata": {
"python-versions": "*",
"platform": "*",
"content-hash": "123456789",
"files": {"A": []},
},
}
)
package_a = get_package("A", "1.0")
package_b = get_package("B", "1.1")
package_b.add_dependency(Factory.create_dependency("A", "^1.0"))
repo.add_package(package_a)
repo.add_package(package_b)
package.add_dependency(
Factory.create_dependency(
"A", {"version": "^1.0", "optional": True}, groups=["dev"]
)
)
package.add_dependency(Factory.create_dependency("B", "^1.1"))
installer.update(True)
installer.whitelist(["B"])
installer.run()
expected = fixture("with-category-change")
assert locker.written_data == expected
def test_run_update_all_with_lock(
installer: Installer, locker: Locker, repo: Repository, package: ProjectPackage
):
......@@ -1124,7 +1066,6 @@ def test_run_update_all_with_lock(
{
"name": "A",
"version": "1.0",
"category": "dev",
"optional": True,
"platform": "*",
"python-versions": "*",
......@@ -1164,7 +1105,6 @@ def test_run_update_with_locked_extras(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1174,7 +1114,6 @@ def test_run_update_with_locked_extras(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1183,7 +1122,6 @@ def test_run_update_with_locked_extras(
{
"name": "C",
"version": "1.1",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1284,7 +1222,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1299,7 +1236,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1310,7 +1246,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "B",
"version": "2.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1321,7 +1256,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1330,7 +1264,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock(
{
"name": "C",
"version": "1.5",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1399,7 +1332,6 @@ def test_run_update_uninstalls_after_removal_transient_dependency(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1409,7 +1341,6 @@ def test_run_update_uninstalls_after_removal_transient_dependency(
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1465,7 +1396,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1480,7 +1410,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "B",
"version": "1.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1491,7 +1420,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "B",
"version": "2.0",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1502,7 +1430,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "C",
"version": "1.2",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1511,7 +1438,6 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
{
"name": "C",
"version": "1.5",
"category": "dev",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1764,7 +1690,6 @@ def test_update_multiple_times_with_split_dependencies_is_idempotent(
{
"name": "A",
"version": "1.0",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": "*",
......@@ -1774,7 +1699,6 @@ def test_update_multiple_times_with_split_dependencies_is_idempotent(
{
"name": "B",
"version": "1.0.1",
"category": "main",
"optional": False,
"platform": "*",
"python-versions": ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
......
......@@ -101,7 +101,6 @@ def test_lock_file_data_is_ordered(locker: Locker, root: ProjectPackage) -> None
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = [
......@@ -116,7 +115,6 @@ B = "^1.0"
name = "A"
version = "2.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = [
......@@ -127,7 +125,6 @@ files = [
name = "B"
version = "1.2"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -136,7 +133,6 @@ files = []
name = "git-package"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -152,7 +148,6 @@ resolved_reference = "123456"
name = "git-package-subdir"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -169,7 +164,6 @@ subdirectory = "subdir"
name = "url-package"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -182,7 +176,6 @@ url = "https://example.org/url-package-1.0-cp39-manylinux_2_17_x86_64.whl"
name = "url-package"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -208,7 +201,6 @@ def test_locker_properly_loads_extras(locker: Locker) -> None:
name = "cachecontrol"
version = "0.12.5"
description = "httplib2 caching for requests"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
files = []
......@@ -254,7 +246,6 @@ def test_locker_properly_loads_nested_extras(locker: Locker) -> None:
name = "a"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -269,7 +260,6 @@ b = ["b[c] (>=1.0,<2.0)"]
name = "b"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -284,7 +274,6 @@ c = ["c (>=1.0,<2.0)"]
name = "c"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -335,7 +324,6 @@ def test_locker_properly_loads_extras_legacy(locker: Locker) -> None:
name = "a"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -350,7 +338,6 @@ b = ["b (^1.0)"]
name = "b"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -384,7 +371,6 @@ def test_locker_properly_loads_subdir(locker: Locker) -> None:
name = "git-package-subdir"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -427,7 +413,6 @@ def test_locker_properly_assigns_metadata_files(locker: Locker) -> None:
name = "demo"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -436,7 +421,6 @@ develop = false
name = "demo"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -451,7 +435,6 @@ resolved_reference = "123456"
name = "demo"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -464,7 +447,6 @@ url = "./folder"
name = "demo"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -477,7 +459,6 @@ url = "./demo-1.0-cp39-win_amd64.whl"
name = "demo"
version = "1.0"
description = ""
category = "main"
optional = false
python-versions = "*"
develop = false
......@@ -548,7 +529,6 @@ def test_lock_packages_with_null_description(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -582,7 +562,6 @@ def test_lock_file_should_not_have_mixed_types(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -618,7 +597,6 @@ def test_reading_lock_file_should_raise_an_error_on_invalid_data(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -667,7 +645,6 @@ def test_locking_legacy_repository_package_should_include_source_section(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -790,7 +767,6 @@ def test_extras_dependencies_are_ordered(locker: Locker, root: ProjectPackage) -
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -897,7 +873,6 @@ def test_locker_dumps_dependency_information_correctly(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -944,7 +919,6 @@ def test_locker_dumps_subdir(locker: Locker, root: ProjectPackage) -> None:
name = "git-package-subdir"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -993,7 +967,6 @@ def test_locker_dumps_dependency_extras_in_correct_order(
name = "A"
version = "1.0.0"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......@@ -1021,7 +994,6 @@ def test_locked_repository_uses_root_dir_of_package(
name = "lib-a"
version = "0.1.0"
description = ""
category = "main"
optional = false
python-versions = "^2.7.9"
develop = true
......@@ -1162,7 +1134,6 @@ def test_lock_file_resolves_file_url_symlinks(root: ProjectPackage) -> None:
name = "local-package"
version = "1.2.3"
description = ""
category = "main"
optional = false
python-versions = "*"
files = []
......
......@@ -356,7 +356,7 @@ def test_solver_sets_groups(
transaction = solver.solve()
ops = check_solver_result(
_ = check_solver_result(
transaction,
[
{"job": "install", "package": package_c},
......@@ -365,10 +365,6 @@ def test_solver_sets_groups(
],
)
assert ops[0].package.category == "dev"
assert ops[2].package.category == "dev"
assert ops[1].package.category == "main"
def test_solver_respects_root_package_python_versions(
solver: Solver, repo: Repository, package: ProjectPackage
......@@ -1090,7 +1086,7 @@ def test_solver_with_dependency_in_both_main_and_dev_dependencies(
transaction = solver.solve()
ops = check_solver_result(
_ = check_solver_result(
transaction,
[
{"job": "install", "package": package_d},
......@@ -1100,16 +1096,6 @@ def test_solver_with_dependency_in_both_main_and_dev_dependencies(
],
)
d = ops[0].package
b = ops[1].package
c = ops[2].package
a = ops[3].package
assert d.category == "dev"
assert b.category == "main"
assert c.category == "dev"
assert a.category == "main"
def test_solver_with_dependency_in_both_main_and_dev_dependencies_with_one_more_dependent( # noqa: E501
solver: Solver, repo: Repository, package: ProjectPackage
......@@ -1147,7 +1133,7 @@ def test_solver_with_dependency_in_both_main_and_dev_dependencies_with_one_more_
transaction = solver.solve()
ops = check_solver_result(
_ = check_solver_result(
transaction,
[
{"job": "install", "package": package_b},
......@@ -1158,18 +1144,6 @@ def test_solver_with_dependency_in_both_main_and_dev_dependencies_with_one_more_
],
)
b = ops[0].package
d = ops[1].package
a = ops[2].package
c = ops[3].package
e = ops[4].package
assert b.category == "main"
assert d.category == "dev"
assert a.category == "main"
assert c.category == "dev"
assert e.category == "main"
def test_solver_with_dependency_and_prerelease_sub_dependencies(
solver: Solver, repo: Repository, package: ProjectPackage
......@@ -1218,7 +1192,7 @@ def test_solver_circular_dependency(
transaction = solver.solve()
ops = check_solver_result(
_ = check_solver_result(
transaction,
[
{"job": "install", "package": package_c},
......@@ -1227,8 +1201,6 @@ def test_solver_circular_dependency(
],
)
assert ops[0].package.category == "main"
def test_solver_circular_dependency_chain(
solver: Solver, repo: Repository, package: ProjectPackage
......@@ -1254,7 +1226,7 @@ def test_solver_circular_dependency_chain(
transaction = solver.solve()
ops = check_solver_result(
_ = check_solver_result(
transaction,
[
{"job": "install", "package": package_d},
......@@ -1264,8 +1236,6 @@ def test_solver_circular_dependency_chain(
],
)
assert ops[0].package.category == "main"
def test_solver_dense_dependencies(
solver: Solver, repo: Repository, package: ProjectPackage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment