Merge branch 'master' into merge-master-into-develop

# Conflicts: # .github/workflows/main.yml # .github/workflows/release.yml # .pre-commit-config.yaml # CHANGELOG.md # CONTRIBUTING.md # docs/docs/cli.md # get-poetry.py # make-linux-release.sh # poetry.lock # poetry/__version__.py # poetry/console/commands/export.py # poetry/console/commands/self/update.py # poetry/installation/pip_installer.py # poetry/masonry/api.py # poetry/masonry/builders/builder.py # poetry/masonry/builders/sdist.py # poetry/masonry/utils/package_include.py # poetry/masonry/utils/tags.py # poetry/packages/__init__.py # poetry/packages/directory_dependency.py # poetry/packages/file_dependency.py # poetry/packages/package.py # poetry/packages/url_dependency.py # poetry/packages/utils/utils.py # poetry/packages/vcs_dependency.py # poetry/puzzle/provider.py # poetry/repositories/installed_repository.py # poetry/repositories/legacy_repository.py # poetry/repositories/pypi_repository.py # poetry/semver/__init__.py # poetry/semver/patterns.py # poetry/utils/env.py # poetry/utils/helpers.py # poetry/utils/inspector.py # poetry/vcs/__init__.py # poetry/vcs/git.py # pyproject.toml # tests/conftest.py # tests/installation/fixtures/with-directory-dependency-poetry-transitive.test # tests/json/test_poetry_schema.py # tests/masonry/builders/test_sdist.py # tests/masonry/builders/test_wheel.py # tests/masonry/test_api.py # tests/masonry/utils/test_package_include.py # tests/packages/test_main.py # tests/packages/test_package.py # tests/puzzle/test_solver.py # tests/repositories/fixtures/installed/vendor/py3.7/attrs-19.3.0.dist-info/METADATA # tests/repositories/test_installed_repository.py # tests/repositories/test_legacy_repository.py # tests/vcs/test_git.py
python-poetry · Jun 5, 2020 · a5d6333 · a5d6333
2 parents 8d8822e + 6ea3849
commit a5d6333
Show file tree

Hide file tree

Showing 95 changed files with 1,423 additions and 266 deletions.
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -2,7 +2,7 @@
 name: "\U0001F41E Bug Report"
 about: Did you find a bug?
 title: ''
