Update changelog for 0.10.2

Add link to official poetry docs on tox integration
Add emojis to notes/warnings to improve ease of comprehension
Update docs with new poetry command syntax
Remove link to deprecated tox-poetry plugin
Remove docs on unsafe dependencies

.github/scripts/setup-env.sh

@@ -8,7 +8,7 @@
 set -e;
 
 CI_CACHE=$HOME/.cache;
-POETRY_VERSION=1.2.0;
+POETRY_VERSION=1.3.2;
 
 mkdir --parents "$CI_CACHE";
 

.github/workflows/ci.yaml

@@ -20,6 +20,8 @@ jobs:
             toxenv: py39
           - version: "3.10"
             toxenv: py310
+          - version: "3.11"
+            toxenv: py311
       fail-fast: true
     steps:
       - name: Checkout

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 See also: [Github Release Page](https://github.com/enpaul/tox-poetry-installer/releases).
 
+## Version 0.10.2
+
+View this release on:
+[Github](https://github.com/enpaul/tox-poetry-installer/releases/tag/0.10.2),
+[PyPI](https://pypi.org/project/tox-poetry-installer/0.10.2/)
+
+- Update documentation with best practices and Poetry 1.2+ command syntax
+- Fix failed install of sdist package not raising an exception in multi-threaded mode.
+  Contributed by [chriskuehl](https://github.com/chriskuehl) (#86)
+
+## Version 0.10.1
+
+View this release on:
+[Github](https://github.com/enpaul/tox-poetry-installer/releases/tag/0.10.1),
+[PyPI](https://pypi.org/project/tox-poetry-installer/0.10.1/)
+
+- Add PyPI classifier for Python-3.11 compatibility
+- Add CI support for Python-3.11
+- Add support for Poetry-1.3.x (#83)
+
 ## Version 0.10.0
 
 View this release on:

Makefile

@@ -33,7 +33,7 @@ test: ## Run the project testsuite(s)
 	poetry run tox --recreate
 
 dev: ## Create the local dev environment
-	poetry install -E poetry --sync
+	poetry install --extras poetry --sync
 	poetry run pre-commit install
 
 publish: test wheel source ## Build and upload to pypi (requires $PYPI_API_KEY be set)

README.md

@@ -25,7 +25,6 @@ environment dependencies from the [Poetry](https://python-poetry.org/) lockfile.
   - [Other Notes](#other-notes)
     - [Unsupported Tox config options](#unsupported-tox-config-options)
     - [Updating locked dependencies in a testenv](#updating-locked-dependencies-in-a-testenv)
-    - [Installing unsafe dependencies](#installing-unsafe-dependencies)
     - [Using with an unmanaged Poetry installation](#using-with-an-unmanaged-poetry-installation)
 - [Developing the Plugin](#developer-documentation)
 - [Road Map](#road-map)
@@ -34,7 +33,7 @@ See the
 [Changelog](https://github.com/enpaul/tox-poetry-installer/blob/devel/CHANGELOG.md) for
 release history.
 
-*See also: [official Tox plugins](https://tox.readthedocs.io/en/latest/plugins.html), [Poetry Tox plugin](https://github.com/tkukushkin/tox-poetry)*
+*See also: [official Tox plugins](https://tox.readthedocs.io/en/latest/plugins.html) and [the official Poetry documentation on using Tox](https://python-poetry.org/docs/faq/#is-tox-supported)*
 
 ## Feature Overview
 
@@ -60,10 +59,10 @@ release history.
 The recommended way to install the plugin is to add it to a project using Poetry:
 
 ```bash
-poetry add tox-poetry-installer[poetry] --dev
+poetry add -G dev tox-poetry-installer[poetry]
 ```
 
-> **Note:** Always install the plugin with the `[poetry]` extra, unless you are
+> ℹ️ **Note:** Always install the plugin with the `[poetry]` extra, unless you are
 > [managing the Poetry installation yourself](#externally-managed-poetry-installation).
 
 Alternatively, it can be installed directly to a virtual environment using Pip, though
@@ -80,16 +79,16 @@ adding the below to `tox.ini`, though this is also not recommended:
 
 ```ini
 requires =
-    tox-poetry-installer[poetry] == 0.8.0
+    tox-poetry-installer[poetry] == 0.10.2
 ```
 
 After installing, check that Tox recognizes the plugin by running
 `poetry run tox --version`. The command should give output similar to below:
 
 ```
-3.20.0 imported from .venv/lib64/python3.8/site-packages/tox/__init__.py
+3.20.0 imported from .venv/lib64/python3.10/site-packages/tox/__init__.py
 registered plugins:
-    tox-poetry-installer-0.8.0 at .venv/lib64/python3.8/site-packages/tox_poetry_installer/__init__.py
+    tox-poetry-installer-0.10.2 at .venv/lib64/python3.10/site-packages/tox_poetry_installer/__init__.py
 ```
 
 ### Quick Start
@@ -146,7 +145,7 @@ locked_deps =
 commands = ...
 ```
 
-> **Note:** Settings configured on the main `testenv` environment are inherited by child
+> ℹ️ **Note:** Settings configured on the main `testenv` environment are inherited by child
 > test environments (for example, `testenv:foo`). To override this, specify the setting in
 > the child environment with a different value.
 
@@ -162,11 +161,8 @@ poetry_dep_groups =
 commands = ...
 ```
 
-> **Note:** Setting `poetry_dep_groups = [dev]` on an environment that also installs the
+> ℹ️ **Note:** The `install_dev_deps` configuration option is deprecated. See [Configuration
-> project package is functionally equivalent to running `poetry install`.
+> Options](#configuration-options) for more information.
-
-> **Note:** The `install_dev_deps` configuration option is deprecated. See \[Configuration
-> Options\](#configuration-options\] for more information.
 
 Finally, we can also install an unlocked dependency (a dependency which doesn't take its
 version from the Poetry lockfile) into the test environment alongside the locked ones. We
@@ -194,7 +190,7 @@ All options listed below are Tox environment options and can be applied to one o
 environment sections of the `tox.ini` file. They cannot be applied to the global Tox
 configuration section.
 
-> **Note:** Settings configured on the main `testenv` environment are inherited by child
+> ℹ️ **Note:** Settings configured on the main `testenv` environment are inherited by child
 > test environments (for example, `testenv:foo`). To override this, specify the setting in
 > the child environment with a different value.
 
@@ -206,9 +202,9 @@ configuration section.
 | `require_poetry`       | Boolean |  False  | Whether Tox should be forced to fail if the plugin cannot import Poetry locally. If `False` then the plugin will be skipped for the test environment if Poetry cannot be imported. If `True` then the plugin will force the environment to error and the Tox run to fail.                                                                                            |
 | `poetry_dep_groups`    |  List   |  `[]`   | Names of Poetry dependency groups specified in `pyproject.toml` to install to the test environment.                                                                                                                                                                                                                                                                  |
 
-> **Note:** The `install_dev_deps` configuration option is deprecated and will be removed in
+> ℹ️ **Note:** The `install_dev_deps` configuration option is deprecated and will be removed
-> version 1.0.0. Please set `poetry_dep_groups = [dev]` in `tox.ini` for environments that
+> in version 1.0.0. Please set `poetry_dep_groups = [dev]` in `tox.ini` for environments
-> install the development dependencies.
+> that install the development dependencies.
 
 ### Runtime Options
 
@@ -219,12 +215,12 @@ of the plugin.
 | :--------------------------- | :-----: | :-----: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `--parallel-install-threads` | Integer |  `10`   | Number of worker threads to use to install dependencies in parallel. Installing in parallel with more threads can greatly speed up the install process, but can cause race conditions during install. Pass this option with the value `0` to entirely disable parallel installation. |
 
-> **Note:** The `--require-poetry` runtime option is deprecated and will be removed in
+> ℹ️ **Note:** The `--require-poetry` runtime option is deprecated and will be removed in
 > version 1.0.0. Please set `require_poetry = true` in `tox.ini` for environments that
 > should fail if Poetry is not available.
 
-> **Note:** The `--parallelize-locked-install` option is deprecated and will be removed in
+> ℹ️ **Note:** The `--parallelize-locked-install` option is deprecated and will be removed
-> version 1.0.0. Please use the `--parallel-install-threads` option.
+> in version 1.0.0. Please use the `--parallel-install-threads` option.
 
 ### Errors
 
@@ -241,9 +237,9 @@ error will be set to one of the "Status" values below to indicate what the error
 | `PoetryNotInstalledError`       | Indicates that the `poetry` module could not be imported under the current runtime environment, and `require_poetry = true` was specified.                                                                                      |
 | `RequiresUnsafeDepError`        | Indicates that the package-under-test depends on a package that Poetry has classified as unsafe and cannot be installed.                                                                                                        |
 
-> **Note:** One or more of these errors can be caused by the `pyproject.toml` being out of
+> ℹ️ **Note:** One or more of these errors can be caused by the `pyproject.toml` being out
-> sync with the Poetry lockfile. If this is the case, than a warning will be logged when Tox
+> of sync with the Poetry lockfile. If this is the case, than a warning will be logged when
-> is run.
+> Tox is run.
 
 ### Other Notes
 
@@ -254,7 +250,7 @@ these options are made obsolete by the Poetry lockfile: either they aren't neede
 equivalent functionality is instead taken directly from the package details Poetry stores
 in its lockfile.
 
-> **Note:** The unsupported Tox config options will still apply to unlocked dependencies
+> ℹ️ **Note:** The unsupported Tox config options will still apply to unlocked dependencies
 > being installed with the default Tox installation backend.
 
 - [`install_command`](https://tox.readthedocs.io/en/latest/config.html#conf-install_command)
@@ -276,41 +272,24 @@ built-in
 [`--recreate`](https://tox.readthedocs.io/en/latest/example/basic.html#forcing-re-creation-of-virtual-environments)
 option) for the new version to be found and installed.
 
-> **Note:** To force Tox to always recreate a test environment the
+> ℹ️ **Note:** To force Tox to always recreate a test environment the
 > [`recreate`](https://tox.readthedocs.io/en/latest/config.html#conf-recreate) config option
 > can be set.
 
-#### Installing unsafe dependencies
-
-There are several packages that cannot be installed from the lockfile because they are
-excluded by Poetry itself. As a result these packages cannot be installed by this plugin
-either as test environment dependencies passed directly to `locked_deps` or as a transient
-dependency. When one of these packages is encountered by the plugin a warning will be
-logged to the console and
-**the unsafe package will not be installed to the test environment**.
-
-This list can be found in the Poetry source code
-[here](https://github.com/python-poetry/poetry/blob/master/poetry/puzzle/provider.py). As
-of [Poetry 1.1.6](https://github.com/python-poetry/poetry/releases/tag/1.1.6) there are
-four packages classified as "unsafe" by Poetry and excluded from the lockfile:
-
-- `setuptools`
-- `distribute`
-- `pip`
-- `wheel`
-
 #### Using with an unmanaged Poetry installation
 
 In CI/CD systems, automation environments, or other Python environments where the loaded
 site packages are not managed by Poetry, it can be useful to manage the local installation
 of Poetry externally. This also helps to avoid problems that can be caused by the
-`--no-root`, `--no-dev`, or `--remove-untracked` arguments to the `poetry install` command
+`--no-root`, `--without dev`, or `--sync` arguments to the `poetry install` command which,
-which, in some situations, can cause Poetry to uninstall itself if Poetry is specified as
+in some situations, can cause Poetry to uninstall itself if Poetry is specified as a
-a dependency of one of the packages it is managing (like this plugin). To support these
+dependency of one of the packages it is managing (like this plugin). To support these use
-use cases, this plugin specifies the `poetry` package as an optional dependency that can
+cases, this plugin specifies the `poetry` package as an optional dependency that can be
-be installed using a setuptools extra also named `poetry`.
+installed using a setuptools extra also named `poetry`.
 
-**Critical Warning: This plugin requires Poetry to function. If the plugin is installed without the `poetry` setuptools extra then Poetry must be installed independently for the plugin to function properly.**
+> ⚠️ **Warning:** This plugin requires Poetry to function. If the plugin is installed
+> without the `poetry` setuptools extra then Poetry must be installed independently for the
+> plugin to function properly.
 
 To skip installing the `poetry` package as a dependency of `tox-poetry-installer`, do not
 specify the `poetry` extra when adding the plugin:
@@ -318,11 +297,11 @@ specify the `poetry` extra when adding the plugin:
 ```bash
 # Adding the package without the "[poetry]" extra specifier so that
 # Poetry is not added as a transient dev-dependency:
-poetry add tox-poetry-installer --dev
+poetry add -G dev tox-poetry-installer
 
 # Adding the package with the "[poetry]" extra specifier, so the Poetry
 # package will be added to the environment and tracked in the lockfile:
-poetry add tox-poetry-installer[poetry] --dev
+poetry add -G dev tox-poetry-installer[poetry]
 ```
 
 Once the plugin is installed- either with or without the Poetry extra- you can validate
@@ -338,8 +317,8 @@ python -c '\
 '
 ```
 
-> **Note:** To force Tox to fail if Poetry is not installed, add the `require_poetry = true`
+> ℹ️ **Note:** To force Tox to fail if Poetry is not installed, add the
-> option to the tox `[testenv]` configuration. See the
+> `require_poetry = true` option to the tox `[testenv]` configuration. See the
 > [Config Options](#configuration-options) for more information.
 
 ## Developer Documentation
@@ -360,8 +339,8 @@ are tracked on [Github](https://github.com/enpaul/tox-poetry-installer/releases)
   [fork the repository](https://docs.github.com/en/enterprise/2.20/user/github/getting-started-with-github/fork-a-repo)
   and [open a pull request](https://github.com/enpaul/tox-poetry-installer/compare).
 
-Developing this project requires [Python 3.7+](https://www.python.org/downloads/) and
+Developing this project requires [Python 3.10+](https://www.python.org/downloads/) and
-[Poetry 1.2](https://python-poetry.org/docs/#installation) or later. GNU Make can
+[Poetry 1.4](https://python-poetry.org/docs/#installation) or later. GNU Make can
 optionally be used to quickly setup a local development environment, but this is not
 required.
 
@@ -386,9 +365,10 @@ make test
 make help
 ```
 
-> **Note:** The pre-commit hooks require dependencies in the Poetry environment to run. To
+> ℹ️ **Note:** The pre-commit hooks require dependencies in the Poetry environment to run.
-> make a commit with the pre-commit hooks, you will need to run `poetry run git commit` or,
+> To make a commit with the pre-commit hooks, you will need to run `poetry run git commit`
-> alternatively, [launch an environment shell](https://python-poetry.org/docs/cli/#shell).
+> or, alternatively,
+> [launch an environment shell](https://python-poetry.org/docs/cli/#shell).
 
 ## Road Map
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tox-poetry-installer"
-version = "0.10.0"
+version = "0.10.2"
 license = "MIT"
 authors = ["Ethan Paul <24588726+enpaul@users.noreply.github.com>"]
 description = "A plugin for Tox that lets you install test environment dependencies from the Poetry lockfile"
@@ -27,6 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: Implementation :: CPython",
 ]
 
@@ -38,7 +39,7 @@ poetry = ["poetry", "cleo"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-cleo = {version = "^1.0.0a5", optional = true, allow-prereleases = true}
+cleo = {version = ">=1.0,<3.0", optional = true}
 poetry = {version = "^1.2.0", optional = true}
 poetry-core = "^1.1.0"
 tox = "^3.8.0"
@@ -47,7 +48,7 @@ tox = "^3.8.0"
 bandit = "^1.6.2"
 black = "^22.3.0"
 blacken-docs = "^1.8.0"
-ipython = "^7.18.1"
+ipython = {version = "^8.10.1", python = "^3.8"}
 mdformat = "^0.6"
 mdformat-gfm = "^0.2"
 mypy = "^0.930"
@@ -57,10 +58,15 @@ pylint = "^2.13.0"
 pytest = "^6.0.2"
 pytest-cov = "^2.10.1"
 reorder-python-imports = "^2.3.5"
-safety = "^1.9.0"
+safety = "^2.2.0"
 toml = "^0.10.1"
 tox = "^3.20.0"
 types-toml = "^0.10.1"
+# This is a workaround for this issue with the Poetry export
+# plugin which was blocking the 'security' CI check:
+#
+# https://github.com/python-poetry/poetry-plugin-export/issues/176
+virtualenv = ">=20.15,<20.16"
 
 [build-system]
 requires = ["poetry-core>=1.1.0"]

tests/test_installer.py

@@ -1,6 +1,8 @@
 # pylint: disable=missing-module-docstring, redefined-outer-name, unused-argument, wrong-import-order, unused-import
 import time
+from unittest import mock
 
+import pytest
 import tox.venv
 from poetry.factory import Factory
 
@@ -57,3 +59,32 @@ def test_parallelization(mock_venv, mock_poetry_factory):
     assert round(parallel * 5) == round(sequential)
     assert round(sequential) == len(set(to_install))
     assert round(parallel * 5) == len(set(to_install))
+
+
+@pytest.mark.parametrize("num_threads", (0, 8))
+def test_propagates_exceptions_during_installation(
+    mock_venv, mock_poetry_factory, num_threads
+):
+    """Assert that an exception which occurs during installation is properly raised.
+
+    Regression test for https://github.com/enpaul/tox-poetry-installer/issues/86
+    """
+    from tox_poetry_installer import _poetry  # pylint: disable=import-outside-toplevel
+
+    poetry = Factory().create_poetry(None)
+    packages: utilities.PackageMap = {
+        item.name: item for item in poetry.locker.locked_repository().packages
+    }
+    to_install = [packages["toml"]]
+    venv = tox.venv.VirtualEnv()
+    fake_exception = ValueError("my testing exception")
+
+    with mock.patch.object(
+        _poetry,
+        "PipInstaller",
+        **{"return_value.install.side_effect": fake_exception},
+    ):
+        with pytest.raises(ValueError) as exc_info:
+            installer.install(poetry, venv, to_install, num_threads)
+
+    assert exc_info.value is fake_exception

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39, py310, static, static-tests, security
+envlist = py37, py38, py39, py310, py311, static, static-tests, security
 isolated_build = true
 skip_missing_interpreters = true
 
@@ -83,7 +83,10 @@ commands =
       --format requirements.txt \
       --output {envtmpdir}/requirements.txt \
       --without-hashes \
-      --dev
+      --with dev \
+      --extras poetry
     safety check \
       --file {envtmpdir}/requirements.txt \
-      --json
+      --output text \
+      # https://github.com/pytest-dev/py/issues/287
+      --ignore 51457

tox_poetry_installer/__about__.py

@@ -1,7 +1,7 @@
 # pylint: disable=missing-docstring
 __title__ = "tox-poetry-installer"
 __summary__ = "A plugin for Tox that lets you install test environment dependencies from the Poetry lockfile"
-__version__ = "0.10.0"
+__version__ = "0.10.2"
 __url__ = "https://github.com/enpaul/tox-poetry-installer/"
 __license__ = "MIT"
 __authors__ = ["Ethan Paul <24588726+enpaul@users.noreply.github.com>"]

tox_poetry_installer/installer.py

@@ -71,11 +71,20 @@ def install(
             yield lambda func, arg: func(arg)
 
     with _optional_parallelize() as executor:
+        futures = []
         for dependency in packages:
             if dependency not in installed:
                 installed.add(dependency)
                 logger.debug(f"Queuing {dependency}")
-                executor(logged_install, dependency)
+                future = executor(logged_install, dependency)
+                if future is not None:
+                    futures.append(future)
             else:
                 logger.debug(f"Skipping {dependency}, already installed")
         logger.debug("Waiting for installs to finish...")
+
+        for future in concurrent.futures.as_completed(futures):
+            # Don't actually care about the return value, just waiting on the
+            # future to ensure any exceptions that were raised in the called
+            # function are propagated.
+            future.result()