Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #2209

Merged
merged 50 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5c30345
Fix Github actions cache issues (#1908)
sdispater Jan 17, 2020
3a2739e
Fix case of `-f` flag
brandonaut Jan 18, 2020
3d61e2a
Make it clearer what options to pass to `--format`
brandonaut Jan 18, 2020
22f06e5
Merge pull request #1914 from brandonaut/fix-build-doc
finswimmer Jan 18, 2020
a0c9357
fix (masonry.api): `get_requires_for_build_wheel` must return additio…
finswimmer Jan 20, 2020
380e09b
Lazy Keyring intialization for PasswordManager (#1892)
k4nar Jan 20, 2020
954d160
Fix Github Actions cache issues (#1928)
sdispater Jan 21, 2020
2df0d2c
Avoid nested quantifiers with overlapping character space on git url …
finswimmer Jan 22, 2020
930515b
fix: correct parsing of wheel version with regex. (#1932)
edwardgeorge Jan 22, 2020
4897a70
Fix errors when using the --help option (#1910)
sdispater Jan 31, 2020
4687ef8
Fix how repository credentials are retrieved from env vars (#1909)
sdispater Jan 31, 2020
d331535
Fix downloading packages from Simplepypi (#1851)
leftys Jan 31, 2020
7974d0f
Upgrade dependencies for the 1.0.3 release (#1965)
sdispater Jan 31, 2020
ed44342
Bump version to 1.0.3 (#1966)
sdispater Jan 31, 2020
7348893
Fix non-compliant Git URL matching
amarshall Feb 11, 2020
7d5934e
Merge pull request #2018 from amarshall/fix-git-url-pattern
finswimmer Feb 11, 2020
8fa1915
Update README.md "Updating Poetry"
afs2015 Feb 14, 2020
b3b07cb
Merge pull request #2040 from afs2015/patch-1
finswimmer Feb 15, 2020
03db001
init: change dev dependency prompt
and800 Oct 30, 2019
12db4a5
Merge pull request #1519 from and800/master
finswimmer Feb 17, 2020
960dc06
Fix CI issues (#2069)
sdispater Feb 21, 2020
d0a8aed
fix (setup_reader): check if `func.value` has attr `id` (#2041)
finswimmer Feb 21, 2020
8bbf311
fix(git): get commit sha of git commit from annotated tags (#1948)
jrmlhermitte Feb 21, 2020
46a1103
fix: use correct badge on README (#2065)
MichaelAquilina Feb 21, 2020
04a1544
Fix #1791: Load repository URL from config (#2061)
thejcannon Feb 21, 2020
44c60c4
Changed schema to support url in multi dependencies (#2035)
Feb 21, 2020
96191ca
Fix handling of forward slashes and url encoding in credentials (#1911)
lubert Feb 21, 2020
085d5a6
Bump actions/checkout from v1 to v2 (#2075)
Feb 28, 2020
15728ee
Fix vendor package as installed package (#1883) (#1981)
trim21 Feb 28, 2020
9306cd2
fix(utils.env): import cli_run from virtualenv (#2096)
finswimmer Feb 28, 2020
607e70f
list .venv when it exists (#1762)
Feb 28, 2020
90af3a4
fix: exclude subpackage from `setup.py` if `__init__.py` is excluded …
finswimmer Feb 28, 2020
ab66bb9
get_vcs starts searching git folder from tmp dir instead of project (…
finswimmer Feb 28, 2020
ae6d64d
Normalize author name unicode before matching (#2006)
raphaelyancey Feb 28, 2020
c9fb348
Fix the url used for installation when fallbacking on PyPI (#2099)
sdispater Feb 28, 2020
e202151
Upgrade dependencies before the 1.0.4 release (#2100)
sdispater Feb 28, 2020
7484957
Upgrade dependencies before the 1.0.4 release (#2103)
sdispater Feb 28, 2020
eb8413e
Release 1.0.4 (#2101)
sdispater Feb 28, 2020
bb9582c
Fix release script (#2104)
sdispater Feb 28, 2020
d2fed3d
Fix VCS when git is not in PATH
adisbladis Feb 28, 2020
ae96feb
Merge pull request #2105 from adisbladis/vcs-git-path
finswimmer Feb 29, 2020
ba48eb4
Upgrade dependencies before the 1.0.5 release (#2111)
sdispater Feb 29, 2020
754dbf8
Bump version to 1.0.5 (#2112)
sdispater Feb 29, 2020
d9a1e84
Fix GitHub URL for black
dmerejkowsky Mar 5, 2020
bf7c920
Update Contributing.md* Fix markdown formatting* Update link to offic…
jules-ch Mar 5, 2020
d2ee7f9
Merge pull request #2132 from jules-ch/contributing-docs-fix
finswimmer Mar 6, 2020
b459569
Merge pull request #2129 from dmerejkowsky/fix-black-github-url
finswimmer Mar 6, 2020
bf07cef
Update managing-environments.md
alexpovel Mar 10, 2020
d27a119
Merge pull request #2164 from alexpovel/patch-1
finswimmer Mar 10, 2020
b0ee465
Merge branch 'master' into merge-master-into-develop
sdispater Mar 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
Expand All @@ -25,7 +25,7 @@ jobs:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Get tag
id: tag
run: |
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Get tag
id: tag
run: |
Expand All @@ -57,18 +57,18 @@ jobs:
curl -L https://github.com/sdispater/python-binaries/releases/download/3.4.10/python-3.4.10.macos.tar.xz -o python-3.4.10.tar.xz
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
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
curl -L https://github.com/sdispater/python-binaries/releases/download/3.7.5/python-3.7.5.macos.tar.xz -o python-3.7.5.tar.xz
curl -L https://github.com/sdispater/python-binaries/releases/download/3.8.0/python-3.8.0.macos.tar.xz -o python-3.8.0.tar.xz
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
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
tar -zxf python-2.7.17.tar.xz
tar -zxf python-3.4.10.tar.xz
tar -zxf python-3.5.9.tar.xz
tar -zxf python-3.6.8.tar.xz
tar -zxf python-3.7.5.tar.xz
tar -zxf python-3.8.0.tar.xz
tar -zxf python-3.7.6.tar.xz
tar -zxf python-3.8.2.tar.xz
- name: Build specific release
run: |
source $HOME/.poetry/env
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.5/bin/python" -P "3.8:python-3.8.0/bin/python"
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"
- name: Upload release file
uses: actions/upload-artifact@v1
with:
Expand All @@ -84,7 +84,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Get tag
id: tag
shell: bash
Expand All @@ -108,24 +108,24 @@ jobs:
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.4.4/python-3.4.4.windows.tar.xz -O python-3.4.4.tar.xz
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
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
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.7.5/python-3.7.5.windows.tar.xz -O python-3.7.5.tar.xz
Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/3.8.0/python-3.8.0.windows.tar.xz -O python-3.8.0.tar.xz
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
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
7z x python-2.7.17.tar.xz
7z x python-3.4.4.tar.xz
7z x python-3.5.4.tar.xz
7z x python-3.6.8.tar.xz
7z x python-3.7.5.tar.xz
7z x python-3.8.0.tar.xz
7z x python-3.7.6.tar.xz
7z x python-3.8.2.tar.xz
7z x python-2.7.17.tar
7z x python-3.4.4.tar
7z x python-3.5.4.tar
7z x python-3.6.8.tar
7z x python-3.7.5.tar
7z x python-3.8.0.tar
7z x python-3.7.6.tar
7z x python-3.8.2.tar
- name: Build specific release
run: |
$env:Path += ";$env:Userprofile\.poetry\bin"
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.5\python.exe" -P "3.8:python-3.8.0\python.exe"
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"
- name: Upload release file
uses: actions/upload-artifact@v1
with:
Expand All @@ -143,7 +143,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Get tag
id: tag
run: |
Expand Down
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# Change Log

## [1.0.5] - 2020-02-29

### Fixed

- Fixed an error when building distributions if the `git` executable was not found ([#2105](https://github.com/python-poetry/poetry/pull/2105)).
- Fixed various errors when reading Poetry's TOML files by upgrading [tomlkit](https://github.com/sdispater/tomlkit).


## [1.0.4] - 2020-02-28

### Fixed

- Fixed the PyPI URL used when installing packages ([#2099](https://github.com/python-poetry/poetry/pull/2099)).
- Fixed errors when the author's name contains special characters ([#2006](https://github.com/python-poetry/poetry/pull/2006)).
- Fixed VCS excluded files detection when building wheels ([#1947](https://github.com/python-poetry/poetry/pull/1947)).
- Fixed packages detection when building sdists ([#1626](https://github.com/python-poetry/poetry/pull/1626)).
- Fixed the local `.venv` virtual environment not being displayed in `env list` ([#1762](https://github.com/python-poetry/poetry/pull/1762)).
- Fixed incompatibilities with the most recent versions of `virtualenv` ([#2096](https://github.com/python-poetry/poetry/pull/2096)).
- Fixed Poetry's own vendor dependencies being retrieved when updating dependencies ([#1981](https://github.com/python-poetry/poetry/pull/1981)).
- Fixed encoding of credentials in URLs ([#1911](https://github.com/python-poetry/poetry/pull/1911)).
- Fixed url constraints not being accepted in multi-constraints dependencies ([#2035](https://github.com/python-poetry/poetry/pull/2035)).
- Fixed an error where credentials specified via environment variables were not retrieved ([#2061](https://github.com/python-poetry/poetry/pull/2061)).
- Fixed an error where git dependencies referencing tags were not locked to the corresponding commit ([#1948](https://github.com/python-poetry/poetry/pull/1948)).
- Fixed an error when parsing packages `setup.py` files ([#2041](https://github.com/python-poetry/poetry/pull/2041)).
- Fixed an error when parsing some git URLs ([#2018](https://github.com/python-poetry/poetry/pull/2018)).


## [1.0.3] - 2020-01-31

### Fixed
Expand Down Expand Up @@ -796,7 +823,9 @@ Initial release



[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.3...master
[Unreleased]: https://github.com/python-poetry/poetry/compare/1.0.5...master
[1.0.5]: https://github.com/python-poetry/poetry/releases/tag/1.0.5
[1.0.4]: https://github.com/python-poetry/poetry/releases/tag/1.0.4
[1.0.3]: https://github.com/python-poetry/poetry/releases/tag/1.0.3
[1.0.2]: https://github.com/python-poetry/poetry/releases/tag/1.0.2
[1.0.1]: https://github.com/python-poetry/poetry/releases/tag/1.0.1
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r

#### Before submitting a bug report

* **Check the [FAQs on the official website](https://python-poetry.org)** for a list of common questions and problems.
* **Check the [FAQs on the official website](https://python-poetry.org/docs/faq)** for a list of common questions and problems.
* **Check that your issue does not already exist in the [issue tracker](https://github.com/python-poetry/poetry/issues)**.

#### How do I submit a bug report?
Expand Down Expand Up @@ -64,8 +64,8 @@ Before creating enhancement suggestions, please check [this list](#before-submit

#### Before submitting an enhancement suggestion

* **Check the [FAQs on the official website](https://python-poetry.org) for a list of common questions and problems.
* **Check that your issue does not already exist in the [issue tracker](https://github.com/python-poetry/poetry/issues).
* **Check the [FAQs on the official website](https://python-poetry.org/docs/faq)** for a list of common questions and problems.
* **Check that your issue does not already exist in the [issue tracker](https://github.com/python-poetry/poetry/issues)**.


#### How do I submit an Enhancement suggestion?
Expand Down Expand Up @@ -99,7 +99,7 @@ $ poetry install
$ poetry run pytest tests/
```

Poetry uses the [black](https://github.com/ambv/black) coding style and you must ensure that your
Poetry uses the [black](https://github.com/psf/black) coding style and you must ensure that your
code follows it. If not, the CI will fail and your Pull Request will not be merged.

Similarly, the import statements are sorted with [isort](https://github.com/timothycrosley/isort)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ensuring you have the right stack everywhere.

It supports Python 2.7 and 3.4+.

![Tests Status](https://github.com/python-poetry/poetry/workflows/Tests/badge.svg)
[![Tests Status](https://github.com/python-poetry/poetry/workflows/Tests/badge.svg?branch=master&event=push)](https://github.com/python-poetry/poetry/actions?query=workflow%3ATests+branch%3Amaster+event%3Apush)

The [complete documentation](https://python-poetry.org/docs/) is available on the [official website](https://python-poetry.org).

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/managing-environments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Managing environments

Poetry makes project environment isolation one of its core feature.
Poetry makes project environment isolation one of its core features.

What this means is that it will always work isolated from your global Python installation.
To achieve this, it will first check if it's currently running inside a virtual environment.
Expand Down
3 changes: 1 addition & 2 deletions make-linux-release.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
PYTHON_VERSIONS="cp27-cp27m cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38"
PYTHON_VERSIONS="cp27-cp27m cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38"

cd /io
/opt/python/cp37-cp37m/bin/pip install pip -U
Expand All @@ -8,7 +8,6 @@ cd /io
/opt/python/cp37-cp37m/bin/poetry install --no-dev
/opt/python/cp37-cp37m/bin/python sonnet make release --ansi \
-P "2.7:/opt/python/cp27-cp27m/bin/python" \
-P "3.4:/opt/python/cp34-cp34m/bin/python" \
-P "3.5:/opt/python/cp35-cp35m/bin/python" \
-P "3.6:/opt/python/cp36-cp36m/bin/python" \
-P "3.7:/opt/python/cp37-cp37m/bin/python" \
Expand Down
Loading