change to :all: has lower priority

Author: yokomotod

docs/configuration.md

@@ -221,14 +221,14 @@ This configuration is ignored when `installer.parallel` is set to `false`.
 
 When set, this configuration allows users to disallow the use of binary distribution format for all, none or specific packages.
 
-If both `installer.no-binary` and `installer.only-binary` configurations match a package, `installer.no-binary` takes precedence.
-
 | Configuration          | Description                                                |
 |------------------------|------------------------------------------------------------|
 | `:all:` or `true`      | Disallow binary distributions for all packages.            |
 | `:none:` or `false`    | Allow binary distributions for all packages.               |
 | `package[,package,..]` | Disallow binary distributions for specified packages only. |
 
+If both `installer.no-binary` and `installer.only-binary` are set, explicit package names will take precedence over `:all:`.
+
 {{% note %}}
 As with all configurations described here, this is a user specific configuration. This means that this
 is not taken into consideration when a lockfile is generated or dependencies are resolved. This is
@@ -271,7 +271,7 @@ across all your projects if incorrectly set.
 When set, this configuration allows users to enforce the use of binary distribution format for all, none or
 specific packages.
 
-If both `installer.no-binary` and `installer.only-binary` configurations match a package, `installer.no-binary` takes precedence.
+If both `installer.no-binary` and `installer.only-binary` are set, explicit package names will take precedence over `:all:`.
 
 {{% note %}}
 Please refer to [`installer.no-binary`]({{< relref "configuration#installerno-binary" >}}) for information on allowed

src/poetry/config/config.py

@@ -97,6 +97,9 @@ def allows(self, package_name: str) -> bool:
             or canonicalize_name(package_name) not in self.packages
         )
 
+    def has_exact_package(self, package_name: str) -> bool:
+        return canonicalize_name(package_name) in self.packages
+
     @classmethod
     def is_reserved(cls, name: str) -> bool:
         return bool(re.match(r":(all|none):", name))

src/poetry/installation/chooser.py

@@ -61,7 +61,10 @@ def choose_for(self, package: Package) -> Link:
             links_seen += 1
 
             if link.is_wheel:
-                if not self._no_binary_policy.allows(package.name):
+                if not self._no_binary_policy.allows(package.name) and (
+                    not self._only_binary_policy.has_exact_package(package.name)
+                    or self._no_binary_policy.has_exact_package(package.name)
+                ):
                     logger.debug(
                         "Skipping wheel for %s as requested in no binary policy for"
                         " package (%s)",
@@ -84,19 +87,22 @@ def choose_for(self, package: Package) -> Link:
                 logger.debug("Skipping unsupported distribution %s", link.filename)
                 continue
 
-            if link.is_sdist and not self._only_binary_policy.allows(package.name):
-                if not self._no_binary_policy.allows(package.name):
-                    # no-binary policy takes precedence over only-binary policy
-                    pass
-                else:
-                    logger.debug(
-                        "Skipping source distribution for %s as requested in only binary policy for"
-                        " package (%s)",
-                        link.filename,
-                        package.name,
-                    )
-                    sdists_skipped += 1
-                    continue
+            if (
+                link.is_sdist
+                and not self._only_binary_policy.allows(package.name)
+                and (
+                    not self._no_binary_policy.has_exact_package(package.name)
+                    or self._only_binary_policy.has_exact_package(package.name)
+                )
+            ):
+                logger.debug(
+                    "Skipping source distribution for %s as requested in only binary policy for"
+                    " package (%s)",
+                    link.filename,
+                    package.name,
+                )
+                sdists_skipped += 1
+                continue
 
             links.append(link)
 

tests/installation/test_chooser.py

@@ -122,19 +122,23 @@ def test_chooser_only_binary_policy(
 @pytest.mark.parametrize(
     ("no_binary", "only_binary", "filename"),
     [
-        # no `no_binary` for pytest
+        # no `no_binary` nor `only_binary`
         (":none:", ":none:", "pytest-3.5.0-py2.py3-none-any.whl"),
-        (":none:", ":all:", "pytest-3.5.0-py2.py3-none-any.whl"),
         ("black", "black", "pytest-3.5.0-py2.py3-none-any.whl"),
-        ("black", "pytest", "pytest-3.5.0-py2.py3-none-any.whl"),
-        # `no_binary` but no `only_binary` for pytest
+        # `no_binary` only
         (":all:", ":none:", "pytest-3.5.0.tar.gz"),
         ("pytest", "black", "pytest-3.5.0.tar.gz"),
-        # both `no_binary` and `only_binary` for pytest (`no_binary` should take precedence)
-        ("pytest", "pytest", "pytest-3.5.0.tar.gz"),
-        (":all:", ":all:", "pytest-3.5.0.tar.gz"),
+        # `only_binary` only
+        (":none:", ":all:", "pytest-3.5.0-py2.py3-none-any.whl"),
+        ("black", "pytest", "pytest-3.5.0-py2.py3-none-any.whl"),
+        # both `no_binary` and `only_binary`
+        ("pytest", "pytest", None),
+        (":all:", ":all:", None),
         ("pytest", ":all:", "pytest-3.5.0.tar.gz"),
-        ("pytest,black", "pytest,black", "pytest-3.5.0.tar.gz"),
+        (":all:", "pytest", "pytest-3.5.0-py2.py3-none-any.whl"),
+
+        # complex cases
+        ("pytest,black", "pytest,black", None),
     ],
 )
 @pytest.mark.parametrize("source_type", ["", "legacy"])