Skip to content

Commit 53868af

Browse files
authored
Merge pull request #2648 from python-poetry/release-1.1.0a3
Release 1.1.0a3
2 parents c7055be + a50d87d commit 53868af

File tree

7 files changed

+77
-56
lines changed

7 files changed

+77
-56
lines changed

Diff for: .github/workflows/release.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ jobs:
5757
curl -L https://github.com/sdispater/python-binaries/releases/download/3.5.9/python-3.5.9.macos.tar.xz -o python-3.5.9.tar.xz
5858
curl -L https://github.com/sdispater/python-binaries/releases/download/3.6.8/python-3.6.8.macos.tar.xz -o python-3.6.8.tar.xz
5959
curl -L https://github.com/sdispater/python-binaries/releases/download/3.7.6/python-3.7.6.macos.tar.xz -o python-3.7.6.tar.xz
60-
curl -L https://github.com/sdispater/python-binaries/releases/download/3.8.2/python-3.8.2.macos.tar.xz -o python-3.8.2.tar.xz
60+
curl -L https://github.com/sdispater/python-binaries/releases/download/3.8.3/python-3.8.3.macos.tar.xz -o python-3.8.3.tar.xz
61+
curl -L https://github.com/sdispater/python-binaries/releases/download/3.9.0b4/python-3.9.0b4.macos.tar.xz -o python-3.9.0b4.tar.xz
6162
tar -zxf python-2.7.17.tar.xz
6263
tar -zxf python-3.5.9.tar.xz
6364
tar -zxf python-3.6.8.tar.xz
6465
tar -zxf python-3.7.6.tar.xz
65-
tar -zxf python-3.8.2.tar.xz
66+
tar -zxf python-3.8.3.tar.xz
67+
tar -zxf python-3.9.0b4.tar.xz
6668
- name: Build specific release
6769
run: |
6870
source $HOME/.poetry/env
69-
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17/bin/python" -P "3.5:python-3.5.9/bin/python" -P "3.6:python-3.6.8/bin/python" -P "3.7:python-3.7.6/bin/python" -P "3.8:python-3.8.2/bin/python"
71+
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17/bin/python" -P "3.5:python-3.5.9/bin/python" -P "3.6:python-3.6.8/bin/python" -P "3.7:python-3.7.6/bin/python" -P "3.8:python-3.8.3/bin/python" -P "3.9:python-3.9.0b4/bin/python"
7072
- name: Upload release file
7173
uses: actions/upload-artifact@v1
7274
with:
@@ -106,22 +108,25 @@ jobs:
106108
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.5.4/python-3.5.4.windows.tar.xz -O python-3.5.4.tar.xz
107109
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.6.8/python-3.6.8.windows.tar.xz -O python-3.6.8.tar.xz
108110
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.7.6/python-3.7.6.windows.tar.xz -O python-3.7.6.tar.xz
109-
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.8.2/python-3.8.2.windows.tar.xz -O python-3.8.2.tar.xz
111+
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.8.3/python-3.8.3.windows.tar.xz -O python-3.8.3.tar.xz
112+
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.9.0b4/python-3.9.0b4.windows.tar.xz -O python-3.9.0b4.tar.xz
110113
7z x python-2.7.17.tar.xz
111114
7z x python-3.5.4.tar.xz
112115
7z x python-3.6.8.tar.xz
113116
7z x python-3.7.6.tar.xz
114-
7z x python-3.8.2.tar.xz
117+
7z x python-3.8.3.tar.xz
118+
7z x python-3.9.0b4.tar.xz
115119
7z x python-2.7.17.tar
116120
7z x python-3.4.4.tar
117121
7z x python-3.5.4.tar
118122
7z x python-3.6.8.tar
119123
7z x python-3.7.6.tar
120-
7z x python-3.8.2.tar
124+
7z x python-3.8.3.tar
125+
7z x python-3.9.0b4.tar
121126
- name: Build specific release
122127
run: |
123128
$env:Path += ";$env:Userprofile\.poetry\bin"
124-
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17\python.exe" -P "3.5:python-3.5.4\python.exe" -P "3.6:python-3.6.8\python.exe" -P "3.7:python-3.7.6\python.exe" -P "3.8:python-3.8.2\python.exe"
129+
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17\python.exe" -P "3.5:python-3.5.4\python.exe" -P "3.6:python-3.6.8\python.exe" -P "3.7:python-3.7.6\python.exe" -P "3.8:python-3.8.3\python.exe" -P "3.9:python-3.9.0b4\python.exe"
125130
- name: Upload release file
126131
uses: actions/upload-artifact@v1
127132
with:

Diff for: CHANGELOG.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Change Log
22

3+
## [1.1.0a3] - 2020-07-10
4+
5+
### Added
6+
7+
- New installer which provides a faster and better experience ([#2595](https://github.com/python-poetry/poetry/pull/2595)).
8+
9+
### Fixed
10+
11+
- Fixed resolution error when handling duplicate dependencies with environment markers ([#2622](https://github.com/python-poetry/poetry/pull/2622)).
12+
- Fixed erroneous resolution errors when resolving packages to install ([#2625](https://github.com/python-poetry/poetry/pull/2625)).
13+
- Fixed errors when detecting installed editable packages ([#2602](https://github.com/python-poetry/poetry/pull/2602)).
14+
15+
316
## [1.1.0a2] - 2020-06-26
417

518
Note that lock files generated with this release are not compatible with previous releases of Poetry.
@@ -904,7 +917,8 @@ Initial release
904917

905918

906919

907-
[Unreleased]: https://github.com/python-poetry/poetry/compare/1.1.0a2...develop
920+
[Unreleased]: https://github.com/python-poetry/poetry/compare/1.1.0a3...develop
921+
[1.1.0a3]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a3
908922
[1.1.0a2]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a2
909923
[1.1.0a1]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a1
910924
[1.0.9]: https://github.com/python-poetry/poetry/releases/tag/1.0.9

Diff for: make-nix-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
test -n "$PYTHON" || PYTHON="python3"
6-
$PYTHON get-poetry.py -y
6+
$PYTHON get-poetry.py -y --preview
77
$PYTHON $HOME/.poetry/bin/poetry config virtualenvs.create false
88
$PYTHON $HOME/.poetry/bin/poetry install --no-dev
99
$PYTHON $HOME/.poetry/bin/poetry run python sonnet make release \

Diff for: poetry.lock

+45-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: poetry/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.1.0a2"
1+
__version__ = "1.1.0a3"

Diff for: pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "poetry"
3-
version = "1.1.0a2"
3+
version = "1.1.0a3"
44
description = "Python dependency management and packaging made easy."
55
authors = [
66
"Sébastien Eustace <[email protected]>"

Diff for: sonnet

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ class MakeReleaseCommand(Command):
110110
).stdout
111111
)
112112
env = VirtualEnv(Path(prefix.strip()), base=Path(prefix.strip()))
113-
with package.with_python_versions("~{}".format(version)):
114-
solver = Solver(package, pool, Repository(), Repository(), self.io)
113+
solver = Solver(package, pool, Repository(), Repository(), self.io)
114+
with solver.use_environment(env):
115115
ops = solver.solve()
116116
for op in ops:
117117
if not env.is_valid_for_marker(op.package.marker):

0 commit comments

Comments
 (0)