Skip to content

Commit

Permalink
Backported changes from PR#6234
Browse files Browse the repository at this point in the history
  • Loading branch information
Secrus authored and finswimmer committed Aug 25, 2022
1 parent b3dee69 commit a80b483
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
8 changes: 4 additions & 4 deletions docs/dependency-specification.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@ You can also specify that a dependency should be installed only for specific Pyt

```toml
[tool.poetry.dependencies]
pathlib2 = { version = "^2.2", python = "~2.7" }
tomli = { version = "^2.0.1", python = "<3.11" }
```

```toml
[tool.poetry.dependencies]
pathlib2 = { version = "^2.2", python = "~2.7 || ^3.2" }
pathlib2 = { version = "^2.2", python = "^3.2" }
```

## Using environment markers
Expand All @@ -293,7 +293,7 @@ via the `markers` property:

```toml
[tool.poetry.dependencies]
pathlib2 = { version = "^2.2", markers = "python_version ~= '2.7' or sys_platform == 'win32'" }
pathlib2 = { version = "^2.2", markers = "python_version <= '3.4' or sys_platform == 'win32'" }
```

## Multiple constraints dependencies
Expand All @@ -308,7 +308,7 @@ you would declare it like so:
```toml
[tool.poetry.dependencies]
foo = [
{version = "<=1.9", python = "^2.7"},
{version = "<=1.9", python = "^3.6"},
{version = "^2.0", python = "^3.8"}
]
```
Expand Down
5 changes: 4 additions & 1 deletion docs/managing-environments.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ poetry install
```
{{% /note %}}

{{% note %}}
Since version 1.2, Poetry no longer supports managing environments for Python 2.7.
{{% /note %}}

## Switching between environments

Sometimes this might not be feasible for your system, especially Windows where `pyenv`
Expand Down Expand Up @@ -114,7 +118,6 @@ poetry env list
will output something like the following:

```text
test-O3eWbxRl-py2.7
test-O3eWbxRl-py3.6
test-O3eWbxRl-py3.7 (Activated)
```
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ version = "1.0.0"

# ...
[tool.poetry.dependencies]
python = "~2.7 || ^3.7"
python = "^3.7"
poetry = "^1.0"

[tool.poetry.plugins."poetry.plugin"]
Expand Down
2 changes: 1 addition & 1 deletion docs/pyproject.md
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ mandatory = "^1.0"

# A list of all of the optional dependencies, some of which are included in the
# below `extras`. They can be opted into by apps.
psycopg2 = { version = "^2.7", optional = true }
psycopg2 = { version = "^2.9", optional = true }
mysqlclient = { version = "^1.3", optional = true }

[tool.poetry.extras]
Expand Down

0 comments on commit a80b483

Please sign in to comment.