-labels: 'Bug'
+labels: Bug, Triage
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/---documentation.md b/.github/ISSUE_TEMPLATE/---documentation.md
@@ -2,7 +2,7 @@
 name: "\U0001F4DA Documentation"
 about: Did you find errors, problems, or anything unintelligible in the docs (https://python-poetry.org/docs)?
 title: ''
-labels: 'Documentation'
+labels: Documentation, Triage
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -2,7 +2,7 @@
 name: "\U0001F381 Feature Request"
 about: Do you have ideas for new features and improvements?
 title: ''
-labels: 'Feature'
+labels: Feature, Triage
 assignees: ''
 
 ---

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+# Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
+blank_issues_enabled: true
+contact_links:
+- name: '💬 Discord Server'
+  url: https://discordapp.com/invite/awxPgve
+  about: |
+    Chat with the community, ask questions and learn about best practices.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,13 @@
 # Pull Request Check List
 
-This is just a reminder about the most common mistakes. Please make sure that you tick all *appropriate* boxes.  But please read our [contribution guide](https://python-poetry.org/docs/contributing/) at least once, it will save you unnecessary review cycles!
+Resolves: #issue-number-here
+
+<!-- This is just a reminder about the most common mistakes. Please make sure that you tick all *appropriate* boxes.  But please read our [contribution guide](https://python-poetry.org/docs/contributing/) at least once, it will save you unnecessary review cycles! -->
 
 - [ ] Added **tests** for changed code.
 - [ ] Updated **documentation** for changed code.
 
-**Note**: If your Pull Request introduces a new feature or changes the current behavior, it should be based
-on the `develop` branch. If it's a bug fix or only a documentation update, it should be based on the `master` branch.
+<!-- **Note**: If your Pull Request introduces a new feature or changes the current behavior, it should be based
+on the `develop` branch. If it's a bug fix or only a documentation update, it should be based on the `master` branch. -->
 
-If you have *any* questions to *any* of the points above, just **submit and ask**!  This checklist is here to *help* you, not to deter you from contributing!
+<!-- If you have *any* questions to *any* of the points above, just **submit and ask**!  This checklist is here to *help* you, not to deter you from contributing! -->
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Get full python version
+      - name: Get full Python version
         id: full-python-version
         shell: bash
         run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
@@ -50,7 +50,7 @@ jobs:
         run: poetry config virtualenvs.in-project true
 
       - name: Set up cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         id: cache
         with:
           path: .venv

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -148,32 +148,32 @@ jobs:
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz
+          path: releases/
       - name: Download Linux checksum file
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum
+          path: releases/
       - name: Download MacOS release file
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz
+          path: releases/
       - name: Download MacOS checksum file
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum
+          path: releases/
       - name: Download Windows release file
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz
+          path: releases/
       - name: Download Windows checksum file
         uses: actions/download-artifact@master
         with:
           name: poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
-          path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
+          path: releases/
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -190,7 +190,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz/poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz
           asset_name: poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz
           asset_content_type: application/gzip
       - name: Upload Linux checksum file asset
@@ -199,16 +199,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum/poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum
           asset_name: poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum
-          asset_content_type: text/pain
+          asset_content_type: text/plain
       - name: Upload MacOS release file asset
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz/poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz
           asset_name: poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz
           asset_content_type: application/gzip
       - name: Upload MacOS checksum file asset
@@ -217,16 +217,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum/poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum
           asset_name: poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum
-          asset_content_type: text/pain
+          asset_content_type: text/plain
       - name: Upload Windows release file asset
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz/poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz
           asset_name: poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz
           asset_content_type: application/gzip
       - name: Upload Windows checksum file asset
@@ -235,9 +235,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
+          asset_path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
           asset_name: poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum
-          asset_content_type: text/pain
+          asset_content_type: text/plain
       - name: Install Poetry
         run: |
           python get-poetry.py --preview -y

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 *.egg
 !/tests/**/*.egg
 /*.egg-info
-/tests/fixtures/**/*.egg-info
 /dist/*
 build
 _build

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: flake8
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 4.3.21
+    rev: 4.3.21-2
     hooks:
       - id: isort
         additional_dependencies: [toml]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,34 @@ This release **must** be downloaded via the `get-poetry.py` script and not via t
 - The exceptions are now beautifully displayed in the terminal with various level of details depending on the verbosity ([2230](https://github.com/python-poetry/poetry/pull/2230)).
 
 
+## [1.0.7] - 2020-06-05
+
+### Fixed
+
+- Fixed an error when trying to execute some packages `setup.py` file ([#2349](https://github.com/python-poetry/poetry/pull/2349)).
+
+
+## [1.0.6] - 2020-06-05
+
+### Changed
+
+- The `self update` command has been updated in order to handle future releases of Poetry ([#2429](https://github.com/python-poetry/poetry/pull/2429)).
+
+### Fixed
+
+- Fixed an error were a new line was not written when displaying the virtual environment's path with `env info` ([#2196](https://github.com/python-poetry/poetry/pull/2196)).
+- Fixed a misleading error message when the `packages` property was empty ([#2265](https://github.com/python-poetry/poetry/pull/2265)).
+- Fixed shell detection by using environment variables ([#2147](https://github.com/python-poetry/poetry/pull/2147)).
+- Fixed the removal of VCS dependencies ([#2239](https://github.com/python-poetry/poetry/pull/2239)).
+- Fixed generated wheel ABI tags for Python 3.8 ([#2121](https://github.com/python-poetry/poetry/pull/2121)).
+- Fixed a regression when building stub-only packages ([#2000](https://github.com/python-poetry/poetry/pull/2000)).
+- Fixed errors when parsing PEP-440 constraints with whitespace ([#2347](https://github.com/python-poetry/poetry/pull/2347)).
+- Fixed PEP 508 representation of VCS dependencies ([#2349](https://github.com/python-poetry/poetry/pull/2349)).
+- Fixed errors when source distributions were read-only ([#1140](https://github.com/python-poetry/poetry/pull/1140)).
+- Fixed dependency resolution errors and inconsistencies with directory, file and VCS dependencies ([#2398](https://github.com/python-poetry/poetry/pull/2398)).
+- Fixed custom repositories information not being properly locked ([#2484](https://github.com/python-poetry/poetry/pull/2484)).
+
+
 ## [1.0.5] - 2020-02-29
 
 ### Fixed
@@ -840,6 +868,8 @@ Initial release
 
 [Unreleased]: https://github.com/python-poetry/poetry/compare/1.1.0a1...develop
 [1.1.0a1]: https://github.com/python-poetry/poetry/releases/tag/1.1.0a1
+[1.0.7]: https://github.com/python-poetry/poetry/releases/tag/1.0.7
+[1.0.6]: https://github.com/python-poetry/poetry/releases/tag/1.0.6
 [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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ The following is a set of guidelines for contributing to Poetry on GitHub. These
 This section guides you through submitting a bug report for Poetry.
 Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
 
-Before creating bug reports, please check [this list](#before-submitting-a-bug-report) to be sure that you need to create one. When you are creating a bug report, please include as many details as possible. Fill out the [required template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/1_Bug_report.md), the information it asks helps the maintainers resolve the issue faster.
+Before creating bug reports, please check [this list](#before-submitting-a-bug-report) to be sure that you need to create one. When you are creating a bug report, please include as many details as possible. Fill out the [required template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/---bug-report.md), the information it asks helps the maintainers resolve the issue faster.
 
 > **Note:** If you find a **Closed** issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
 
@@ -31,7 +31,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
 
 #### How do I submit a bug report?
 
-Bugs are tracked on the [official issue tracker](https://github.com/python-poetry/poetry/issues) where you can create a new one and provide the following information by filling in [the template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/1_Bug_report.md).
+Bugs are tracked on the [official issue tracker](https://github.com/python-poetry/poetry/issues) where you can create a new one and provide the following information by filling in [the template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/---bug-report.md).
 
 Explain the problem and include additional details to help maintainers reproduce the problem:
 
@@ -60,14 +60,13 @@ Include details about your configuration and environment:
 
 This section guides you through submitting an enhancement suggestion for Poetry, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
 
-Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-an-enhancement-suggestion). Fill in [the template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/2_Feature_request.md), including the steps that you imagine you would take if the feature you're requesting existed.
+Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-an-enhancement-suggestion). Fill in [the template](https://github.com/python-poetry/poetry/blob/master/.github/ISSUE_TEMPLATE/---feature-request.md), including the steps that you imagine you would take if the feature you're requesting existed.
 
 #### Before submitting an enhancement suggestion
 
 * **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?
 
 Enhancement suggestions are tracked on the [official issue tracker](https://github.com/python-poetry/poetry/issues) where you can create a new one and provide the following information:

diff --git a/README.md b/README.md
@@ -86,17 +86,27 @@ See `poetry help completions` for full details, but the gist is as simple as usi
 # Bash
 poetry completions bash > /etc/bash_completion.d/poetry.bash-completion
 
-# Bash (macOS/Homebrew)
+# Bash (Homebrew)
 poetry completions bash > $(brew --prefix)/etc/bash_completion.d/poetry.bash-completion
 
 # Fish
 poetry completions fish > ~/.config/fish/completions/poetry.fish
 
+# Fish (Homebrew)
+poetry completions fish > (brew --prefix)/share/fish/vendor_completions.d/poetry.fish
+
 # Zsh
 poetry completions zsh > ~/.zfunc/_poetry
 
-# Zsh (macOS/Homebrew)
+# Zsh (Homebrew)
 poetry completions zsh > $(brew --prefix)/share/zsh/site-functions/_poetry
+
+# Zsh (Oh-My-Zsh)
+mkdir $ZSH/plugins/poetry
+poetry completions zsh > $ZSH/plugins/poetry/_poetry
+
+# Zsh (prezto)
+poetry completions zsh > ~/.zprezto/modules/completion/external/src/_poetry
 ```
 
 *Note:* you may need to restart your shell in order for the changes to take

diff --git a/docs/docs/basic-usage.md b/docs/docs/basic-usage.md
@@ -77,7 +77,7 @@ how versions relate to each other, and on the different ways you can specify dep
 
     **How does Poetry download the right files?**
 
-    When you specify a dependency in `pyproject.toml`, Poetry first take the name of the package
+    When you specify a dependency in `pyproject.toml`, Poetry first takes the name of the package
     that you have requested and searches for it in any repository you have registered using the `repositories` key.
     If you have not registered any extra repositories, or it does not find a package with that name in the
     repositories you have specified, it falls back on PyPI.
@@ -134,6 +134,15 @@ the dependencies installed are still working even if your dependencies released
 
     For libraries it is not necessary to commit the lock file.
 
+### Installing dependencies only
+
+The current project is installed in [editable](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs) mode by default.
+
+If you want to install the dependencies only, run the `install` command with the `--no-root` flag:
+
+```bash
+poetry install --no-root
+```
 
 ## Updating dependencies to their latest versions
 

diff --git a/docs/docs/cli.md b/docs/docs/cli.md
@@ -6,15 +6,6 @@ This chapter documents all the available commands.
 To get help from the command-line, simply call `poetry` to see the complete list of commands,
 then `--help` combined with any of those can give you more information.
 
-As `Poetry` uses [cleo](https://github.com/sdispater/cleo) you can call commands by short name if it's not ambiguous.
-
-```bash
-poetry up
-```
-
-calls `poetry update`.
-
-
 ## Global options
 
 * `--verbose (-v|vv|vvv)`: Increase the verbosity of messages: "-v" for normal output, "-vv" for more verbose output and "-vvv" for debug.
@@ -172,6 +163,11 @@ If you just want to update a few packages and not all, you can list them as such
 poetry update requests toml
 ```
 
+Note that this will not update versions for dependencies outside their version constraints specified
+in the `pyproject.toml` file. In other terms, `poetry update foo` will be a no-op if the version constraint
+specified for `foo` is `~2.3` or `2.3` and `2.4` is available. In order for `foo` to be updated, you must
+update the constraint, for example `^2.3`. You can do this using the `add` command.
+
 ### Options
 
 * `--dry-run` : Outputs the operations but will not execute anything (implicitly enables --verbose).
@@ -428,9 +424,23 @@ This command shows the current version of the project or bumps the version of
 the project and writes the new version back to `pyproject.toml` if a valid
 bump rule is provided.
 
-The new version should ideally be a valid semver string or a valid bump rule:
+The new version should ideally be a valid [semver](https://semver.org/) string or a valid bump rule:
 `patch`, `minor`, `major`, `prepatch`, `preminor`, `premajor`, `prerelease`.
 
+The table below illustrates the effect of these rules with concrete examples.
+
+| rule       |        before | after         |
+|------------|---------------|---------------|
+| major      |         1.3.0 | 2.0.0         |
+| minor      |         2.1.4 | 2.2.0         |
+| patch      |         4.1.1 | 4.1.2         |
+| premajor   |         1.0.2 | 2.0.0-alpha.0 |
+| preminor   |         1.0.2 | 1.1.0-alpha.0 |
+| prepatch   |         1.0.2 | 1.0.3-alpha.0 |
+| prerelease |         1.0.2 | 1.0.3-alpha.0 |
+| prerelease | 1.0.3-alpha.0 | 1.0.3-alpha.1 |
+| prerelease |  1.0.3-beta.0 | 1.0.3-beta.1  |
+
 ## Options
 
 * `--short (-s)`: Output the version number only.
@@ -463,7 +473,7 @@ poetry export -f requirements.txt > requirements.txt
 The `env` command regroups sub commands to interact with the virtualenvs
 associated with a specific project.
 
-See [Managing environments](./managing-environments.md) for more information about these commands.
+See [Managing environments](/docs/managing-environments.md) for more information about these commands.
 
 ## cache
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     *.egg
     !/tests/**/*.egg
     /*.egg-info
-    /tests/fixtures/**/*.egg-info
     /dist/*
     build
     _build
@@ Expand Down @@