Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md
#	poetry.lock
#	poetry/__version__.py
#	poetry/installation/installer.py
#	pyproject.toml
#	tests/console/conftest.py
#	tests/installation/test_installer.py
#	tests/masonry/builders/test_builder.py
#	tests/masonry/builders/test_wheel.py

.gitignore

@@ -3,7 +3,7 @@
 # Packages
 *.egg
 *.egg-info
-dist
+/dist/*
 build
 _build
 .cache

CHANGELOG.md

@@ -24,6 +24,24 @@
 - Fixed transitive extra dependencies being removed when updating a specific dependency.
 
 
+## [0.12.12] - 2019-04-11
+
+### Fixed
+
+- Fix lock idempotency.
+- Fix markers evaluation for `python_version` with precision < 3.
+- Fix permissions of the `dist-info` files.
+- Fix `prepare_metadata_for_build_wheel()` missing in the build backend.
+- Fix metadata inconsistency between wheels and sdists.
+- Fix parsing of `platform_release` markers.
+- Fix metadata information when the project has git dependencies.
+- Fix error reporting when publishing fails.
+- Fix retrieval of `extras_require` in some `setup.py` files. (Thanks to [@asodeur](https://github.com/asodeur))
+- Fix wheel compression when building. (Thanks to [@ccosby](https://github.com/ccosby))
+- Improve retrieval of information for packages with two python specific wheels.
+- Fix request authentication when credentials are included in URLs. (Thanks to [@connorbrinton](https://github.com/connorbrinton))
+
+
 ## [0.12.11] - 2019-01-13
 
 ### Fixed
@@ -643,7 +661,8 @@ Initial release
 
 
 
-[Unreleased]: https://github.com/sdispater/poetry/compare/0.12.11...develop
+[Unreleased]: https://github.com/sdispater/poetry/compare/0.12.12...develop
+[0.12.12]: https://github.com/sdispater/poetry/releases/tag/0.12.12
 [0.12.11]: https://github.com/sdispater/poetry/releases/tag/0.12.11
 [0.12.10]: https://github.com/sdispater/poetry/releases/tag/0.12.10
 [0.12.9]: https://github.com/sdispater/poetry/releases/tag/0.12.9

CONTRIBUTING.md

@@ -1,10 +1,10 @@
 # Contributing to Poetry
 
-First off, thank for taking the time to contribute!
+First off, thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to Poetry on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Poetry on GitHub. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request.
 
-#### Table of Contents
+#### Table of contents
 
 [How to contribute](#how-to-contribute)
 
@@ -29,7 +29,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
 * **Check the [FAQs on the official website](https://poetry.eustace.io)** for a list of common questions and problems.
 * **Check that your issue does not already exist in the [issue tracker](https://github.com/sdispater/poetry/issues)**.
 
-#### How do I submit a bug report
+#### How do I submit a bug report?
 
 Bugs are tracked on the [official issue tracker](https://github.com/sdispater/poetry/issues) where you can create a new one and provide the following information by filling in [the template](https://github.com/sdispater/poetry/blob/master/.github/ISSUE_TEMPLATE/1_Bug_report.md).
 
@@ -38,7 +38,7 @@ Explain the problem and include additional details to help maintainers reproduce
 * **Use a clear and descriptive title** for the issue to identify the problem.
 * **Describe the exact steps which reproduce the problem** in as many details as possible.
 * **Provide your pyproject.toml file** in a [Gist](https://gist.github.com) after removing potential private information (like private package repositories).
-* **Provide specific examples to demonstrate the steps to reproduce the issue**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples.
+* **Provide specific examples to demonstrate the steps to reproduce the issue**. Include links to files or GitHub projects, or copy-paste-able snippets, which you use in those examples.
 * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
 * **Explain which behavior you expected to see instead and why.**
 * **If the problem is an unexpected error being raised**, execute the corresponding command in **debug** mode (the `-vvv` option).
@@ -115,5 +115,5 @@ will not be merged.
 #### Pull requests
 
 * Fill in [the required template](https://github.com/sdispater/poetry/blob/master/.github/PULL_REQUEST_TEMPLATE.md)
-* Be sure that you pull request contains tests that cover the changed or added code.
-* If you changes warrant a documentation change, the pull request must also update the documentation.
+* Be sure that your pull request contains tests that cover the changed or added code.
+* If your changes warrant a documentation change, the pull request must also update the documentation.

README.md

@@ -588,9 +588,9 @@ More identifiers are listed at the [SPDX Open Source License Registry](https://w
 
 #### authors
 
-The authors of the package. This is a list of authors and should contain at least one author.
+The authors of the package. **Required**
 
-Authors must be in the form `name <email>`.
+This is a list of authors and should contain at least one author. Authors must be in the form `name <email>`.
 
 #### readme
 

docs/docs/cli.md

@@ -196,6 +196,16 @@ poetry add my-package --path ../my-package/dist/my-package-0.1.0.tar.gz
 poetry add my-package --path ../my-package/dist/my_package-0.1.0.whl
 ```
 
+Path dependencies pointing to a local directory will be installed in editable mode (i.e. setuptools "develop mode"). 
+It means that changes in the local directory will be reflected directly in environment.
+
+If you don't want the dependency to be installed in editable mode you can specify it in the `pyproject.toml` file:
+
+```
+[tool.poetry.dependencies]
+my-package = {path = "../my/path", develop = false}
+```
+
 ### Options
 
 * `--dev (-D)`: Add package as development dependency.

docs/docs/index.md

@@ -90,17 +90,23 @@ pip install --user poetry
     Be aware that it will also install Poetry's dependencies
     which might cause conflicts with other packages.
 
-#### Installing with `pipsi`
+#### Installing with `pipx`
 
-Using [`pipsi`](https://github.com/mitsuhiko/pipsi) to install Poetry is also possible.
+Using [`pipx`](https://github.com/cs01/pipx) to install Poetry is also possible. [pipx] is used to install Python CLI applications globally while still isolating them in virtual environments. This allows for clean upgrades and uninstalls. pipx supports Python 3.6 and later. If using an earlier version of Python, consider [pipsi](https://github.com/mitsuhiko/pipsi).
 
 ```bash
-pipsi install poetry
+pipx install poetry
 ```
 
-Make sure your installed version of `pipsi` is at least version `0.10`,
-otherwise Poetry will not function properly. You can get it from its
-[Github repository](https://github.com/mitsuhiko/pipsi).
+```bash
+pipx upgrade poetry
+```
+
+```bash
+pipx uninstall poetry
+```
+
+[Github repository](https://github.com/cs01/pipx).
 
 
 ## Updating `poetry`

docs/docs/pyproject.md

@@ -42,9 +42,9 @@ More identifiers are listed at the [SPDX Open Source License Registry](https://w
 
 ## authors
 
-The authors of the package. This is a list of authors and should contain at least one author.
+The authors of the package. **Required**
 
-Authors must be in the form `name <email>`.
+This is a list of authors and should contain at least one author. Authors must be in the form `name <email>`.
 
 ## readme
 

get-poetry.py

@@ -195,7 +195,7 @@ def expanduser(path):
 import sys
 import os
 
-lib = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "lib"))
+lib = os.path.normpath(os.path.join(os.path.realpath(__file__), "../..", "lib"))
 
 sys.path.insert(0, lib)
 

make-linux-release.sh

@@ -2,7 +2,7 @@
 PYTHON_VERSIONS="cp27-cp27m cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m"
 
 cd /io
-/opt/python/cp37-cp37m/bin/pip install poetry --pre -U
+/opt/python/cp37-cp37m/bin/pip install poetry -U
 /opt/python/cp37-cp37m/bin/poetry config settings.virtualenvs.create false
 /opt/python/cp37-cp37m/bin/poetry install --no-dev
 /opt/python/cp37-cp37m/bin/python sonnet make release \