Skip to content

Commit 037c5a5

Browse files
sdispatersdispater
authored
Merge pull request #2696 from python-poetry/release-1.0.10
Release 1.0.10
2 parents cd72aed + d3c9049 commit 037c5a5

File tree

8 files changed

+233
-167
lines changed

8 files changed

+233
-167
lines changed

‎.github/workflows/release.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
4242
- name: Set up Python 3.8
43-
uses: actions/setup-python@v1
43+
uses: actions/setup-python@v2
4444
with:
4545
python-version: "3.8"
4646
- name: Install Poetry
@@ -58,17 +58,19 @@ jobs:
5858
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
5959
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
6060
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
61-
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
61+
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
62+
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
6263
tar -zxf python-2.7.17.tar.xz
6364
tar -zxf python-3.4.10.tar.xz
6465
tar -zxf python-3.5.9.tar.xz
6566
tar -zxf python-3.6.8.tar.xz
6667
tar -zxf python-3.7.6.tar.xz
67-
tar -zxf python-3.8.2.tar.xz
68+
tar -zxf python-3.8.3.tar.xz
69+
tar -zxf python-3.9.0b4.tar.xz
6870
- name: Build specific release
6971
run: |
7072
source $HOME/.poetry/env
71-
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17/bin/python" -P "3.4:python-3.4.10/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"
73+
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17/bin/python" -P "3.4:python-3.4.10/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"
7274
- name: Upload release file
7375
uses: actions/upload-artifact@v1
7476
with:
@@ -91,7 +93,7 @@ jobs:
9193
run: |
9294
echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
9395
- name: Set up Python 3.8
94-
uses: actions/setup-python@v1
96+
uses: actions/setup-python@v2
9597
with:
9698
python-version: "3.8"
9799
- name: Install Poetry
@@ -109,23 +111,26 @@ jobs:
109111
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
110112
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
111113
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
112-
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
114+
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
115+
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
113116
7z x python-2.7.17.tar.xz
114117
7z x python-3.4.4.tar.xz
115118
7z x python-3.5.4.tar.xz
116119
7z x python-3.6.8.tar.xz
117120
7z x python-3.7.6.tar.xz
118-
7z x python-3.8.2.tar.xz
121+
7z x python-3.8.3.tar.xz
122+
7z x python-3.9.0b4.tar.xz
119123
7z x python-2.7.17.tar
120124
7z x python-3.4.4.tar
121125
7z x python-3.5.4.tar
122126
7z x python-3.6.8.tar
123127
7z x python-3.7.6.tar
124-
7z x python-3.8.2.tar
128+
7z x python-3.8.3.tar
129+
7z x python-3.9.0b4.tar
125130
- name: Build specific release
126131
run: |
127132
$env:Path += ";$env:Userprofile\.poetry\bin"
128-
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17\python.exe" -P "3.4:python-3.4.4\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"
133+
poetry run python sonnet make release --ansi -P "2.7:python-2.7.17\python.exe" -P "3.4:python-3.4.4\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"
129134
- name: Upload release file
130135
uses: actions/upload-artifact@v1
131136
with:
@@ -242,6 +247,10 @@ jobs:
242247
asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
243248
asset_name: poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
244249
asset_content_type: text/plain
250+
- name: Set up Python 3.8
251+
uses: actions/setup-python@v2
252+
with:
253+
python-version: "3.8"
245254
- name: Install Poetry
246255
run: |
247256
python get-poetry.py --preview -y

‎CHANGELOG.md

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

3+
## [1.0.10] - 2020-07-21
4+
5+
### Changed
6+
7+
- The lock files are now versioned to ease transitions for lock file format changes, with warnings being displayed on incompatibility detection ([#2695](https://github.com/python-poetry/poetry/pull/2695)).
8+
- The `init` and `new` commands will now provide hints on invalid given licenses ([#1634](https://github.com/python-poetry/poetry/pull/1634)).
9+
10+
### Fixed
11+
12+
- Fixed error messages when the authors specified in the `pyproject.toml` file are invalid ([#2525](https://github.com/python-poetry/poetry/pull/2525)).
13+
- Fixed empty `.venv` directories being deleted ([#2064](https://github.com/python-poetry/poetry/pull/2064)).
14+
- Fixed the `shell` command for `tcsh` shells ([#2583](https://github.com/python-poetry/poetry/pull/2583)).
15+
- Fixed errors when installing directory or file dependencies in some cases ([#2582](https://github.com/python-poetry/poetry/pull/2582)).
16+
17+
318
## [1.0.9] - 2020-06-09
419

520
### Fixed
@@ -868,7 +883,8 @@ Initial release
868883

869884

870885

871-
[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.9...master
886+
[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.10...master
887+
[1.0.10]: https://github.com/python-poetry/poetry/releases/tag/1.0.10
872888
[1.0.9]: https://github.com/python-poetry/poetry/releases/tag/1.0.9
873889
[1.0.8]: https://github.com/python-poetry/poetry/releases/tag/1.0.8
874890
[1.0.7]: https://github.com/python-poetry/poetry/releases/tag/1.0.7

‎Makefile

+9-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,15 @@ wheel:
4848

4949
linux_release:
5050
docker pull quay.io/pypa/manylinux2010_x86_64
51-
docker run --rm -i -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/make-linux-release.sh
51+
docker run --rm -i -v `pwd`:/io \
52+
-e PYTHON=/opt/python/cp38-cp38/bin/python \
53+
-e PYTHON27=/opt/python/cp27-cp27m/bin/python \
54+
-e PYTHON35=/opt/python/cp35-cp35m/bin/python \
55+
-e PYTHON36=/opt/python/cp36-cp36m/bin/python \
56+
-e PYTHON37=/opt/python/cp37-cp37m/bin/python \
57+
-e PYTHON38=/opt/python/cp38-cp38/bin/python \
58+
-e PYTHON39=/opt/python/cp39-cp39/bin/python \
59+
quay.io/pypa/manylinux2010_x86_64 sh -c "cd /io && ./make-linux-release.sh"
5260

5361
# run tests against all supported python versions
5462
tox:

‎make-linux-release.sh

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
#!/bin/bash
2-
PYTHON_VERSIONS="cp27-cp27m cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38"
1+
#!/bin/sh
32

4-
cd /io
5-
/opt/python/cp37-cp37m/bin/pip install pip -U
6-
/opt/python/cp37-cp37m/bin/pip install poetry -U --pre
7-
/opt/python/cp37-cp37m/bin/poetry config virtualenvs.create false
8-
/opt/python/cp37-cp37m/bin/poetry install --no-dev
9-
/opt/python/cp37-cp37m/bin/python sonnet make release --ansi \
10-
-P "2.7:/opt/python/cp27-cp27m/bin/python" \
11-
-P "3.5:/opt/python/cp35-cp35m/bin/python" \
12-
-P "3.6:/opt/python/cp36-cp36m/bin/python" \
13-
-P "3.7:/opt/python/cp37-cp37m/bin/python" \
14-
-P "3.8:/opt/python/cp38-cp38/bin/python"
15-
cd -
3+
set -e
4+
5+
test -n "$PYTHON" || PYTHON="python3"
6+
$PYTHON get-poetry.py -y
7+
$PYTHON $HOME/.poetry/bin/poetry config virtualenvs.create false
8+
$PYTHON $HOME/.poetry/bin/poetry install --no-dev
9+
$PYTHON $HOME/.poetry/bin/poetry run python sonnet make release \
10+
${PYTHON27:+-P "2.7:$PYTHON27"} \
11+
${PYTHON35:+-P "3.5:$PYTHON35"} \
12+
${PYTHON36:+-P "3.6:$PYTHON36"} \
13+
${PYTHON37:+-P "3.7:$PYTHON37"} \
14+
${PYTHON38:+-P "3.8:$PYTHON38"} \
15+
${PYTHON39:+-P "3.9:$PYTHON39"}

0 commit comments

Comments
 (0)