diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 00000000000..98088aa6e02 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,44 @@ +freebsd_instance: + image_family: freebsd-12-1-snap + +test_task: + name: "Tests / FreeBSD / " + env: + matrix: + - PYTHON: python2.7 + - PYTHON: python3.5 + - PYTHON: python3.6 + - PYTHON: python3.7 + - PYTHON: python3.8 + python_script: + - PYPACKAGE=$(printf '%s' $PYTHON | tr -d '.') + - SQLPACKAGE=$(printf '%s-sqlite3' $PYPACKAGE | sed 's/thon//') + - pkg install -y git-lite $PYPACKAGE $SQLPACKAGE + pip_script: + - $PYTHON -m ensurepip + - $PYTHON -m pip install -U pip tox poetry + - poetry config virtualenvs.in-project true + tox_script: $PYTHON -m tox -e py -- -q --junitxml=junit.xml tests + on_failure: + annotate_failure_artifacts: + path: junit.xml + format: junit + type: text/xml + +release_task: + name: "Release / FreeBSD" + only_if: $CIRRUS_TAG != '' + freebsd_instance: + matrix: + - image_family: freebsd-12-1-snap + - image_family: freebsd-11-3-snap + python_script: pkg install -y python3 python27 python35 python36 python37 python38 + pip_script: + - python2.7 -m ensurepip + - python3.5 -m ensurepip + - python3.6 -m ensurepip + - python3.7 -m ensurepip + - python3.8 -m ensurepip + build_script: ./make-nix-release.sh + archive_artifacts: + path: "releases/*" diff --git a/.flake8 b/.flake8 new file mode 100644 index 00000000000..5c25c0bb778 --- /dev/null +++ b/.flake8 @@ -0,0 +1,21 @@ +[flake8] +max-line-length = 88 +ignore = E501, E203, W503 +per-file-ignores = __init__.py:F401 +exclude = + .git + __pycache__ + setup.py + build + dist + releases + .venv + .tox + .mypy_cache + .pytest_cache + .vscode + .github + poetry/utils/_compat.py + tests/fixtures/ + tests/repositories/fixtures/ + tests/utils/fixtures/ diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md index df8dd248c70..05288e74fef 100644 --- 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: '' --- @@ -16,8 +16,8 @@ assignees: '' --> -- [ ] I am on the [latest](https://github.com/sdispater/poetry/releases/latest) Poetry version. -- [ ] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. +- [ ] I am on the [latest](https://github.com/python-poetry/poetry/releases/latest) Poetry version. +- [ ] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate. - [ ] If an exception occurs when executing a command, I executed it again in debug mode (`-vvv` option). -- [ ] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. +- [ ] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate. ## Issue diff --git a/.github/ISSUE_TEMPLATE/---everything-else.md b/.github/ISSUE_TEMPLATE/---everything-else.md index 7c798fe0052..9f33742156a 100644 --- a/.github/ISSUE_TEMPLATE/---everything-else.md +++ b/.github/ISSUE_TEMPLATE/---everything-else.md @@ -13,8 +13,8 @@ assignees: '' -- [ ] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. -- [ ] I have searched the [documentation](https://poetry.eustace.io/docs/) and believe that my question is not covered. +- [ ] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate. +- [ ] I have searched the [documentation](https://python-poetry.org/docs/) and believe that my question is not covered. ## Issue - \ No newline at end of file + diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md index 5959f5e25f3..6a984e925c5 100644 --- 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: '' --- @@ -16,8 +16,8 @@ assignees: '' --> -- [ ] I have searched the [issues](https://github.com/sdispater/poetry/issues) of this repo and believe that this is not a duplicate. -- [ ] I have searched the [documentation](https://poetry.eustace.io/docs/) and believe that my question is not covered. +- [ ] I have searched the [issues](https://github.com/python-poetry/poetry/issues) of this repo and believe that this is not a duplicate. +- [ ] I have searched the [documentation](https://python-poetry.org/docs/) and believe that my question is not covered. ## Feature Request diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..82577fb2a8a --- /dev/null +++ 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 index df0e1a01b20..bdba9f27880 100644 --- 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://poetry.eustace.io/docs/contributing/) at least once, it will save you unnecessary review cycles! +Resolves: #issue-number-here + + - [ ] 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. + -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/stale.yml b/.github/stale.yml new file mode 100644 index 00000000000..612d8f63135 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,25 @@ +exemptProjects: true +exemptMilestones: true + +staleLabel: stale + +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + +closeComment: > + Closing this issue automatically because it has not had any activity since + it has been marked as stale. If you think it is still relevant and should + be addressed, feel free to open a new one. + +pulls: + markComment: > + This pull request has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + + closeComment: > + Closing this pull request automatically because it has not had any activity since + it has been marked as stale. If you think it is still relevant and should + be addressed, feel free to open a new one. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f7bcfaaeeea..23fb3c1e204 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: Main +name: Tests on: [push, pull_request] @@ -7,90 +7,64 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - uses: actions/checkout@v2 + - name: Set up Python 3.8 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.8 - name: Linting run: | pip install pre-commit pre-commit run --all-files - Linux: + Tests: needs: Linting - runs-on: ubuntu-latest + name: ${{ matrix.os }} / ${{ matrix.python-version }} + runs-on: ${{ matrix.os }}-latest strategy: matrix: - python-version: [2.7, 3.5, 3.6, 3.7] - + os: [Ubuntu, MacOS, Windows] + python-version: [2.7, 3.5, 3.6, 3.7, 3.8] steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Install Poetry - run: | - python get-poetry.py --preview -y - source $HOME/.poetry/env - - name: Install dependencies - run: | - source $HOME/.poetry/env - poetry install - - name: Test - run: | - source $HOME/.poetry/env - poetry run pytest -q tests + - uses: actions/checkout@v2 - MacOS: - needs: Linting - runs-on: macos-latest - strategy: - matrix: - python-version: [2.7, 3.5, 3.6, 3.7] + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Install Poetry - run: | - python get-poetry.py --preview -y - source $HOME/.poetry/env - - name: Install dependencies - run: | - source $HOME/.poetry/env - poetry install - - name: Test - run: | - source $HOME/.poetry/env - poetry run pytest -q tests + - 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))") - Windows: - needs: Linting - runs-on: windows-latest - strategy: - matrix: - python-version: [2.7, 3.5, 3.6, 3.7] + - name: Install poetry + shell: bash + run: | + curl -fsS -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py + python get-poetry.py -y + echo "::set-env name=PATH::$HOME/.poetry/bin:$PATH" - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Install Poetry - run: | - python get-poetry.py --preview -y - SET PATH=%USERPROFILE%\\.poetry\\bin;%PATH% - - name: Install dependencies - run: | - SET PATH=%USERPROFILE%\\.poetry\\bin;%PATH% - poetry install - - name: Test - run: | - SET PATH=%USERPROFILE%\\.poetry\\bin;%PATH% - poetry run pytest -q tests + - name: Configure poetry + shell: bash + run: poetry config virtualenvs.in-project true + + - name: Set up cache + uses: actions/cache@v2 + id: cache + with: + path: .venv + key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }} + + - name: Ensure cache is healthy + if: steps.cache.outputs.cache-hit == 'true' + shell: bash + run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv + + - name: Install dependencies + shell: bash + run: poetry install + + - name: Run pytest + shell: bash + run: poetry run pytest -v tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000000..b17802b2ebd --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,257 @@ +name: Release + +on: + push: + tags: + - '*.*.*' + +jobs: + + Linux: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Get tag + id: tag + run: | + echo ::set-output name=tag::${GITHUB_REF#refs/tags/} + - name: Building release + run: | + make linux_release + - name: Upload release file + uses: actions/upload-artifact@v1 + with: + name: poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz + path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz + - name: Upload checksum file + uses: actions/upload-artifact@v1 + with: + name: poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum + path: releases/poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum + + MacOS: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: Get tag + id: tag + run: | + echo ::set-output name=tag::${GITHUB_REF#refs/tags/} + - name: Set up Python 3.8 + uses: actions/setup-python@v1 + with: + python-version: "3.8" + - name: Install Poetry + run: | + python get-poetry.py --preview -y + source $HOME/.poetry/env + - name: Install dependencies + run: | + source $HOME/.poetry/env + poetry install --no-dev + - name: Preparing Python executables + run: | + curl -L https://github.com/sdispater/python-binaries/releases/download/2.7.17/python-2.7.17.macos.tar.xz -o python-2.7.17.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.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.5.9.tar.xz + tar -zxf python-3.6.8.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.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: + name: poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz + path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz + - name: Upload checksum file + uses: actions/upload-artifact@v1 + with: + name: poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum + path: releases/poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum + + Windows: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Get tag + id: tag + shell: bash + run: | + echo ::set-output name=tag::${GITHUB_REF#refs/tags/} + - name: Set up Python 3.8 + uses: actions/setup-python@v1 + with: + python-version: "3.8" + - name: Install Poetry + run: | + python get-poetry.py --preview -y + $env:Path += ";$env:Userprofile\.poetry\bin" + - name: Install dependencies + run: | + $env:Path += ";$env:Userprofile\.poetry\bin" + poetry install --no-dev + - name: Preparing Python executables + run: | + Invoke-WebRequest https://github.com/sdispater/python-binaries/releases/download/2.7.17/python-2.7.17.windows.tar.xz -O python-2.7.17.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.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.5.4.tar.xz + 7z x python-3.6.8.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.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.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: + name: poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz + path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz + - name: Upload checksum file + uses: actions/upload-artifact@v1 + with: + name: poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum + path: releases/poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum + + Release: + needs: [Linux, MacOS, Windows] + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Get tag + id: tag + run: | + echo ::set-output name=tag::${GITHUB_REF#refs/tags/} + - name: Download Linux release file + uses: actions/download-artifact@master + with: + name: 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/ + - name: Download MacOS release file + uses: actions/download-artifact@master + with: + name: 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/ + - name: Download Windows release file + uses: actions/download-artifact@master + with: + name: 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/ + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.tag.outputs.tag }} + release_name: ${{ steps.tag.outputs.tag }} + draft: false + prerelease: false + - name: Upload Linux 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 }}-linux.tar.gz + asset_name: poetry-${{ steps.tag.outputs.tag }}-linux.tar.gz + asset_content_type: application/gzip + - name: Upload Linux checksum 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 }}-linux.sha256sum + asset_name: poetry-${{ steps.tag.outputs.tag }}-linux.sha256sum + 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 + asset_name: poetry-${{ steps.tag.outputs.tag }}-darwin.tar.gz + asset_content_type: application/gzip + - name: Upload MacOS checksum 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.sha256sum + asset_name: poetry-${{ steps.tag.outputs.tag }}-darwin.sha256sum + 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 + asset_name: poetry-${{ steps.tag.outputs.tag }}-win32.tar.gz + asset_content_type: application/gzip + - name: Upload Windows checksum 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.sha256sum + asset_name: poetry-${{ steps.tag.outputs.tag }}-win32.sha256sum + asset_content_type: text/plain + - name: Install Poetry + run: | + python get-poetry.py --preview -y + - name: Install dependencies + run: | + source $HOME/.poetry/env + poetry install --no-dev + - name: Build project for distribution + run: | + source $HOME/.poetry/env + poetry run poetry build + - name: Publish to PyPI + env: + POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }} + run: | + source $HOME/.poetry/env + poetry run poetry publish diff --git a/.gitignore b/.gitignore index 8a80bb89e32..fcbd92e97a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,8 @@ # Packages *.egg -*.egg-info +!/tests/**/*.egg +/*.egg-info /dist/* build _build diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b9a75affdb4..79b09408ed4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,26 @@ repos: -- repo: https://github.com/ambv/black + - repo: https://github.com/psf/black rev: stable hooks: - - id: black - language_version: python3.6 + - id: black + + - repo: https://gitlab.com/pycqa/flake8 + rev: 3.7.8 + hooks: + - id: flake8 + + - repo: https://github.com/timothycrosley/isort + rev: 4.3.21-2 + hooks: + - id: isort + additional_dependencies: [toml] + exclude: ^.*/?setup\.py$ + + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.3.0 + hooks: + - id: trailing-whitespace + exclude: ^tests/.*/fixtures/.* + - id: end-of-file-fixer + exclude: ^tests/.*/fixtures/.* + - id: debug-statements diff --git a/CHANGELOG.md b/CHANGELOG.md index fc28d7e1a93..0ab3d8d7e6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,132 @@ # Change Log -## [Unreleased] +## [1.1.0a1] - 2020-03-27 + +This release **must** be downloaded via the `get-poetry.py` script and not via the `self update` command. + +### Added + +- Added a new `--dry-run` option to the `publish` command ([#2199](https://github.com/python-poetry/poetry/pull/2199)). + +### Changed + +- The core features of Poetry have been extracted in to a separate library: `poetry-core` ([#2212](https://github.com/python-poetry/poetry/pull/2212)). +- The build backend is no longer `poetry.masonry.api` but `poetry.core.masonry.api` which requires `poetry-core>=1.0.0a5` ([#2212](https://github.com/python-poetry/poetry/pull/2212)). +- 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.9] - 2010-06-09 + +### Fixed + +- Fixed an issue where packages from custom indices where continuously updated ([#2525](https://github.com/python-poetry/poetry/pull/2525)). +- Fixed errors in the way Python environment markers were parsed and generated ([#2526](https://github.com/python-poetry/poetry/pull/2526)). + + +## [1.0.8] - 2020-06-05 + +### Fixed + +- Fixed a possible error when installing the root package ([#2505](https://github.com/python-poetry/poetry/pull/2505)). +- Fixed an error where directory and VCS dependencies were not installed ([#2505](https://github.com/python-poetry/poetry/pull/2505)). + + +## [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 + +- 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 + +- Fixed an error which caused the configuration environment variables (like `POETRY_HTTP_BASIC_XXX_PASSWORD`) to not be used ([#1909](https://github.com/python-poetry/poetry/pull/1909)). +- Fixed an error where the `--help` option was not working ([#1910](https://github.com/python-poetry/poetry/pull/1910)). +- Fixed an error where packages from private indices were not decompressed properly ([#1851](https://github.com/python-poetry/poetry/pull/1851)). +- Fixed an error where the version of some PEP-508-formatted wheel dependencies was not properly retrieved ([#1932](https://github.com/python-poetry/poetry/pull/1932)). +- Fixed internal regexps to avoid potential catastrophic backtracking errors ([#1913](https://github.com/python-poetry/poetry/pull/1913)). +- Fixed performance issues when custom indices were defined in the `pyproject.toml` file ([#1892](https://github.com/python-poetry/poetry/pull/1892)). +- Fixed the `get_requires_for_build_wheel()` function of `masonry.api` which wasn't returning the proper result ([#1875](https://github.com/python-poetry/poetry/pull/1875)). + + +## [1.0.2] - 2020-01-10 + +### Fixed + +- Reverted a previous fix ([#1796](https://github.com/python-poetry/poetry/pull/1796)) which was causing errors for projects with file and/or directory dependencies ([#1865](https://github.com/python-poetry/poetry/pull/1865)). + + +## [1.0.1] - 2020-01-10 + +### Fixed + +- Fixed an error in `env use` where the wrong Python executable was being used to check compatibility ([#1736](https://github.com/python-poetry/poetry/pull/1736)). +- Fixed an error where VCS dependencies were not properly categorized as development dependencies ([#1725](https://github.com/python-poetry/poetry/pull/1725)). +- Fixed an error where some shells would no longer be usable after using the `shell` command ([#1673](https://github.com/python-poetry/poetry/pull/1673)). +- Fixed an error where explicitly included files where not included in wheel distributions ([#1750](https://github.com/python-poetry/poetry/pull/1750)). +- Fixed an error where some Git dependencies url were not properly parsed ([#1756](https://github.com/python-poetry/poetry/pull/1756)). +- Fixed an error in the `env` commands on Windows if the path to the executable contained a space ([#1774](https://github.com/python-poetry/poetry/pull/1774)). +- Fixed several errors and UX issues caused by `keyring` on some systems ([#1788](https://github.com/python-poetry/poetry/pull/1788)). +- Fixed errors when trying to detect installed packages ([#1786](https://github.com/python-poetry/poetry/pull/1786)). +- Fixed an error when packaging projects where Python packages were not properly detected ([#1592](https://github.com/python-poetry/poetry/pull/1592)). +- Fixed an error where local file dependencies were exported as editable when using the `export` command ([#1840](https://github.com/python-poetry/poetry/pull/1840)). +- Fixed the way environment markers are propagated and evaluated when resolving dependencies ([#1829](https://github.com/python-poetry/poetry/pull/1829), [#1789](https://github.com/python-poetry/poetry/pull/1789)). +- Fixed an error in the PEP-508 compliant representation of directory and file dependencies ([#1796](https://github.com/python-poetry/poetry/pull/1796)). +- Fixed an error where invalid virtual environments would be silently used. They will not be recreated and a warning will be displayed ([#1797](https://github.com/python-poetry/poetry/pull/1797)). +- Fixed an error where dependencies were not properly detected when reading the `setup.py` file in some cases ([#1764](https://github.com/python-poetry/poetry/pull/1764)). + + +## [1.0.0] - 2019-12-12 ### Added @@ -18,9 +144,11 @@ - Full environment markers are now supported for dependencies via the `markers` property. - Added the ability to specify git dependencies directly in `add`, it no longer requires the `--git` option. - Added the ability to specify path dependencies directly in `add`, it no longer requires the `--path` option. -- Added support for url dependencies ([#1260](https://github.com/sdispater/poetry/pull/1260)). -- Publishing to PyPI using [API tokens](https://pypi.org/help/#apitoken) is now supported ([#1275](https://github.com/sdispater/poetry/pull/1275)). +- Added support for url dependencies ([#1260](https://github.com/python-poetry/poetry/pull/1260)). +- Publishing to PyPI using [API tokens](https://pypi.org/help/#apitoken) is now supported ([#1275](https://github.com/python-poetry/poetry/pull/1275)). - Licenses can now be identified by their full name. +- Added support for custom certificate authority and client certificates for private repositories. +- Poetry can now detect and use Conda environments. ### Changed @@ -33,8 +161,16 @@ - The `--git` option of the `add` command has been removed. - The `--path` option of the `add` command has been removed. - The `add` command will now automatically select the latest prerelease if only prereleases are available. -- The `add` command can now update a dependencies if an explicit constraint is given ([#1221](https://github.com/sdispater/poetry/pull/1221)). +- The `add` command can now update a dependencies if an explicit constraint is given ([#1221](https://github.com/python-poetry/poetry/pull/1221)). - Removed the `--develop` option from the `install` command. +- Improved UX when searching for packages in the `init` command. +- The `shell` command has been improved. +- The `poetry run` command now uses `os.execvp()` rather than spawning a new subprocess. +- Specifying dependencies with `allows-prereleases` in the `pyproject.toml` file is deprecated for consistency with the `add` command. Use `allow-prereleases` instead. +- Improved the error message when the lock file is invalid. +- Whenever Poetry needs to use the "system" Python, it will now call `sys.executable` instead of the `python` command. +- Improved the error message displayed on conflicting Python requirements ([#1681](https://github.com/python-poetry/poetry/pull/1681)). +- Improved the `site-packages` directory detection ([#1683](https://github.com/python-poetry/poetry/pull/1683)). ### Fixed @@ -42,6 +178,27 @@ - The `pyproject.toml` configuration is now properly validated. - Fixed installing Poetry-based packages breaking with `pip`. - Fixed packages with empty markers being added to the lock file. +- Fixed invalid lock file generation in some cases. +- Fixed local version identifier handling in wheel file names. +- Fixed packages with invalid metadata triggering an error instead of being skipped. +- Fixed the generation of invalid lock files in some cases. +- Git dependencies are now properly locked to a specific revision when specifying a branch or a tag. +- Fixed the behavior of the `~=` operator. +- Fixed dependency resolution for conditional development dependencies. +- Fixed generated dependency constraints when they contain inequality operators. +- The `run` command now properly handles the `--` separator. +- Fixed some issues with `path` dependencies being seen as `git` dependencies. +- Fixed various issues with the way `extra` markers in dependencies were handled. +- Fixed the option conflicts in the `run` command. +- Fixed wrong latest version being displayed when executing `show -l`. +- Fixed `TooManyRedirects` errors being raised when resolving dependencies. +- Fixed custom indices dependencies being constantly updated. +- Fixed the behavior of the `--install` option of the debug resolve command. +- Fixed an error in `show` when using the `-o/--outdated` option. +- Fixed PEP 508 url dependency handling. +- Fixed excluded files via the `exclude` being included in distributions. +- Fixed an error in `env use` if the `virtualenvs.in-project` setting is activated ([#1682](https://github.com/python-poetry/poetry/pull/1682)) +- Fixed handling of `empty` and `any` markers in unions of markers ([#1650](https://github.com/python-poetry/poetry/pull/1650)). ## [0.12.17] - 2019-07-03 @@ -725,56 +882,67 @@ Initial release -[Unreleased]: https://github.com/sdispater/poetry/compare/0.12.17...develop -[0.12.17]: https://github.com/sdispater/poetry/releases/tag/0.12.17 -[0.12.16]: https://github.com/sdispater/poetry/releases/tag/0.12.16 -[0.12.15]: https://github.com/sdispater/poetry/releases/tag/0.12.15 -[0.12.14]: https://github.com/sdispater/poetry/releases/tag/0.12.14 -[0.12.13]: https://github.com/sdispater/poetry/releases/tag/0.12.13 -[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 -[0.12.8]: https://github.com/sdispater/poetry/releases/tag/0.12.8 -[0.12.7]: https://github.com/sdispater/poetry/releases/tag/0.12.7 -[0.12.6]: https://github.com/sdispater/poetry/releases/tag/0.12.6 -[0.12.5]: https://github.com/sdispater/poetry/releases/tag/0.12.5 -[0.12.4]: https://github.com/sdispater/poetry/releases/tag/0.12.4 -[0.12.3]: https://github.com/sdispater/poetry/releases/tag/0.12.3 -[0.12.2]: https://github.com/sdispater/poetry/releases/tag/0.12.2 -[0.12.1]: https://github.com/sdispater/poetry/releases/tag/0.12.1 -[0.12.0]: https://github.com/sdispater/poetry/releases/tag/0.12.0 -[0.11.5]: https://github.com/sdispater/poetry/releases/tag/0.11.5 -[0.11.4]: https://github.com/sdispater/poetry/releases/tag/0.11.4 -[0.11.3]: https://github.com/sdispater/poetry/releases/tag/0.11.3 -[0.11.2]: https://github.com/sdispater/poetry/releases/tag/0.11.2 -[0.11.1]: https://github.com/sdispater/poetry/releases/tag/0.11.1 -[0.11.0]: https://github.com/sdispater/poetry/releases/tag/0.11.0 -[0.10.3]: https://github.com/sdispater/poetry/releases/tag/0.10.3 -[0.10.2]: https://github.com/sdispater/poetry/releases/tag/0.10.2 -[0.10.1]: https://github.com/sdispater/poetry/releases/tag/0.10.1 -[0.10.0]: https://github.com/sdispater/poetry/releases/tag/0.10.0 -[0.9.1]: https://github.com/sdispater/poetry/releases/tag/0.9.1 -[0.9.0]: https://github.com/sdispater/poetry/releases/tag/0.9.0 -[0.8.6]: https://github.com/sdispater/poetry/releases/tag/0.8.6 -[0.8.5]: https://github.com/sdispater/poetry/releases/tag/0.8.5 -[0.8.4]: https://github.com/sdispater/poetry/releases/tag/0.8.4 -[0.8.3]: https://github.com/sdispater/poetry/releases/tag/0.8.3 -[0.8.2]: https://github.com/sdispater/poetry/releases/tag/0.8.2 -[0.8.1]: https://github.com/sdispater/poetry/releases/tag/0.8.1 -[0.8.0]: https://github.com/sdispater/poetry/releases/tag/0.8.0 -[0.7.1]: https://github.com/sdispater/poetry/releases/tag/0.7.1 -[0.7.0]: https://github.com/sdispater/poetry/releases/tag/0.7.0 -[0.6.5]: https://github.com/sdispater/poetry/releases/tag/0.6.5 -[0.6.4]: https://github.com/sdispater/poetry/releases/tag/0.6.4 -[0.6.3]: https://github.com/sdispater/poetry/releases/tag/0.6.3 -[0.6.2]: https://github.com/sdispater/poetry/releases/tag/0.6.2 -[0.6.1]: https://github.com/sdispater/poetry/releases/tag/0.6.1 -[0.6.0]: https://github.com/sdispater/poetry/releases/tag/0.6.0 -[0.5.0]: https://github.com/sdispater/poetry/releases/tag/0.5.0 -[0.4.2]: https://github.com/sdispater/poetry/releases/tag/0.4.2 -[0.4.1]: https://github.com/sdispater/poetry/releases/tag/0.4.1 -[0.4.0]: https://github.com/sdispater/poetry/releases/tag/0.4.0 -[0.3.0]: https://github.com/sdispater/poetry/releases/tag/0.3.0 -[0.2.0]: https://github.com/sdispater/poetry/releases/tag/0.2.0 -[0.1.0]: https://github.com/sdispater/poetry/releases/tag/0.1.0 +[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.9]: https://github.com/python-poetry/poetry/releases/tag/1.0.9 +[1.0.8]: https://github.com/python-poetry/poetry/releases/tag/1.0.8 +[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 +[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 +[1.0.0]: https://github.com/python-poetry/poetry/releases/tag/1.0.0 +[0.12.17]: https://github.com/python-poetry/poetry/releases/tag/0.12.17 +[0.12.16]: https://github.com/python-poetry/poetry/releases/tag/0.12.16 +[0.12.15]: https://github.com/python-poetry/poetry/releases/tag/0.12.15 +[0.12.14]: https://github.com/python-poetry/poetry/releases/tag/0.12.14 +[0.12.13]: https://github.com/python-poetry/poetry/releases/tag/0.12.13 +[0.12.12]: https://github.com/python-poetry/poetry/releases/tag/0.12.12 +[0.12.11]: https://github.com/python-poetry/poetry/releases/tag/0.12.11 +[0.12.10]: https://github.com/python-poetry/poetry/releases/tag/0.12.10 +[0.12.9]: https://github.com/python-poetry/poetry/releases/tag/0.12.9 +[0.12.8]: https://github.com/python-poetry/poetry/releases/tag/0.12.8 +[0.12.7]: https://github.com/python-poetry/poetry/releases/tag/0.12.7 +[0.12.6]: https://github.com/python-poetry/poetry/releases/tag/0.12.6 +[0.12.5]: https://github.com/python-poetry/poetry/releases/tag/0.12.5 +[0.12.4]: https://github.com/python-poetry/poetry/releases/tag/0.12.4 +[0.12.3]: https://github.com/python-poetry/poetry/releases/tag/0.12.3 +[0.12.2]: https://github.com/python-poetry/poetry/releases/tag/0.12.2 +[0.12.1]: https://github.com/python-poetry/poetry/releases/tag/0.12.1 +[0.12.0]: https://github.com/python-poetry/poetry/releases/tag/0.12.0 +[0.11.5]: https://github.com/python-poetry/poetry/releases/tag/0.11.5 +[0.11.4]: https://github.com/python-poetry/poetry/releases/tag/0.11.4 +[0.11.3]: https://github.com/python-poetry/poetry/releases/tag/0.11.3 +[0.11.2]: https://github.com/python-poetry/poetry/releases/tag/0.11.2 +[0.11.1]: https://github.com/python-poetry/poetry/releases/tag/0.11.1 +[0.11.0]: https://github.com/python-poetry/poetry/releases/tag/0.11.0 +[0.10.3]: https://github.com/python-poetry/poetry/releases/tag/0.10.3 +[0.10.2]: https://github.com/python-poetry/poetry/releases/tag/0.10.2 +[0.10.1]: https://github.com/python-poetry/poetry/releases/tag/0.10.1 +[0.10.0]: https://github.com/python-poetry/poetry/releases/tag/0.10.0 +[0.9.1]: https://github.com/python-poetry/poetry/releases/tag/0.9.1 +[0.9.0]: https://github.com/python-poetry/poetry/releases/tag/0.9.0 +[0.8.6]: https://github.com/python-poetry/poetry/releases/tag/0.8.6 +[0.8.5]: https://github.com/python-poetry/poetry/releases/tag/0.8.5 +[0.8.4]: https://github.com/python-poetry/poetry/releases/tag/0.8.4 +[0.8.3]: https://github.com/python-poetry/poetry/releases/tag/0.8.3 +[0.8.2]: https://github.com/python-poetry/poetry/releases/tag/0.8.2 +[0.8.1]: https://github.com/python-poetry/poetry/releases/tag/0.8.1 +[0.8.0]: https://github.com/python-poetry/poetry/releases/tag/0.8.0 +[0.7.1]: https://github.com/python-poetry/poetry/releases/tag/0.7.1 +[0.7.0]: https://github.com/python-poetry/poetry/releases/tag/0.7.0 +[0.6.5]: https://github.com/python-poetry/poetry/releases/tag/0.6.5 +[0.6.4]: https://github.com/python-poetry/poetry/releases/tag/0.6.4 +[0.6.3]: https://github.com/python-poetry/poetry/releases/tag/0.6.3 +[0.6.2]: https://github.com/python-poetry/poetry/releases/tag/0.6.2 +[0.6.1]: https://github.com/python-poetry/poetry/releases/tag/0.6.1 +[0.6.0]: https://github.com/python-poetry/poetry/releases/tag/0.6.0 +[0.5.0]: https://github.com/python-poetry/poetry/releases/tag/0.5.0 +[0.4.2]: https://github.com/python-poetry/poetry/releases/tag/0.4.2 +[0.4.1]: https://github.com/python-poetry/poetry/releases/tag/0.4.1 +[0.4.0]: https://github.com/python-poetry/poetry/releases/tag/0.4.0 +[0.3.0]: https://github.com/python-poetry/poetry/releases/tag/0.3.0 +[0.2.0]: https://github.com/python-poetry/poetry/releases/tag/0.2.0 +[0.1.0]: https://github.com/python-poetry/poetry/releases/tag/0.1.0 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000000..b9cdf3d9041 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at sebastien@eustace.io. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a818ca4e84..0b184a286ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,18 +20,18 @@ 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/sdispater/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. #### Before submitting a bug report -* **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)**. +* **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? -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). +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,17 +60,16 @@ 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/sdispater/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://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). - +* **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/sdispater/poetry/issues) where you can create a new one and provide the following information: +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: * **Use a clear and descriptive title** for the issue to identify the suggestion. * **Provide a step-by-step description of the suggested enhancement** in as many details as possible. @@ -82,12 +81,12 @@ Enhancement suggestions are tracked on the [official issue tracker](https://gith #### Local development -You will need Poetry to start contributing on the Poetry codebase. Refer to the [documentation](https://poetry.eustace.io/docs/#introduction) to start using Poetry. +You will need Poetry to start contributing on the Poetry codebase. Refer to the [documentation](https://python-poetry.org/docs/#introduction) to start using Poetry. You will first need to clone the repository using `git` and place yourself in its directory: ```bash -$ git clone git@github.com:sdispater/poetry.git +$ git clone git@github.com:python-poetry/poetry.git $ cd poetry ``` @@ -99,9 +98,12 @@ $ 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) +and special care must be taken to respect it. If you don't, the CI will fail as well. + To make sure that you don't accidentally commit code that does not follow the coding style, you can install a pre-commit hook that will check that everything is in order: @@ -109,11 +111,17 @@ install a pre-commit hook that will check that everything is in order: $ poetry run pre-commit install ``` +You can also run it anytime using: + +```bash +$ poetry run pre-commit run --all-files +``` + Your code must always be accompanied by corresponding tests, if tests are not present your code will not be merged. #### Pull requests -* Fill in [the required template](https://github.com/sdispater/poetry/blob/master/.github/PULL_REQUEST_TEMPLATE.md) +* Fill in [the required template](https://github.com/python-poetry/poetry/blob/master/.github/PULL_REQUEST_TEMPLATE.md) * 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. diff --git a/Makefile b/Makefile index be0b5a76d7b..ccb529f1f0a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # This file is part of Poetry -# https://github.com/sdispater/poetry +# https://github.com/python-poetry/poetry # Licensed under the MIT license: # http://www.opensource.org/licenses/MIT-license @@ -47,8 +47,15 @@ wheel: @poetry build -v linux_release: - docker pull quay.io/pypa/manylinux1_x86_64 - docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/make-linux-release.sh + docker pull quay.io/pypa/manylinux2010_x86_64 + docker run --rm -i -v `pwd`:/io \ + -e PYTHON=/opt/python/cp37-cp37m/bin/python \ + -e PYTHON27=/opt/python/cp27-cp27m/bin/python \ + -e PYTHON35=/opt/python/cp35-cp35m/bin/python \ + -e PYTHON36=/opt/python/cp36-cp36m/bin/python \ + -e PYTHON37=/opt/python/cp37-cp37m/bin/python \ + -e PYTHON38=/opt/python/cp38-cp38/bin/python \ + quay.io/pypa/manylinux2010_x86_64 sh -c "cd /io && ./make-nix-release.sh" # run tests against all supported python versions tox: diff --git a/README.md b/README.md index 3da71ff42ae..4d1a0a68f6a 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,13 @@ Poetry helps you declare, manage and install dependencies of Python projects, ensuring you have the right stack everywhere. -![Poetry Install](https://raw.githubusercontent.com/sdispater/poetry/master/assets/install.gif) +![Poetry Install](https://raw.githubusercontent.com/python-poetry/poetry/master/assets/install.gif) It supports Python 2.7 and 3.4+. -[![Unix Build Status](https://img.shields.io/travis/sdispater/poetry.svg?label=Unix)](https://travis-ci.org/sdispater/poetry) -[![Windows Build Status](https://img.shields.io/appveyor/ci/sdispater/poetry.svg?label=Windows)](https://ci.appveyor.com/project/sdispater/poetry) +[![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). ## Installation @@ -17,11 +18,18 @@ from the rest of your system by vendorizing its dependencies. This is the recommended way of installing `poetry`. ```bash -curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python +curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python ``` Alternatively, you can download the `get-poetry.py` file and execute it separately. +The setup script must be able to find one of following executables in your shell's path environment: + +- `python` (which can be a py3 or py2 interpreter) +- `python3` +- `py.exe -3` (Windows) +- `py.exe -2` (Windows) + If you want to install prerelease versions, you can do so by passing `--preview` to `get-poetry.py`: ```bash @@ -45,25 +53,29 @@ which might cause conflicts. ## Updating `poetry` -Updating poetry to the latest stable version is as simple as calling the `self:update` command. +Updating poetry to the latest stable version is as simple as calling the `self update` command. ```bash -poetry self:update +poetry self update ``` If you want to install prerelease versions, you can use the `--preview` option. ```bash -poetry self:update --preview +poetry self update --preview ``` And finally, if you want to install a specific version you can pass it as an argument -to `self:update`. +to `self update`. ```bash -poetry self:update 0.8.0 +poetry self update 1.0.0 ``` +*Note:* + + If you are still on poetry version < 1.0 use `poetry self:update` instead. + ## Enable tab completion for Bash, Fish, or Zsh @@ -74,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 @@ -119,8 +141,8 @@ authors = [ readme = 'README.md' # Markdown files are supported -repository = "https://github.com/sdispater/poetry" -homepage = "https://github.com/sdispater/poetry" +repository = "https://github.com/python-poetry/poetry" +homepage = "https://github.com/python-poetry/poetry" keywords = ['packaging', 'poetry'] @@ -130,7 +152,7 @@ toml = "^0.9" # Dependencies with extras requests = { version = "^2.13", extras = [ "security" ] } # Python specific dependencies with prereleases allowed -pathlib2 = { version = "^2.2", python = "~2.7", allows-prereleases = true } +pathlib2 = { version = "^2.2", python = "~2.7", allow-prereleases = true } # Git dependencies cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" } @@ -239,599 +261,8 @@ so `poetry` will try to find a version of `oslo.i18n` that satisfies `pbr (>=0.6 By analyzing the releases of `oslo.i18n`, it will find `oslo.i18n==2.1.0` which requires `pbr (>=0.11,<2.0)`. At this point the rest of the resolution is straightforward since there is no more conflict. -#### Install command - -When you specify a package to the `install` command it will add it as a wildcard -dependency. This means that **any** version of this package can be installed which -can lead to compatibility issues. - -Also, you have to explicitly tell it to not update the locked packages when you -install new ones. This should be the default. - -#### Uninstall command - -The `uninstall` command will only remove the package specified but not its dependencies -if they are no longer needed. - -You either have to use `sync` or `clean` to fix that. - -#### Too limited in scope - -Finally, the `Pipfile` is just a replacement from `requirements.txt` and, in the end, you will still need to -populate your `setup.py` file (or `setup.cfg`) with the exact same dependencies you declared in your `Pipfile`. -So, in the end, you will still need to manage a few configuration files to properly setup your project. - - -## Commands - - -### new - -This command will help you kickstart your new Python project by creating -a directory structure suitable for most projects. - -```bash -poetry new my-package -``` - -will create a folder as follows: - -```text -my-package -├── pyproject.toml -├── README.rst -├── my_package -│ └── __init__.py -└── tests - ├── __init__.py - └── test_my_package -``` - -If you want to name your project differently than the folder, you can pass -the `--name` option: - -```bash -poetry new my-folder --name my-package -``` - -### init - -This command will help you create a `pyproject.toml` file interactively -by prompting you to provide basic information about your package. - -It will interactively ask you to fill in the fields, while using some smart defaults. - -```bash -poetry init -``` - -#### Options - -* `--name`: Name of the package. -* `--description`: Description of the package. -* `--author`: Author of the package. -* `--dependency`: Package to require with a version constraint. Should be in format `foo:1.0.0`. -* `--dev-dependency`: Development requirements, see `--require`. - -### install - -The `install` command reads the `pyproject.toml` file from the current directory, resolves the dependencies, -and installs them. - -```bash -poetry install -``` - -If there is a `poetry.lock` file in the current directory, -it will use the exact versions from there instead of resolving them. -This ensures that everyone using the library will get the same versions of the dependencies. - -If there is no `poetry.lock` file, Poetry will create one after dependency resolution. - -You can specify to the command that you do not want the development dependencies installed by passing -the `--no-dev` option. - -```bash -poetry install --no-dev -``` - -You can also specify the extras you want installed -by passing the `-E|--extras` option (See [Extras](#extras) for more info) - -```bash -poetry install --extras "mysql pgsql" -poetry install -E mysql -E pgsql -``` - -By default `poetry` will install your project's package everytime you run `install`: - -```bash -$ poetry install -Installing dependencies from lock file - -Nothing to install or update - - - Installing (x.x.x) - -``` - -If you want to skip this installation, use the `--no-root` option. - -```bash -poetry install --no-root -``` - -#### Options - -* `--no-dev`: Do not install dev dependencies. -* `--no-root`: Do not install the root package (your project). -* `-E|--extras`: Features to install (multiple values allowed). - -### update - -In order to get the latest versions of the dependencies and to update the `poetry.lock` file, -you should use the `update` command. - -```bash -poetry update -``` - -This will resolve all dependencies of the project and write the exact versions into `poetry.lock`. - -If you just want to update a few packages and not all, you can list them as such: - -```bash -poetry update requests toml -``` - -#### Options - -* `--dry-run` : Outputs the operations but will not execute anything (implicitly enables --verbose). -* `--no-dev` : Do not install dev dependencies. -* `--lock` : Do not perform install (only update the lockfile). - -### add - -The `add` command adds required packages to your `pyproject.toml` and installs them. - -If you do not specify a version constraint, -poetry will choose a suitable one based on the available package versions. - -```bash -poetry add requests pendulum -``` - -#### Options - -* `--D|dev`: Add package as development dependency. -* `--optional` : Add as an optional dependency. -* `--dry-run` : Outputs the operations but will not execute anything (implicitly enables --verbose). - - -### remove - -The `remove` command removes a package from the current -list of installed packages - -```bash -poetry remove pendulum -``` - -#### Options - -* `--D|dev`: Removes a package from the development dependencies. -* `--dry-run` : Outputs the operations but will not execute anything (implicitly enables --verbose). - - -### show - -To list all of the available packages, you can use the `show` command. - -```bash -poetry show -``` - -If you want to see the details of a certain package, you can pass the package name. - -```bash -poetry show pendulum - -name : pendulum -version : 1.4.2 -description : Python datetimes made easy - -dependencies: - - python-dateutil >=2.6.1 - - tzlocal >=1.4 - - pytzdata >=2017.2.2 -``` - -#### Options - -* `--no-dev`: Do not list the dev dependencies. -* `--tree`: List the dependencies as a tree. -* `-l|--latest`: Show the latest version. -* `-o|--outdated`: Show the latest version but only for packages that are outdated. - - -### build - -The `build` command builds the source and wheels archives. - -```bash -poetry build -``` - -Note that, at the moment, only pure python wheels are supported. - -#### Options - -* `-f|--format`: Limit the format to either wheel or sdist. - -### publish - -This command builds (if not already built) and publishes the package to the remote repository. - -It will automatically register the package before uploading if this is the first time it is submitted. - -```bash -poetry publish -``` - -#### Options - -* `-r|--repository`: The repository to register the package to (default: `pypi`). -Should match a repository name set by the [`config`](#config) command. -* `--username (-u)`: The username to access the repository. -* `--password (-p)`: The password to access the repository. - - -### `config` - -The `config` command allows you to edit poetry config settings and repositories. - -```bash -poetry config --list -``` - -#### Usage - -````bash -poetry config [options] [setting-key] [setting-value1] ... [setting-valueN] -```` - -`setting-key` is a configuration option name and `setting-value1` is a configuration value. - -#### Modifying repositories - -In addition to modifying the config section, -the config command also supports making changes to the repositories section by using it the following way: - -```bash -poetry config repositories.foo https://foo.bar/simple/ -``` - -This will set the url for repository `foo` to `https://foo.bar/simple/`. - -If you want to store your credentials for a specific repository, you can do so easily: - -```bash -poetry config http-basic.foo username password -``` - -If you do not specify the password you will be prompted to write it. - -#### Options - -* `--unset`: Remove the configuration element named by `setting-key`. -* `--list`: Show the list of current config variables. - -### search - -This command searches for packages on a remote index. - -```bash -poetry search requests pendulum -``` - -#### Options - -* `-N|--only-name`: Search only in name. - -### lock - -This command locks (without installing) the dependencies specified in `pyproject.toml`. - -```bash -poetry lock -``` - -### export - -This command exports the lock file to other formats. - -```bash -poetry export -f requirements.txt > requirements.txt -``` - -#### Options - -* `--format (-f)`: the format to export to. Currently, only - `requirements.txt` is supported. -* `--output (-o)`: the name of the output file. If omitted, print to standard - output. - - -## The `pyproject.toml` file - -The `tool.poetry` section of the `pyproject.toml` file is composed of multiple sections. - -#### name - -The name of the package. **Required** - -#### version - -The version of the package. **Required** - -This should follow [semantic versioning](http://semver.org/). However it will not be enforced and you remain -free to follow another specification. - -#### description - -A short description of the package. **Required** - -#### license - -The license of the package. - -The recommended notation for the most common licenses is (alphabetical): - -* Apache-2.0 -* BSD-2-Clause -* BSD-3-Clause -* BSD-4-Clause -* GPL-2.0 -* GPL-2.0+ -* GPL-3.0 -* GPL-3.0+ -* LGPL-2.1 -* LGPL-2.1+ -* LGPL-3.0 -* LGPL-3.0+ -* MIT - -Optional, but it is highly recommended to supply this. -More identifiers are listed at the [SPDX Open Source License Registry](https://www.spdx.org/licenses/). - -#### authors - -The authors of the package. **Required** - -This is a list of authors and should contain at least one author. Authors must be in the form `name `. - -#### readme - -The readme file of the package. **Required** - -The file can be either `README.rst` or `README.md`. - -#### homepage - -An URL to the website of the project. **Optional** - -#### repository - -An URL to the repository of the project. **Optional** - -#### documentation - -An URL to the documentation of the project. **Optional** - -#### keywords - -A list of keywords (max: 5) that the package is related to. **Optional** - -#### include and exclude - -A list of patterns that will be included in the final package. - -You can explicitly specify to Poetry that a set of globs should be ignored or included for the purposes of packaging. -The globs specified in the exclude field identify a set of files that are not included when a package is built. - -If a VCS is being used for a package, the exclude field will be seeded with the VCS’ ignore settings (`.gitignore` for git for example). - -```toml -[tool.poetry] -# ... -include = ["package/**/*.py", "package/**/.c"] -``` - -```toml -exclude = ["package/excluded.py"] -``` - -### `dependencies` and `dev-dependencies` - -Poetry is configured to look for dependencies on [PyPi](https://pypi.org) by default. -Only the name and a version string are required in this case. - -```toml -[tool.poetry.dependencies] -requests = "^2.13.0" -``` - -If you want to use a private repository, you can add it to your `pyproject.toml` file, like so: - -```toml -[[tool.poetry.source]] -name = 'private' -url = 'http://example.com/simple' -``` - -Be aware that declaring the python version for which your package -is compatible is mandatory: - -```toml -[tool.poetry.dependencies] -python = "^3.6" -``` - -#### Caret requirement - -**Caret requirements** allow SemVer compatible updates to a specified version. -An update is allowed if the new version number does not modify the left-most non-zero digit in the major, minor, patch grouping. -In this case, if we ran `poetry update requests`, poetry would update us to version `2.14.0` if it was available, -but would not update us to `3.0.0`. -If instead we had specified the version string as `^0.1.13`, poetry would update to `0.1.14` but not `0.2.0`. -`0.0.x` is not considered compatible with any other version. - -Here are some more examples of caret requirements and the versions that would be allowed with them: - -```text -^1.2.3 := >=1.2.3 <2.0.0 -^1.2 := >=1.2.0 <2.0.0 -^1 := >=1.0.0 <2.0.0 -^0.2.3 := >=0.2.3 <0.3.0 -^0.0.3 := >=0.0.3 <0.0.4 -^0.0 := >=0.0.0 <0.1.0 -^0 := >=0.0.0 <1.0.0 -``` - -#### Tilde requirements - -**Tilde requirements** specify a minimal version with some ability to update. -If you specify a major, minor, and patch version or only a major and minor version, only patch-level changes are allowed. -If you only specify a major version, then minor- and patch-level changes are allowed. - -`~1.2.3` is an example of a tilde requirement. - -```text -~1.2.3 := >=1.2.3 <1.3.0 -~1.2 := >=1.2.0 <1.3.0 -~1 := >=1.0.0 <2.0.0 -``` - -#### Wildcard requirements - -**Wildcard requirements** allow for any version where the wildcard is positioned. - -`*`, `1.*` and `1.2.*` are examples of wildcard requirements. - -```text -* := >=0.0.0 -1.* := >=1.0.0 <2.0.0 -1.2.* := >=1.2.0 <1.3.0 -``` - -#### Inequality requirements - -**Inequality requirements** allow manually specifying a version range or an exact version to depend on. - -Here are some examples of inequality requirements: - -```text ->= 1.2.0 -> 1 -< 2 -!= 1.2.3 -``` - -#### Multiple requirements - -Multiple version requirements can also be separated with a comma, e.g. `>= 1.2, < 1.5`. - -#### `git` dependencies - -To depend on a library located in a `git` repository, -the minimum information you need to specify is the location of the repository with the git key: - -```toml -[tool.poetry.dependencies] -requests = { git = "https://github.com/requests/requests.git" } -``` - -Since we haven’t specified any other information, -Poetry assumes that we intend to use the latest commit on the `master` branch to build our project. -You can combine the `git` key with the `rev`, `tag`, or `branch` keys to specify something else. -Here's an example of specifying that you want to use the latest commit on a branch named `next`: - -```toml -[tool.poetry.dependencies] -requests = { git = "https://github.com/kennethreitz/requests.git", branch = "next" } -``` - -#### Python restricted dependencies - -You can also specify that a dependency should be installed only for specific Python versions: - -```toml -[tool.poetry.dependencies] -pathlib2 = { version = "^2.2", python = "~2.7" } -``` - -```toml -[tool.poetry.dependencies] -pathlib2 = { version = "^2.2", python = ["~2.7", "^3.2"] } -``` - -### `scripts` - -This section describe the scripts or executable that will be installed when installing the package - -```toml -[tool.poetry.scripts] -poetry = 'poetry.console:run' -``` - -After installing a package with the above toml, `poetry` will be a global command available from the command line that will execute `console.run` in the `poetry` package. - -### `extras` - -Poetry supports extras to allow expression of: - -* optional dependencies, which enhance a package, but are not required; and -* clusters of optional dependencies. - -```toml -[tool.poetry] -name = "awesome" - -[tool.poetry.dependencies] -# These packages are mandatory and form the core of this package’s distribution. -mandatory = "^1.0" - -# A list of all of the optional dependencies, some of which are included in the -# below `extras`. They can be opted into by apps. -psycopg2 = { version = "^2.7", optional = true } -mysqlclient = { version = "^1.3", optional = true } - -[tool.poetry.extras] -mysql = ["mysqlclient"] -pgsql = ["psycopg2"] -``` - -When installing packages, you can specify extras by using the `-E|--extras` option: - -```bash -poetry install --extras "mysql pgsql" -poetry install -E mysql -E pgsql -``` - -### `plugins` - -Poetry supports arbitrary plugins which work similarly to -[setuptools entry points](http://setuptools.readthedocs.io/en/latest/setuptools.html). -To match the example in the setuptools documentation, you would use the following: - -```toml -[tool.poetry.plugins] # Optional super table - -[tool.poetry.plugins."blogtool.parsers"] -".rst" = "some_module::SomeClass" -``` - ## Resources -* [Official Website](https://poetry.eustace.io) -* [Issue Tracker](https://github.com/sdispater/poetry/issues) +* [Official Website](https://python-poetry.org) +* [Issue Tracker](https://github.com/python-poetry/poetry/issues) +* [Discord](https://discordapp.com/invite/awxPgve) diff --git a/docs/docs/basic-usage.md b/docs/docs/basic-usage.md index a9fd808f3f5..48fc8f480e7 100644 --- a/docs/docs/basic-usage.md +++ b/docs/docs/basic-usage.md @@ -69,14 +69,15 @@ It will automatically find a suitable version constraint **and install** the pac In our example, we are requesting the `pendulum` package with the version constraint `^1.4`. This means any version greater or equal to 1.4.0 and less than 2.0.0 (`>=1.4.0 <2.0.0`). -Please read [versions](/docs/versions/) for more in-depth information on versions, how versions relate to each other, and on version constraints. +Please read [Dependency specification](/docs/dependency-specification) for more in-depth information on versions, +how versions relate to each other, and on the different ways you can specify dependencies. !!!note **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. @@ -133,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 @@ -147,107 +157,3 @@ and update the lock file with the new versions. Poetry will display a **Warning** when executing an install command if `poetry.lock` and `pyproject.toml` are not synchronized. - - -## Poetry and virtualenvs - -When you execute the `install` command (or any other "install" commands like `add` or `remove`), -Poetry will check if it's currently inside a virtualenv and, if not, will use an existing one -or create a brand new one for you to always work isolated from your global Python installation. - -By default, Poetry will use the currently activated Python version -to create the virtualenv for the current project. - -To easily switch between Python versions, it is recommended to -use [pyenv](https://github.com/pyenv/pyenv) or similar tools. - -For instance, if your project is Python 2.7 only, a standard workflow -would be: - -```bash -pyenv install 2.7.15 -pyenv local 2.7.15 # Activate Python 2.7 for the current project -poetry install -``` - -However, this might not be feasible for your system, especially Windows where `pyenv`, -is not available. To circumvent that you can use the `env use` command to tell -Poetry which Python version to use for the current project. - -```bash -poetry env use /full/path/to/python -``` - -If you have the python executable in your `PATH` you can use it: - -```bash -poetry env use python3.7 -``` - -You can even just use the minor Python version in this case: - -```bash -poetry env use 3.7 -``` - -If you want to disable the explicitly activated virtualenv, you can use the -special `system` Python version to retrieve the default behavior: - -```bash -poetry env use system -``` - -If you want to get basic information about the currently activated virtualenv, -you can use the `env info` command: - -```bash -poetry env info -``` - -will output something similar to this: - -```text -Virtualenv -Python: 3.7.1 -Implementation: CPython -Path: /path/to/poetry/cache/virtualenvs/test-O3eWbxRl-py3.7 -Valid: True - -System -Platform: darwin -OS: posix -Python: /path/to/main/python -``` - -If you only want to know the path to the virtualenv, you can pass the `--path` option -to `env info`: - -```bash -poetry env info --path -``` - -You can also list all the virtualenvs associated with the current virtualenv -with the `env list` command: - -```bash -poetry env list -``` - -will output something like the following: - -```text -test-O3eWbxRl-py2.7 -test-O3eWbxRl-py3.6 -test-O3eWbxRl-py3.7 (Activated) -``` - -Finally, you can delete existing virtualenvs by using `env remove`: - -```bash -poetry env remove /full/path/to/python -poetry env remove python3.7 -poetry env remove 3.7 -poetry env remove test-O3eWbxRl-py3.7 -``` - -If your remove the currently activated virtualenv, it will be automatically deactivated. diff --git a/docs/docs/cli.md b/docs/docs/cli.md index b938c4d6839..3f60e585e05 100644 --- a/docs/docs/cli.md +++ b/docs/docs/cli.md @@ -3,18 +3,9 @@ You've already learned how to use the command-line interface to do some things. This chapter documents all the available commands. -To get help from the command-line, simply call `poetry` or `poetry list` to see the complete list of 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. @@ -121,6 +112,13 @@ the `--no-dev` option. poetry install --no-dev ``` +If you want to remove old dependencies no longer present in the lock file, use the +`--remove-untracked` option. + +```bash +poetry install --remove-untracked +``` + You can also specify the extras you want installed by passing the `--E|--extras` option (See [Extras](#extras) for more info) @@ -135,7 +133,7 @@ By default `poetry` will install your project's package everytime you run `insta $ poetry install Installing dependencies from lock file -Nothing to install or update +No dependencies to install or update - Installing (x.x.x) @@ -170,6 +168,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). @@ -209,12 +212,18 @@ You can also add `git` dependencies: poetry add git+https://github.com/sdispater/pendulum.git ``` +or use ssh instead of https: + +```bash +poetry add git+ssh://git@github.com/sdispater/pendulum.git +``` + If you need to checkout a specific branch, tag or revision, you can specify it when using `add`: ```bash -poetry add git+https://github.com/sdispater/pendulum.git@develop -poetry add git+https://github.com/sdispater/pendulum.git@2.0.5 +poetry add git+https://github.com/sdispater/pendulum.git#develop +poetry add git+https://github.com/sdispater/pendulum.git#2.0.5 ``` or make them point to a local directory or file: @@ -225,7 +234,7 @@ poetry add ../my-package/dist/my-package-0.1.0.tar.gz poetry add ../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"). +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: @@ -250,6 +259,7 @@ poetry add "git+https://github.com/pallets/flask.git@1.1.1[dotenv,dev]" * `--path`: The path to a dependency. * `--optional` : Add as an optional dependency. * `--dry-run` : Outputs the operations but will not execute anything (implicitly enables --verbose). +* `--lock` : Do not perform install (only update the lockfile). ## remove @@ -310,7 +320,7 @@ Note that, at the moment, only pure python wheels are supported. ### Options -* `--format (-F)`: Limit the format to either wheel or sdist. +* `--format (-f)`: Limit the format to either `wheel` or `sdist`. ## publish @@ -330,6 +340,7 @@ It can also build the package if you pass it the `--build` option. Should match a repository name set by the [`config`](#config) command. * `--username (-u)`: The username to access the repository. * `--password (-p)`: The password to access the repository. +* `--dry-run`: Perform all actions except upload the package. ## config @@ -420,13 +431,30 @@ poetry lock ## version -This command shows the current version of the project or bumps the version of +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. ## export @@ -442,8 +470,8 @@ poetry export -f requirements.txt > requirements.txt ### Options -* `--format (-f)`: The format to export to. Currently, only - `requirements.txt` is supported. +* `--format (-f)`: The format to export to (default: `requirements.txt`). + Currently, only `requirements.txt` is supported. * `--output (-o)`: The name of the output file. If omitted, print to standard output. * `--dev`: Include development dependencies. @@ -456,106 +484,16 @@ poetry export -f requirements.txt > requirements.txt The `env` command regroups sub commands to interact with the virtualenvs associated with a specific project. -### env use - -The `env use` command tells Poetry which Python version -to use for the current project. - -```bash -poetry env use /full/path/to/python -``` - -If you have the python executable in your `PATH` you can use it: - -```bash -poetry env use python3.7 -``` - -You can even just use the minor Python version in this case: - -```bash -poetry env use 3.7 -``` - -If you want to disable the explicitly activated virtualenv, you can use the -special `system` Python version to retrieve the default behavior: - -```bash -poetry env use system -``` - -### env info - -The `env info` command displays basic information about the currently activated virtualenv: - -```bash -poetry env info -``` - -will output something similar to this: - -```text -Virtualenv -Python: 3.7.1 -Implementation: CPython -Path: /path/to/poetry/cache/virtualenvs/test-O3eWbxRl-py3.7 -Valid: True - -System -Platform: darwin -OS: posix -Python: /path/to/main/python -``` - -If you only want to know the path to the virtualenv, you can pass the `--path` option -to `env info`: - -```bash -poetry env info --path -``` - -#### Options - -* `--path`: Only display the path of the virtualenv. +See [Managing environments](/docs/managing-environments.md) for more information about these commands. +## cache -### env list +The `cache` command regroups sub commands to interact with Poetry's cache. -The `env list` command lists all the virtualenvs associated with the current virtualenv. +### cache list -```bash -poetry env list -``` - -will output something like the following: - -```text -test-O3eWbxRl-py2.7 -test-O3eWbxRl-py3.6 -test-O3eWbxRl-py3.7 (Activated) -``` - -#### Options - -* `--full-path`: Display the full path of the virtualenvs. - -### env remove - -The `env remove` command deletes virtualenvs associated with the current project: - -```bash -poetry env remove /full/path/to/python -``` - -Similarly to `env use`, you can either pass `python3.7`, `3.7` or the name of -the virtualenv (as returned by `env list`): +The `cache list` command lists Poetry's available caches. ```bash -poetry env remove python3.7 -poetry env remove 3.7 -poetry env remove test-O3eWbxRl-py3.7 +poetry cache list ``` - -!!!note - - If your remove the currently activated virtualenv, it will be automatically deactivated. diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index 7e4b84388de..88d38bd03ee 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -100,11 +100,11 @@ Defaults to one of the following directories: - macOS: `~/Library/Caches/pypoetry` - Windows: `C:\Users\\AppData\Local\pypoetry\Cache` -- Unix: `~/.cache/pypoetry/virtualenvs` +- Unix: `~/.cache/pypoetry` ### `virtualenvs.create`: boolean -Create a new virtualenv if one doesn't already exist. +Create a new virtual environment if one doesn't already exist. Defaults to `true`. ### `virtualenvs.in-project`: boolean @@ -114,7 +114,7 @@ Defaults to `false`. ### `virtualenvs.path`: string -Directory where virtualenvs will be created. +Directory where virtual environments will be created. Defaults to `{cache-dir}/virtualenvs` (`{cache-dir}\virtualenvs` on Windows). ### `repositories.`: string diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md index defa0ab2bc4..568877b4a4f 100644 --- a/docs/docs/contributing.md +++ b/docs/docs/contributing.md @@ -1,121 +1 @@ -# Contributing to Poetry - -First off, thank 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. - -#### Table of Contents - -[How to contribute](#how-to-contribute) - - * [Reporting bugs](#reporting-bugs) - * [Suggesting enhancements](#suggesting-enhancements) - * [Contributing to code](#contributing-to-code) - - -## How to contribute - -### Reporting bugs - -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/sdispater/poetry/blob/master/.github/ISSUE_TEMPLATE/1_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. - -#### Before submitting a bug report - -* **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 - -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). - -Explain the problem and include additional details to help maintainers reproduce the problem: - -* **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. -* **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). - -Provide more context by answering these questions: - -* **Did the problem start happening recently** (e.g. after updating to a new version of Poetry) or was this always a problem? -* If the problem started happening recently, **can you reproduce the problem in an older version of Poetry?** What's the most recent version in which the problem doesn't happen? -* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens. - -Include details about your configuration and environment: - -* **Which version of Poetry are you using?** You can get the exact version by running `poetry -V` in your terminal. -* **Which Python version Poetry has been installed for?** Execute the `debug:info` to get the information. -* **What's the name and version of the OS you're using**? - - -### Suggesting enhancements - -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/sdispater/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 submitting an enhancement suggestion - -* **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 an enhancement suggestion? - -Enhancement suggestions 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: - -* **Use a clear and descriptive title** for the issue to identify the suggestion. -* **Provide a step-by-step description of the suggested enhancement** in as many details as possible. -* **Provide specific examples to demonstrate the steps**.. -* **Describe the current behavior** and **explain which behavior you expected to see instead** and why. - - -### Contributing to code - -#### Local development - -You will need Poetry to start contributing on the Poetry codebase. Refer to the [documentation](https://poetry.eustace.io/docs/#introduction) to start using Poetry. - -You will first need to clone the repository using `git` and place yourself in its directory: - -```bash -$ git clone git@github.com:sdispater/poetry.git -$ cd poetry -``` - -Now, you will need to install the required dependency for Poetry and be sure that the current -tests are passing on your machine: - -```bash -$ poetry install -$ poetry run pytest tests/ -``` - -Poetry uses the [black](https://github.com/ambv/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. - -To make sure that you don't accidently commit code that does not follow the coding style, you can -install a pre-commit hook that will check that everything is in order: - -```bash -$ poetry run pre-commit install -``` - -Your code must always be accompanied by corresponding tests, if tests are not present your code -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. +{!../CONTRIBUTING.md!} diff --git a/docs/docs/versions.md b/docs/docs/dependency-specification.md similarity index 70% rename from docs/docs/versions.md rename to docs/docs/dependency-specification.md index 7769471a498..257b585b5a3 100644 --- a/docs/docs/versions.md +++ b/docs/docs/dependency-specification.md @@ -1,6 +1,7 @@ -# Versions and constraints +# Dependency specification -Poetry recommends following [semantic versioning](https://semver.org) but will not enforce it. +Dependencies for a project can be specified in various forms, which depend on the type +of the dependency and on the optional constraints that might be needed for it to be installed. ## Version constraints @@ -41,7 +42,7 @@ If you only specify a major version, then minor- and patch-level changes are all ### Wildcard requirements -**Wildcard requirements** allow for any version where the wildcard is positioned. +**Wildcard requirements** allow for the latest (dependency dependent) version where the wildcard is positioned. `*`, `1.*` and `1.2.*` are examples of wildcard requirements. @@ -74,7 +75,7 @@ If other dependencies require a different version, the solver will ultimately fa Multiple version requirements can also be separated with a comma, e.g. `>= 1.2, < 1.5`. -### `git` dependencies +## `git` dependencies To depend on a library located in a `git` repository, the minimum information you need to specify is the location of the repository with the git key: @@ -85,16 +86,24 @@ requests = { git = "https://github.com/requests/requests.git" } ``` Since we haven’t specified any other information, -Poetry assumes that we intend to use the latest commit on the `master` branch to build our project. -You can combine the `git` key with the `rev`, `tag`, or `branch` keys to specify something else. -Here's an example of specifying that you want to use the latest commit on a branch named `next`: +Poetry assumes that we intend to use the latest commit on the `master` branch +to build our project. + +You can combine the `git` key with the `branch` key to use another branch. +Alternatively, use `rev` or `tag` to pin a dependency to a specific commit hash +or tagged ref, respectively. For example: ```toml [tool.poetry.dependencies] +# Get the latest revision on the branch named "next" requests = { git = "https://github.com/kennethreitz/requests.git", branch = "next" } +# Get a revision by its commit hash +flask = { git = "https://github.com/pallets/flask.git", rev = "38eb5d3b" } +# Get a revision by its tag +numpy = { git = "https://github.com/numpy/numpy.git", tag = "v0.13.2" } ``` -### `path` dependencies +## `path` dependencies To depend on a library located in a local directory or file, you can use the `path` property: @@ -108,14 +117,8 @@ my-package = { path = "../my-package/" } my-package = { path = "../my-package/dist/my-package-0.1.0.tar.gz" } ``` -!!!note - You can install path dependencies in editable/development mode. - Just pass `--develop my-package` (repeatable as much as you want) to - the `install` command. - - -### `url` dependencies +## `url` dependencies To depend on a library located on a remote archive, you can use the `url` property: @@ -133,7 +136,7 @@ poetry add https://example.com/my-package-0.1.0.tar.gz ``` -### Python restricted dependencies +## Python restricted dependencies You can also specify that a dependency should be installed only for specific Python versions: @@ -147,7 +150,7 @@ pathlib2 = { version = "^2.2", python = "~2.7" } pathlib2 = { version = "^2.2", python = "~2.7 || ^3.2" } ``` -### Using environment markers +## Using environment markers If you need more complex install conditions for your dependencies, Poetry supports [environment markers](https://www.python.org/dev/peps/pep-0508/#environment-markers) @@ -159,7 +162,7 @@ pathlib2 = { version = "^2.2", markers = "python_version ~= '2.7' or sys_platfor ``` -### Multiple constraints dependencies +## Multiple constraints dependencies Sometimes, one of your dependency may have different version ranges depending on the target Python versions. @@ -176,6 +179,34 @@ foo = [ ] ``` +## Expanded dependency specification syntax + +In the case of more complex dependency specifications, you may find that you +end up with lines which are very long and difficult to read. In these cases, +you can shift from using "inline table" syntax, to the "standard table" syntax. + +An example where this might be useful is the following: + +```toml +[tool.poetry.dev-dependencies] +black = {version = "19.10b0", allow-prereleases = true, python = "^3.6", markers = "platform_python_implementation == 'CPython'} +``` + +As a single line, this is a lot to digest. To make this a little bit easier to +work with, you can do the following: + +```toml +[tool.poetry.dev-dependencies.black] +version = "19.10b0" +allow-prereleases = true +python = "^3.6" +markers = "platform_python_implementation == 'CPython'" +``` + +All of the same information is still present, and ends up providing the exact +same specification. It's simply split into multiple, slightly more readable, +lines. + !!!note The constraints **must** have different requirements (like `python`) diff --git a/docs/docs/faq.md b/docs/docs/faq.md index 11da2f94986..4d464d7ebc0 100644 --- a/docs/docs/faq.md +++ b/docs/docs/faq.md @@ -42,8 +42,8 @@ So, in your `pyproject.toml` file, add this section if it does not already exist ```toml [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" ``` And use a `tox.ini` configuration file similar to this: @@ -60,14 +60,14 @@ commands = poetry run pytest tests/ ``` -## I don't want Poetry to manage my virtualenvs. Can I disable it? +## I don't want Poetry to manage my virtual environments. Can I disable it? -While Poetry automatically creates virtualenvs to always work isolated +While Poetry automatically creates virtual environments to always work isolated from the global Python installation, there are valid reasons why it's not necessary and is an overhead, like when working with containers. In this case, you can disable this feature by setting the `virtualenvs.create` setting to `false`: ```bash -poetry config settings.virtualenvs.create false +poetry config virtualenvs.create false ``` diff --git a/docs/docs/index.md b/docs/docs/index.md index 66fb0ade021..9fe5b372c61 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -16,14 +16,19 @@ Poetry provides a custom installer that will install `poetry` isolated from the rest of your system by vendorizing its dependencies. This is the recommended way of installing `poetry`. +### osx / linux / bashonwindows install instructions ```bash -curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python +curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python +``` +### windows powershell install instructions +```powershell +(Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python ``` !!! note You only need to install Poetry once. It will automatically pick up the current - Python version and use it to [create virtualenvs](/docs/basic-usage/#poetry-and-virtualenvs) accordingly. + Python version and use it to [create virtualenvs](/docs/managing-environments.md) accordingly. The installer installs the `poetry` tool to Poetry's `bin` directory. On Unix it is located at `$HOME/.poetry/bin` and on Windows at `%USERPROFILE%\.poetry\bin`. @@ -117,30 +122,34 @@ pipx uninstall poetry ## Updating `poetry` -Updating poetry to the latest stable version is as simple as calling the `self:update` command. +Updating Poetry to the latest stable version is as simple as calling the `self update` command. ```bash -poetry self:update +poetry self update ``` -If you want to install prerelease versions, you can use the `--preview` option. +If you want to install pre-release versions, you can use the `--preview` option. ```bash -poetry self:update --preview +poetry self update --preview ``` -And finally, if you want to install a specific version you can pass it as an argument -to `self:update`. +And finally, if you want to install a specific version, you can pass it as an argument +to `self update`. ```bash -poetry self:update 0.8.0 +poetry self update 0.8.0 ``` !!!note - The `self:update` command will only work if you used the recommended + The `self update` command will only work if you used the recommended installer to install Poetry. +!!!note + + If you are still on poetry version < 1.0 use `poetry self:update` instead. + ## Enable tab completion for Bash, Fish, or Zsh @@ -152,12 +161,15 @@ 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 @@ -165,6 +177,9 @@ poetry completions zsh > ~/.zfunc/_poetry mkdir $ZSH/plugins/poetry poetry completions zsh > $ZSH/plugins/poetry/_poetry +# prezto +poetry completions zsh > ~/.zprezto/modules/completion/external/src/_poetry + ``` !!! note diff --git a/docs/docs/libraries.md b/docs/docs/libraries.md index 0bbb7f6afed..db4822c342d 100644 --- a/docs/docs/libraries.md +++ b/docs/docs/libraries.md @@ -2,11 +2,6 @@ This chapter will tell you how to make your library installable through Poetry. -## Every project is a package - -As soon as you have a `pyproject.toml` in a directory, that directory is a package. -However, to make it accessible to others you will need to package and publish it. - ## Versioning @@ -14,7 +9,7 @@ While Poetry does not enforce any convention regarding package versioning, it **strongly** recommends to follow [semantic versioning](https://semver.org). This has many advantages for the end users and allows them to set appropriate -[version constraints](/docs/versions/). +[version constraints](/docs/dependency-specification/#version-constraints). ## Lock file diff --git a/docs/docs/managing-environments.md b/docs/docs/managing-environments.md new file mode 100644 index 00000000000..8a1475f7c45 --- /dev/null +++ b/docs/docs/managing-environments.md @@ -0,0 +1,121 @@ +# Managing environments + +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. +If it is, it will use it directly without creating a new one. But if it's not, it will use +one that it has already created or create a brand new one for you. + +By default, Poetry will try to use the currently activated Python version +to create the virtual environment for the current project. + +However, for various reasons, this Python version might not be compatible +with the `python` requirement of the project. In this case, Poetry will try +to find one that is and use it. If it's unable to do so then you will be prompted +to activate one explicitly, see [Switching environments](#switching-between-environments). + +!!!note + + To easily switch between Python versions, it is recommended to + use [pyenv](https://github.com/pyenv/pyenv) or similar tools. + + For instance, if your project is Python 2.7 only, a standard workflow + would be: + + ```bash + pyenv install 2.7.15 + pyenv local 2.7.15 # Activate Python 2.7 for the current project + poetry install + ``` + +## Switching between environments + +Sometimes this might not be feasible for your system, especially Windows where `pyenv` +is not available, or you simply prefer to have a more explicit control over your environment. +For this specific purpose, you can use the `env use` command to tell Poetry +which Python version to use for the current project. + +```bash +poetry env use /full/path/to/python +``` + +If you have the python executable in your `PATH` you can use it: + +```bash +poetry env use python3.7 +``` + +You can even just use the minor Python version in this case: + +```bash +poetry env use 3.7 +``` + +If you want to disable the explicitly activated virtual environment, you can use the +special `system` Python version to retrieve the default behavior: + +```bash +poetry env use system +``` + +## Displaying the environment information + +If you want to get basic information about the currently activated virtual environment, +you can use the `env info` command: + +```bash +poetry env info +``` + +will output something similar to this: + +```text +Virtual environment +Python: 3.7.1 +Implementation: CPython +Path: /path/to/poetry/cache/virtualenvs/test-O3eWbxRl-py3.7 +Valid: True + +System +Platform: darwin +OS: posix +Python: /path/to/main/python +``` + +If you only want to know the path to the virtual environment, you can pass the `--path` option +to `env info`: + +```bash +poetry env info --path +``` + +## Listing the environments associated with the project + +You can also list all the virtual environments associated with the current virtual environment +with the `env list` command: + +```bash +poetry env list +``` + +will output something like the following: + +```text +test-O3eWbxRl-py2.7 +test-O3eWbxRl-py3.6 +test-O3eWbxRl-py3.7 (Activated) +``` + +## Deleting the environments + +Finally, you can delete existing virtual environments by using `env remove`: + +```bash +poetry env remove /full/path/to/python +poetry env remove python3.7 +poetry env remove 3.7 +poetry env remove test-O3eWbxRl-py3.7 +``` + +If you remove the currently activated virtual environment, it will be automatically deactivated. diff --git a/docs/docs/pyproject.md b/docs/docs/pyproject.md index 679ad824a22..46cc1132148 100644 --- a/docs/docs/pyproject.md +++ b/docs/docs/pyproject.md @@ -27,19 +27,23 @@ The recommended notation for the most common licenses is (alphabetical): * BSD-2-Clause * BSD-3-Clause * BSD-4-Clause -* GPL-2.0 -* GPL-2.0+ -* GPL-3.0 -* GPL-3.0+ -* LGPL-2.1 -* LGPL-2.1+ -* LGPL-3.0 -* LGPL-3.0+ +* GPL-2.0-only +* GPL-2.0-or-later +* GPL-3.0-only +* GPL-3.0-or-later +* LGPL-2.1-only +* LGPL-2.1-or-later +* LGPL-3.0-only +* LGPL-3.0-or-later * MIT Optional, but it is highly recommended to supply this. More identifiers are listed at the [SPDX Open Source License Registry](https://www.spdx.org/licenses/). +!!!note + + If your project is proprietary and does not use a specific licence, you can set this value as `Proprietary`. + ## authors The authors of the package. **Required** @@ -127,11 +131,11 @@ it by using `format`: # ... packages = [ { include = "my_package" }, - { include = "tests", format = "sdist" }, + { include = "my_other_package", format = "sdist" }, ] ``` -From now on, only the `sdist` build archive will include the `tests` package. +From now on, only the `sdist` build archive will include the `my_other_package` package. !!!note @@ -264,7 +268,7 @@ any custom url in the `urls` section. ```toml [tool.poetry.urls] -"Bug Tracker" = "https://github.com/sdispater/poetry/issues" +"Bug Tracker" = "https://github.com/python-poetry/poetry/issues" ``` If you publish you package on PyPI, they will appear in the `Project Links` section. @@ -274,16 +278,22 @@ If you publish you package on PyPI, they will appear in the `Project Links` sect [PEP-517](https://www.python.org/dev/peps/pep-0517/) introduces a standard way to define alternative build systems to build a Python project. -Poetry is compliant with PEP-517 so if you use Poetry to manage your Python -project you should reference it in the `build-system` section of the `pyproject.toml` -file like so: +Poetry is compliant with PEP-517, by providing a lightweight core library, +so if you use Poetry to manage your Python project you should reference +it in the `build-system` section of the `pyproject.toml` file like so: ```toml [build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" +requires = ["poetry_core>=1.0.0"] +build-backend = "poetry.core.masonry.api" ``` !!!note When using the `new` or `init` command this section will be automatically added. + + +!!!note + + If your `pyproject.toml` file still references `poetry` directly as a build backend, + you should update it to reference `poetry_core` instead. diff --git a/docs/docs/repositories.md b/docs/docs/repositories.md index 73fb42f321b..d281f6ca77a 100644 --- a/docs/docs/repositories.md +++ b/docs/docs/repositories.md @@ -71,9 +71,19 @@ export POETRY_HTTP_BASIC_PYPI_USERNAME=username export POETRY_HTTP_BASIC_PYPI_PASSWORD=password ``` -See [Using environment variables](/configuration#using-environment-variables) for more information +See [Using environment variables](/docs/configuration/#using-environment-variables) for more information on how to configure Poetry with environment variables. +#### Custom certificate authority and mutual TLS authentication +Poetry supports repositories that are secured by a custom certificate authority as well as those that require +certificate-based client authentication. The following will configure the "foo" repository to validate the repository's +certificate using a custom certificate authority and use a client certificate (note that these config variables do not +both need to be set): +```bash + poetry config certificates.foo.cert /path/to/ca.pem + poetry config certificates.foo.client-cert /path/to/client.pem +``` + ### Install dependencies from a private repository Now that you can publish to your private repository, you need to be able to @@ -105,8 +115,10 @@ From now on, Poetry will also look for packages in your private repository. If your private repository requires HTTP Basic Auth be sure to add the username and password to your `http-basic` configuration using the example above (be sure to use the -same name that is in the `tool.poetry.source` section). Poetry will use these values -to authenticate to your private repository when downloading or looking for packages. +same name that is in the `tool.poetry.source` section). If your repository requires either +a custom certificate authority or client certificates, similarly refer to the example above to configure the +`certificates` section. Poetry will use these values to authenticate to your private repository when downloading or +looking for packages. ### Disabling the PyPI repository diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index ce69e560176..c35ef9579b4 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -14,7 +14,8 @@ nav: - Commands: cli.md - Configuration: configuration.md - Repositories: repositories.md - - Versions: versions.md + - Managing environments: managing-environments.md + - Dependency specification: dependency-specification.md - The pyproject.toml file: pyproject.md - Contributing: contributing.md - FAQ: faq.md @@ -25,3 +26,5 @@ markdown_extensions: - pymdownx.superfences - toc: permalink:  + - markdown_include.include: + base_path: docs diff --git a/docs/theme/main.html b/docs/theme/main.html index 7183cdfa01d..83151151ff6 100644 --- a/docs/theme/main.html +++ b/docs/theme/main.html @@ -6,7 +6,7 @@
-
+
    diff --git a/docs/theme/nav.html b/docs/theme/nav.html index 864a0f3acef..e9d2b383844 100644 --- a/docs/theme/nav.html +++ b/docs/theme/nav.html @@ -1,8 +1,4 @@ -{%- if nav_item.url %} {{ nav_item.title }} -{%- else %} -{{ nav_item.title }} -{%- endif %} {%- if nav_item == page or nav_item.children %}
      diff --git a/get-poetry.py b/get-poetry.py index e6cbe6db8fb..a29c385d1c6 100644 --- a/get-poetry.py +++ b/get-poetry.py @@ -1,5 +1,5 @@ """ -This script will install poetry and its dependencies +This script will install Poetry and its dependencies in isolation from the rest of the system. It does, in order: @@ -33,7 +33,9 @@ from contextlib import contextmanager from functools import cmp_to_key from gzip import GzipFile -from io import UnsupportedOperation, open +from io import UnsupportedOperation +from io import open + try: from urllib.error import HTTPError @@ -63,6 +65,7 @@ except NameError: u = str +SHELL = os.getenv("SHELL", "") WINDOWS = sys.platform.startswith("win") or (sys.platform == "cli" and os.name == "nt") @@ -194,15 +197,19 @@ def expanduser(path): POETRY_LIB_BACKUP = os.path.join(POETRY_HOME, "lib-backup") -BIN = """#!/usr/bin/env python -# -*- coding: utf-8 -*- +BIN = """# -*- coding: utf-8 -*- import glob import sys import os lib = os.path.normpath(os.path.join(os.path.realpath(__file__), "../..", "lib")) +vendors = os.path.join(lib, "poetry", "_vendor") +current_vendors = os.path.join( + vendors, "py{}".format(".".join(str(v) for v in sys.version_info[:2])) +) sys.path.insert(0, lib) +sys.path.insert(0, current_vendors) if __name__ == "__main__": from poetry.console import main @@ -210,7 +217,7 @@ def expanduser(path): main() """ -BAT = u('@echo off\r\npython "{poetry_bin}" %*\r\n') +BAT = u('@echo off\r\n{python_executable} "{poetry_bin}" %*\r\n') PRE_MESSAGE = """# Welcome to {poetry}! @@ -224,8 +231,7 @@ def expanduser(path): {platform_msg} -You can uninstall at any time with `poetry self:uninstall`, -or by executing this script with the --uninstall option, +You can uninstall at any time by executing this script with the --uninstall option, and these changes will be reverted. """ @@ -247,6 +253,9 @@ def expanduser(path): {rcfiles}""" +PRE_MESSAGE_FISH = """This path will then be added to your `PATH` environment variable by +modifying the `fish_user_paths` universal variable.""" + PRE_MESSAGE_WINDOWS = """This path will then be added to your `PATH` environment variable by modifying the `HKEY_CURRENT_USER/Environment/PATH` registry key.""" @@ -262,6 +271,12 @@ def expanduser(path): To configure your current shell run `source {poetry_home_env}` """ +POST_MESSAGE_FISH = """{poetry} ({version}) is installed now. Great! + +{poetry}'s bin directory ({poetry_home_bin}) has been added to your `PATH` +environment variable by modifying the `fish_user_paths` universal variable. +""" + POST_MESSAGE_WINDOWS = """{poetry} ({version}) is installed now. Great! To get started you need Poetry's bin directory ({poetry_home_bin}) in your `PATH` @@ -277,6 +292,15 @@ def expanduser(path): To configure your current shell run `source {poetry_home_env}` """ +POST_MESSAGE_FISH_NO_MODIFY_PATH = """{poetry} ({version}) is installed now. Great! + +To get started you need {poetry}'s bin directory ({poetry_home_bin}) +in your `PATH` environment variable, which you can add by running +the following command: + + set -U fish_user_paths {poetry_home_bin} $fish_user_paths +""" + POST_MESSAGE_WINDOWS_NO_MODIFY_PATH = """{poetry} ({version}) is installed now. Great! To get started you need Poetry's bin directory ({poetry_home_bin}) in your `PATH` @@ -299,21 +323,26 @@ class Installer: r"(?:\+[^\s]+)?" ) - BASE_URL = "https://github.com/sdispater/poetry/releases/download/" + REPOSITORY_URL = "https://github.com/python-poetry/poetry" + BASE_URL = REPOSITORY_URL + "/releases/download/" + FALLBACK_BASE_URL = "https://github.com/sdispater/poetry/releases/download/" def __init__( self, version=None, preview=False, force=False, + modify_path=True, accept_all=False, + file=None, base_url=BASE_URL, ): self._version = version self._preview = preview self._force = force - self._modify_path = True + self._modify_path = modify_path self._accept_all = accept_all + self._offline_file = file self._base_url = base_url def allows_prereleases(self): @@ -330,7 +359,9 @@ def run(self): self.ensure_home() try: - self.install(version, upgrade=current_version is not None) + self.install( + version, upgrade=current_version is not None, file=self._offline_file + ) except subprocess.CalledProcessError as e: print(colorize("error", "An error has occured: {}".format(str(e)))) print(e.output.decode()) @@ -351,6 +382,34 @@ def uninstall(self): self.remove_from_path() def get_version(self): + current_version = None + if os.path.exists(POETRY_LIB): + with open( + os.path.join(POETRY_LIB, "poetry", "__version__.py"), encoding="utf-8" + ) as f: + version_content = f.read() + + current_version_re = re.match( + '(?ms).*__version__ = "(.+)".*', version_content + ) + if not current_version_re: + print( + colorize( + "warning", + "Unable to get the current Poetry version. Assuming None", + ) + ) + else: + current_version = current_version_re.group(1) + + # Skip retrieving online release versions if install file is specified + if self._offline_file is not None: + if current_version is not None and not self._force: + print("There is a version of Poetry already installed.") + return None, current_version + + return "from an offline file", current_version + print(colorize("info", "Retrieving Poetry metadata")) metadata = json.loads(self._get(self.METADATA_URL).decode()) @@ -390,26 +449,6 @@ def _compare_versions(x, y): break - current_version = None - if os.path.exists(POETRY_LIB): - with open( - os.path.join(POETRY_LIB, "poetry", "__version__.py"), encoding="utf-8" - ) as f: - version_content = f.read() - - current_version_re = re.match( - '(?ms).*__version__ = "(.+)".*', version_content - ) - if not current_version_re: - print( - colorize( - "warning", - "Unable to get the current Poetry version. Assuming None", - ) - ) - else: - current_version = current_version_re.group(1) - if current_version == version and not self._force: print("Latest version already installed.") return None, current_version @@ -457,11 +496,14 @@ def remove_home(self): shutil.rmtree(POETRY_HOME) - def install(self, version, upgrade=False): + def install(self, version, upgrade=False, file=None): """ Installs Poetry in $POETRY_HOME. """ - print("Installing version: " + colorize("info", version)) + if file is not None: + print("Attempting to install from file: " + colorize("info", file)) + else: + print("Installing version: " + colorize("info", version)) self.make_lib(version) self.make_bin() @@ -497,6 +539,14 @@ def make_lib(self, version): shutil.rmtree(POETRY_LIB_BACKUP) def _make_lib(self, version): + # Check if an offline installer file has been specified + if self._offline_file is not None: + try: + self.extract_lib(self._offline_file) + return + except Exception: + raise RuntimeError("Could not install from offline file.") + # We get the payload from the remote host platform = sys.platform if platform == "linux2": @@ -556,30 +606,71 @@ def _make_lib(self, version): ) ) - gz = GzipFile(tar, mode="rb") + self.extract_lib(tar) + + def extract_lib(self, filename): + gz = GzipFile(filename, mode="rb") + try: + with tarfile.TarFile(filename, fileobj=gz, format=tarfile.PAX_FORMAT) as f: + f.extractall(POETRY_LIB) + finally: + gz.close() + + def _which_python(self): + """Decides which python executable we'll embed in the launcher script.""" + allowed_executables = ["python", "python3"] + if WINDOWS: + allowed_executables += ["py.exe -3", "py.exe -2"] + + # \d in regex ensures we can convert to int later + version_matcher = re.compile(r"^Python (?P\d+)\.(?P\d+)\..+$") + fallback = None + for executable in allowed_executables: try: - with tarfile.TarFile(tar, fileobj=gz, format=tarfile.PAX_FORMAT) as f: - f.extractall(POETRY_LIB) - finally: - gz.close() + raw_version = subprocess.check_output( + executable + " --version", stderr=subprocess.STDOUT, shell=True + ).decode("utf-8") + except subprocess.CalledProcessError: + continue + + match = version_matcher.match(raw_version.strip()) + if match and tuple(map(int, match.groups())) >= (3, 0): + # favor the first py3 executable we can find. + return executable + if fallback is None: + # keep this one as the fallback; it was the first valid executable we found. + fallback = executable + + if fallback is None: + raise RuntimeError( + "No python executable found in shell environment. Tried: " + + str(allowed_executables) + ) + + return fallback def make_bin(self): if not os.path.exists(POETRY_BIN): os.mkdir(POETRY_BIN, 0o755) + python_executable = self._which_python() + if WINDOWS: with open(os.path.join(POETRY_BIN, "poetry.bat"), "w") as f: f.write( u( BAT.format( + python_executable=python_executable, poetry_bin=os.path.join(POETRY_BIN, "poetry").replace( os.environ["USERPROFILE"], "%USERPROFILE%" - ) + ), ) ) ) with open(os.path.join(POETRY_BIN, "poetry"), "w", encoding="utf-8") as f: + if not WINDOWS: + f.write(u("#!/usr/bin/env {}\n".format(python_executable))) f.write(u(BIN)) if not WINDOWS: @@ -598,6 +689,12 @@ def update_path(self): """ Tries to update the $PATH automatically. """ + if not self._modify_path: + return + + if "fish" in SHELL: + return self.add_to_fish_path() + if WINDOWS: return self.add_to_windows_path() @@ -606,7 +703,6 @@ def update_path(self): addition = "\n{}\n".format(export_string) - updated = [] profiles = self.get_unix_profiles() for profile in profiles: if not os.path.exists(profile): @@ -619,7 +715,39 @@ def update_path(self): with open(profile, "a") as f: f.write(u(addition)) - updated.append(os.path.relpath(profile, HOME)) + def add_to_fish_path(self): + """ + Ensure POETRY_BIN directory is on Fish shell $PATH + """ + current_path = os.environ.get("PATH", None) + if current_path is None: + print( + colorize( + "warning", + "\nUnable to get the PATH value. It will not be updated automatically.", + ) + ) + self._modify_path = False + + return + + if POETRY_BIN not in current_path: + fish_user_paths = subprocess.check_output( + ["fish", "-c", "echo $fish_user_paths"] + ).decode("utf-8") + if POETRY_BIN not in fish_user_paths: + cmd = "set -U fish_user_paths {} $fish_user_paths".format(POETRY_BIN) + set_fish_user_path = ["fish", "-c", "{}".format(cmd)] + subprocess.check_output(set_fish_user_path) + else: + print( + colorize( + "warning", + "\nPATH already contains {} and thus was not modified.".format( + POETRY_BIN + ), + ) + ) def add_to_windows_path(self): try: @@ -681,11 +809,25 @@ def set_windows_path_var(self, value): ) def remove_from_path(self): - if WINDOWS: + if "fish" in SHELL: + return self.remove_from_fish_path() + + elif WINDOWS: return self.remove_from_windows_path() return self.remove_from_unix_path() + def remove_from_fish_path(self): + fish_user_paths = subprocess.check_output( + ["fish", "-c", "echo $fish_user_paths"] + ).decode("utf-8") + if POETRY_BIN in fish_user_paths: + cmd = "set -U fish_user_paths (string match -v {} $fish_user_paths)".format( + POETRY_BIN + ) + set_fish_user_path = ["fish", "-c", "{}".format(cmd)] + subprocess.check_output(set_fish_user_path) + def remove_from_windows_path(self): path = self.get_windows_path_var() @@ -737,8 +879,7 @@ def get_export_string(self): def get_unix_profiles(self): profiles = [os.path.join(HOME, ".profile")] - shell = os.getenv("SHELL", "") - if "zsh" in shell: + if "zsh" in SHELL: zdotdir = os.getenv("ZDOTDIR", HOME) profiles.append(os.path.join(zdotdir, ".zprofile")) @@ -762,7 +903,9 @@ def display_pre_message(self): if not self._modify_path: kwargs["platform_msg"] = PRE_MESSAGE_NO_MODIFY_PATH else: - if WINDOWS: + if "fish" in SHELL: + kwargs["platform_msg"] = PRE_MESSAGE_FISH + elif WINDOWS: kwargs["platform_msg"] = PRE_MESSAGE_WINDOWS else: profiles = [ @@ -805,6 +948,12 @@ def display_post_message(self, version): poetry_home_bin = POETRY_BIN.replace( os.getenv("USERPROFILE", ""), "%USERPROFILE%" ) + elif "fish" in SHELL: + message = POST_MESSAGE_FISH + if not self._modify_path: + message = POST_MESSAGE_FISH_NO_MODIFY_PATH + + poetry_home_bin = POETRY_BIN.replace(os.getenv("HOME", ""), "$HOME") else: message = POST_MESSAGE_UNIX if not self._modify_path: @@ -834,28 +983,75 @@ def main(): description="Installs the latest (or given) version of poetry" ) parser.add_argument( - "-p", "--preview", dest="preview", action="store_true", default=False + "-p", + "--preview", + help="install preview version", + dest="preview", + action="store_true", + default=False, + ) + parser.add_argument("--version", help="install named version", dest="version") + parser.add_argument( + "-f", + "--force", + help="install on top of existing version", + dest="force", + action="store_true", + default=False, ) - parser.add_argument("--version", dest="version") parser.add_argument( - "-f", "--force", dest="force", action="store_true", default=False + "--no-modify-path", + help="do not modify $PATH", + dest="no_modify_path", + action="store_true", + default=False, ) parser.add_argument( - "-y", "--yes", dest="accept_all", action="store_true", default=False + "-y", + "--yes", + help="accept all prompts", + dest="accept_all", + action="store_true", + default=False, ) parser.add_argument( - "--uninstall", dest="uninstall", action="store_true", default=False + "--uninstall", + help="uninstall poetry", + dest="uninstall", + action="store_true", + default=False, + ) + parser.add_argument( + "--file", + dest="file", + action="store", + help="Install from a local file instead of fetching the latest version " + "of Poetry available online.", ) args = parser.parse_args() + base_url = Installer.BASE_URL + + if args.file is None: + try: + urlopen(Installer.REPOSITORY_URL) + except HTTPError as e: + if e.code == 404: + base_url = Installer.FALLBACK_BASE_URL + else: + raise + installer = Installer( version=args.version or os.getenv("POETRY_VERSION"), preview=args.preview or string_to_bool(os.getenv("POETRY_PREVIEW", "0")), force=args.force, + modify_path=not args.no_modify_path, accept_all=args.accept_all or string_to_bool(os.getenv("POETRY_ACCEPT", "0")) or not is_interactive(), + file=args.file, + base_url=base_url, ) if args.uninstall or string_to_bool(os.getenv("POETRY_UNINSTALL", "0")): diff --git a/make-linux-release.sh b/make-linux-release.sh deleted file mode 100755 index 3607301ba33..00000000000 --- a/make-linux-release.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -PYTHON_VERSIONS="cp27-cp27m cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m" - -cd /io -/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 --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" -cd - diff --git a/make-nix-release.sh b/make-nix-release.sh new file mode 100755 index 00000000000..e5a368002bc --- /dev/null +++ b/make-nix-release.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +test -n "$PYTHON" || PYTHON="python3" +$PYTHON -m pip install pip -U +$PYTHON -m pip install poetry -U --pre +$PYTHON -m poetry config virtualenvs.create false +$PYTHON -m poetry install --no-dev +$PYTHON sonnet make release \ + ${PYTHON27:+-P "2.7:$PYTHON27"} \ + ${PYTHON35:+-P "3.5:$PYTHON35"} \ + ${PYTHON36:+-P "3.6:$PYTHON36"} \ + ${PYTHON37:+-P "3.7:$PYTHON37"} \ + ${PYTHON38:+-P "3.8:$PYTHON38"} diff --git a/poetry.lock b/poetry.lock index 9de654f830c..f9d7cb86873 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,20 +1,10 @@ [[package]] -category = "dev" +category = "main" description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -marker = "python_version >= \"3.6\" and python_version < \"4.0\"" name = "appdirs" optional = false python-versions = "*" -version = "1.4.3" - -[[package]] -category = "main" -description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" -name = "asn1crypto" -optional = false -python-versions = "*" -version = "0.24.0" +version = "1.4.4" [[package]] category = "dev" @@ -30,23 +20,39 @@ pyyaml = "*" [[package]] category = "dev" description = "Atomic file writes." +marker = "python_version >= \"3.5\" and sys_platform == \"win32\" or python_version < \"3.5\"" name = "atomicwrites" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.3.0" +version = "1.4.0" [[package]] -category = "main" +category = "dev" description = "Classes Without Boilerplate" +marker = "python_version < \"3.5\" or python_version >= \"3.5\" or python_version >= \"3.6\" and python_version < \"4.0\"" name = "attrs" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "19.1.0" +version = "19.3.0" [package.extras] -dev = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface", "sphinx", "pre-commit"] +azure-pipelines = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "pytest-azurepipelines"] +dev = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "pre-commit"] docs = ["sphinx", "zope.interface"] -tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface"] +tests = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] + +[[package]] +category = "dev" +description = "Backport of functools.lru_cache" +marker = "python_version < \"3.2\"" +name = "backports.functools-lru-cache" +optional = false +python-versions = ">=2.6" +version = "1.6.1" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] [[package]] category = "dev" @@ -55,13 +61,16 @@ marker = "python_version >= \"3.6\" and python_version < \"4.0\"" name = "black" optional = false python-versions = ">=3.6" -version = "19.3b0" +version = "19.10b0" [package.dependencies] appdirs = "*" attrs = ">=18.1.0" click = ">=6.5" +pathspec = ">=0.6,<1" +regex = "*" toml = ">=0.9.4" +typed-ast = ">=1.4.0" [package.extras] d = ["aiohttp (>=3.3.2)", "aiohttp-cors"] @@ -72,10 +81,10 @@ description = "httplib2 caching for requests" name = "cachecontrol" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.12.5" +version = "0.12.6" [package.dependencies] -msgpack = "*" +msgpack = ">=0.5.2" requests = "*" [package.dependencies.lockfile] @@ -105,16 +114,16 @@ description = "Python package for providing Mozilla's CA Bundle." name = "certifi" optional = false python-versions = "*" -version = "2019.9.11" +version = "2020.4.5.1" [[package]] category = "main" description = "Foreign Function Interface for Python calling C code." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"linux\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "cffi" optional = false python-versions = "*" -version = "1.12.3" +version = "1.14.0" [package.dependencies] pycparser = "*" @@ -130,6 +139,14 @@ version = "2.0.1" [package.dependencies] six = "*" +[[package]] +category = "dev" +description = "Validate configuration and produce human readable error messages." +name = "cfgv" +optional = false +python-versions = ">=3.6" +version = "3.0.0" + [[package]] category = "main" description = "Universal encoding detector for Python 2 and 3" @@ -144,10 +161,10 @@ description = "Cleo allows you to create beautiful and testable command-line int name = "cleo" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.7.5" +version = "0.8.1" [package.dependencies] -clikit = ">=0.3.1,<0.4.0" +clikit = ">=0.6.0,<0.7.0" [[package]] category = "dev" @@ -155,8 +172,8 @@ description = "Composable command line interface toolkit" marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"3.6\" and python_version < \"4.0\"" name = "click" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "7.0" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "7.1.2" [[package]] category = "main" @@ -164,12 +181,16 @@ description = "CliKit is a group of utilities to build beautiful and testable co name = "clikit" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.3.2" +version = "0.6.2" [package.dependencies] -pastel = ">=0.1.0,<0.2.0" +pastel = ">=0.2.0,<0.3.0" pylev = ">=1.3,<2.0" +[package.dependencies.crashtest] +python = ">=3.6,<4.0" +version = ">=0.3.0,<0.4.0" + [package.dependencies.enum34] python = ">=2.7,<2.8" version = ">=1.1,<2.0" @@ -178,19 +199,23 @@ version = ">=1.1,<2.0" python = ">=2.7,<2.8 || >=3.4,<3.5" version = ">=3.6,<4.0" +[package.dependencies.typing-extensions] +python = ">=3.5,<3.5.4" +version = ">=3.6,<4.0" + [[package]] category = "dev" description = "Cross-platform colored terminal text." -marker = "sys_platform == \"win32\"" +marker = "sys_platform == \"win32\" and python_version != \"3.4\" and python_version < \"3.5\" or platform_system == \"Windows\" or python_version >= \"3.5\" and sys_platform == \"win32\"" name = "colorama" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.4.1" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "0.4.3" [[package]] category = "main" description = "Updated configparser from Python 3.7 for Python 2.6+." -marker = "python_version == \"2.7\" and python_version < \"2.8\" or python_version < \"3\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version == \"2.7\" and python_version == \"2.7\" or python_version < \"3\"" name = "configparser" optional = false python-versions = ">=2.6" @@ -201,33 +226,44 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] [[package]] -category = "dev" +category = "main" description = "Backports and enhancements for the contextlib module" -marker = "python_version < \"3\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.4\"" name = "contextlib2" optional = false -python-versions = "*" -version = "0.5.5" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.6.0.post1" [[package]] category = "dev" description = "Code coverage measurement for Python" name = "coverage" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" -version = "4.5.4" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" +version = "5.1" + +[package.extras] +toml = ["toml"] + +[[package]] +category = "main" +description = "Manage Python errors with ease" +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "crashtest" +optional = false +python-versions = ">=3.6,<4.0" +version = "0.3.0" [[package]] category = "main" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"linux\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "cryptography" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "2.7" +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" +version = "2.9.2" [package.dependencies] -asn1crypto = ">=0.21.0" cffi = ">=1.8,<1.11.3 || >1.11.3" six = ">=1.4.1" @@ -246,10 +282,18 @@ idna = ["idna (>=2.1)"] pep8test = ["flake8", "flake8-import-order", "pep8-naming"] test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] +[[package]] +category = "main" +description = "Distribution utilities" +name = "distlib" +optional = false +python-versions = "*" +version = "0.3.0" + [[package]] category = "main" description = "Discover and load entry points from installed packages." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version >= \"3.5\" and python_version < \"4.0\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\"" name = "entrypoints" optional = false python-versions = ">=2.7" @@ -267,10 +311,10 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_versi name = "enum34" optional = false python-versions = "*" -version = "1.1.6" +version = "1.1.10" [[package]] -category = "dev" +category = "main" description = "A platform independent file lock." name = "filelock" optional = false @@ -289,12 +333,21 @@ version = "1.0.2" [[package]] category = "main" description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\"" name = "functools32" optional = false python-versions = "*" version = "3.2.3-2" +[[package]] +category = "dev" +description = "Clean single-source support for Python 3 and 2" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "future" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +version = "0.18.2" + [[package]] category = "dev" description = "Backport of the concurrent.futures package from Python 3" @@ -307,7 +360,7 @@ version = "3.3.0" [[package]] category = "main" description = "Version of the glob module that can capture patterns and supports recursive wildcards" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\"" name = "glob2" optional = false python-versions = "*" @@ -338,7 +391,7 @@ description = "HTTP client mock for Python" name = "httpretty" optional = false python-versions = "*" -version = "0.9.6" +version = "0.9.7" [package.dependencies] six = "*" @@ -348,8 +401,8 @@ category = "dev" description = "File identification library for Python" name = "identify" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.4.7" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "1.4.19" [package.extras] license = ["editdistance"] @@ -360,15 +413,16 @@ description = "Internationalized Domain Names in Applications (IDNA)" name = "idna" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.8" +version = "2.9" [[package]] -category = "dev" +category = "main" description = "Read metadata from Python packages" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.8\" or python_version >= \"3.5\" and python_version < \"3.6\" or python_version >= \"3.5\" and python_version < \"3.8\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"3.8\" or python_version >= \"3.6\" and python_version < \"3.8\"" name = "importlib-metadata" optional = false -python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" -version = "0.23" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "1.6.0" [package.dependencies] zipp = ">=0.5" @@ -381,28 +435,51 @@ version = ">=3.5" python = "<3" version = "*" +[package.dependencies.pathlib2] +python = "<3" +version = "*" + [package.extras] docs = ["sphinx", "rst.linker"] testing = ["packaging", "importlib-resources"] [[package]] -category = "dev" +category = "main" description = "Read resources from Python packages" -marker = "python_version < \"3.7\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.7\"" name = "importlib-resources" optional = false -python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" -version = "1.0.2" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "1.5.0" [package.dependencies] +[package.dependencies.contextlib2] +python = "<3" +version = "*" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + [package.dependencies.pathlib2] python = "<3" version = "*" +[package.dependencies.singledispatch] +python = "<3.4" +version = "*" + [package.dependencies.typing] python = "<3.5" version = "*" +[package.dependencies.zipp] +python = "<3.8" +version = ">=0.4" + +[package.extras] +docs = ["sphinx", "rst.linker", "jaraco.packaging"] + [[package]] category = "main" description = "IPv4/IPv6 manipulation library" @@ -410,28 +487,28 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platfo name = "ipaddress" optional = false python-versions = "*" -version = "1.0.22" +version = "1.0.23" [[package]] category = "main" description = "Low-level, pure Python DBus protocol wrapper." -marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +marker = "python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"linux\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "jeepney" optional = false python-versions = ">=3.5" -version = "0.4.1" +version = "0.4.3" [package.extras] dev = ["testpath"] [[package]] category = "dev" -description = "A small but fast and easy to use stand-alone template engine written in pure python." +description = "A very fast and expressive template engine." marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" name = "jinja2" optional = false -python-versions = "*" -version = "2.10.1" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.11.2" [package.dependencies] MarkupSafe = ">=0.23" @@ -440,30 +517,27 @@ MarkupSafe = ">=0.23" i18n = ["Babel (>=0.8)"] [[package]] -category = "main" -description = "An implementation of JSON Schema validation for Python" -name = "jsonschema" +category = "dev" +description = "Lightweight pipelining: using Python functions as pipeline jobs." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "joblib" optional = false python-versions = "*" -version = "3.0.2" +version = "0.14.1" -[package.dependencies] -attrs = ">=17.4.0" -pyrsistent = ">=0.14.0" -setuptools = "*" -six = ">=1.11.0" - -[package.dependencies.functools32] -python = "<3" -version = "*" - -[package.extras] -format = ["idna", "jsonpointer (>1.13)", "rfc3987", "strict-rfc3339", "webcolors"] +[[package]] +category = "dev" +description = "Lightweight pipelining: using Python functions as pipeline jobs." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "joblib" +optional = false +python-versions = ">=3.6" +version = "0.15.1" [[package]] category = "main" description = "Store and access your passwords safely." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\"" name = "keyring" optional = false python-versions = ">=2.7" @@ -484,20 +558,45 @@ testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8 [[package]] category = "main" description = "Store and access your passwords safely." -marker = "python_version >= \"3.5\" and python_version < \"4.0\"" +marker = "python_version >= \"3.5\" and python_version < \"3.6\"" name = "keyring" optional = false python-versions = ">=3.5" -version = "19.2.0" +version = "20.0.1" [package.dependencies] -entrypoints = "*" pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" secretstorage = "*" +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8", "pytest-black-multipy"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] + +[[package]] +category = "main" +description = "Store and access your passwords safely." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "keyring" +optional = false +python-versions = ">=3.6" +version = "21.2.1" + +[package.dependencies] +SecretStorage = ">=3" +jeepney = ">=0.4.2" +pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black (>=0.3.7)", "pytest-cov"] [[package]] category = "dev" @@ -515,7 +614,6 @@ tornado = "*" [[package]] category = "main" description = "Platform-independent file locking module" -marker = "extra == \"filecache\"" name = "lockfile" optional = false python-versions = "*" @@ -523,11 +621,24 @@ version = "0.12.2" [[package]] category = "dev" -description = "Python implementation of Markdown." -name = "markdown" +description = "A Python implementation of Lunr.js" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "lunr" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" -version = "3.0.1" +python-versions = "*" +version = "0.5.8" + +[package.dependencies] +future = ">=0.16.0" +six = ">=1.11.0" + +[package.dependencies.nltk] +optional = true +python = ">=2.8" +version = ">=3.2.5" + +[package.extras] +languages = ["nltk (>=3.2.5,<3.5)", "nltk (>=3.2.5)"] [[package]] category = "dev" @@ -543,6 +654,33 @@ setuptools = ">=36" [package.extras] testing = ["coverage", "pyyaml"] +[[package]] +category = "dev" +description = "Python implementation of Markdown." +name = "markdown" +optional = false +python-versions = ">=3.5" +version = "3.2.2" + +[package.dependencies] +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + +[package.extras] +testing = ["coverage", "pyyaml"] + +[[package]] +category = "dev" +description = "This is an extension to Python-Markdown which provides an \"include\" function, similar to that found in LaTeX (and also the C pre-processor and Fortran). I originally wrote it for my FORD Fortran auto-documentation generator." +name = "markdown-include" +optional = false +python-versions = "*" +version = "0.5.1" + +[package.dependencies] +markdown = "*" + [[package]] category = "dev" description = "Safely add untrusted strings to HTML/XML markup." @@ -569,6 +707,27 @@ click = ">=3.3" livereload = ">=2.5.1" tornado = ">=5.0" +[[package]] +category = "dev" +description = "Project documentation with Markdown." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "mkdocs" +optional = false +python-versions = ">=3.5" +version = "1.1.2" + +[package.dependencies] +Jinja2 = ">=2.10.1" +Markdown = ">=3.2.1" +PyYAML = ">=3.10" +click = ">=3.3" +livereload = ">=2.5.1" +tornado = ">=5.0" + +[package.dependencies.lunr] +extras = ["languages"] +version = "0.5.8" + [[package]] category = "dev" description = "Rolling backport of unittest.mock for all Pythons" @@ -593,6 +752,7 @@ test = ["pytest", "pytest-cov"] [[package]] category = "dev" description = "More routines for operating on iterables, beyond itertools" +marker = "python_version <= \"2.7\"" name = "more-itertools" optional = false python-versions = "*" @@ -604,10 +764,11 @@ six = ">=1.0.0,<2.0.0" [[package]] category = "dev" description = "More routines for operating on iterables, beyond itertools" +marker = "python_version >= \"3.5\"" name = "more-itertools" optional = false -python-versions = ">=3.4" -version = "7.2.0" +python-versions = ">=3.5" +version = "8.3.0" [[package]] category = "main" @@ -615,7 +776,30 @@ description = "MessagePack (de)serializer." name = "msgpack" optional = false python-versions = "*" -version = "0.6.2" +version = "1.0.0" + +[[package]] +category = "dev" +description = "Natural Language Toolkit" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "nltk" +optional = false +python-versions = "*" +version = "3.5" + +[package.dependencies] +click = "*" +joblib = "*" +regex = "*" +tqdm = "*" + +[package.extras] +all = ["requests", "numpy", "python-crfsuite", "scikit-learn", "twython", "pyparsing", "scipy", "matplotlib", "gensim"] +corenlp = ["requests"] +machine_learning = ["gensim", "numpy", "python-crfsuite", "scikit-learn", "scipy"] +plot = ["matplotlib"] +tgrep = ["pyparsing"] +twitter = ["twython"] [[package]] category = "dev" @@ -623,7 +807,7 @@ description = "Node.js virtual environment builder" name = "nodeenv" optional = false python-versions = "*" -version = "1.3.3" +version = "1.4.0" [[package]] category = "dev" @@ -631,7 +815,7 @@ description = "Core utilities for Python packages" name = "packaging" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "19.2" +version = "20.4" [package.dependencies] pyparsing = ">=2.0.2" @@ -643,16 +827,16 @@ description = "Bring colors to your terminal." name = "pastel" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.1.1" +version = "0.2.0" [[package]] category = "main" description = "Object-oriented filesystem paths" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.6\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform != \"win32\" or python_version < \"3.5\" or python_version >= \"3.5\" and python_version < \"3.6\"" name = "pathlib2" optional = false python-versions = "*" -version = "2.3.4" +version = "2.3.5" [package.dependencies] six = "*" @@ -661,6 +845,15 @@ six = "*" python = "<3.5" version = "*" +[[package]] +category = "dev" +description = "Utility library for gitignore style pattern matching of file paths." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "pathspec" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "0.8.0" + [[package]] category = "dev" description = "Backport of PEP 562." @@ -675,7 +868,7 @@ description = "Pexpect allows easy control of interactive console applications." name = "pexpect" optional = false python-versions = "*" -version = "4.7.0" +version = "4.8.0" [package.dependencies] ptyprocess = ">=0.5" @@ -697,7 +890,7 @@ description = "plugin and hook calling mechanisms for python" name = "pluggy" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.13.0" +version = "0.13.1" [package.dependencies] [package.dependencies.importlib-metadata] @@ -707,19 +900,43 @@ version = ">=0.12" [package.extras] dev = ["pre-commit", "tox"] +[[package]] +category = "main" +description = "Core utilities for Poetry" +name = "poetry-core" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "1.0.0a7" + +[package.dependencies] +[package.dependencies.enum34] +python = ">=2.7,<2.8" +version = ">=1.1.10,<2.0.0" + +[package.dependencies.functools32] +python = ">=2.7,<2.8" +version = ">=3.2.3-2,<4.0.0" + +[package.dependencies.pathlib2] +python = ">=2.7,<2.8" +version = ">=2.3.5,<3.0.0" + +[package.dependencies.typing] +python = ">=2.7,<2.8" +version = ">=3.7.4.1,<4.0.0.0" + [[package]] category = "dev" description = "A framework for managing and maintaining multi-language pre-commit hooks." name = "pre-commit" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.18.3" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "1.21.0" [package.dependencies] "aspy.yaml" = "*" cfgv = ">=2.0.0" identify = ">=1.0.0" -importlib-metadata = "*" nodeenv = ">=0.11.1" pyyaml = "*" six = "*" @@ -730,6 +947,10 @@ virtualenv = ">=15.2" python = "<3.2" version = "*" +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + [package.dependencies.importlib-resources] python = "<3.7" version = "*" @@ -748,32 +969,32 @@ description = "library with cross-python path, ini-parsing, io, code, log facili name = "py" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.8.0" +version = "1.8.1" [[package]] category = "main" description = "C parser in Python" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"linux\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "pycparser" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.19" +version = "2.20" [[package]] category = "dev" description = "Pygments is a syntax highlighting package written in Python." name = "pygments" optional = false -python-versions = "*" -version = "2.3.1" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.5.2" [[package]] category = "dev" description = "Pygments is a syntax highlighting package written in Python." name = "pygments" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.4.2" +python-versions = ">=3.5" +version = "2.6.1" [[package]] category = "dev" @@ -799,11 +1020,12 @@ category = "dev" description = "Extension pack for Python Markdown." name = "pymdown-extensions" optional = false -python-versions = "*" -version = "6.0" +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" +version = "6.2.1" [package.dependencies] Markdown = ">=3.0.1" +pep562 = "*" [[package]] category = "dev" @@ -811,62 +1033,52 @@ description = "Extension pack for Python Markdown." name = "pymdown-extensions" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" -version = "6.1" +version = "6.3" [package.dependencies] -Markdown = ">=3.0.1" -pep562 = "*" +Markdown = ">=3.2" [[package]] -category = "main" +category = "dev" description = "Python parsing module" name = "pyparsing" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" -version = "2.4.2" - -[[package]] -category = "main" -description = "Persistent/Functional/Immutable data structures" -name = "pyrsistent" -optional = false -python-versions = "*" -version = "0.14.11" - -[package.dependencies] -six = "*" +version = "2.4.7" [[package]] category = "dev" description = "pytest: simple powerful testing with Python" name = "pytest" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "4.6.5" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "4.6.11" [package.dependencies] atomicwrites = ">=1.0" attrs = ">=17.4.0" -colorama = "*" -importlib-metadata = ">=0.12" packaging = "*" pluggy = ">=0.12,<1.0" py = ">=1.5.0" six = ">=1.10.0" wcwidth = "*" -[[package.dependencies.more-itertools]] -python = "<2.8" -version = ">=4.0.0,<6.0.0" - -[[package.dependencies.more-itertools]] -python = ">=2.8" -version = ">=4.0.0" +[package.dependencies.colorama] +python = "<3.4.0 || >=3.5.0" +version = "*" [package.dependencies.funcsigs] python = "<3.0" version = ">=1.0" +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + +[package.dependencies.more-itertools] +python = "<2.8" +version = ">=4.0.0,<6.0.0" + [package.dependencies.pathlib2] python = "<3.6" version = ">=2.2.0" @@ -874,20 +1086,50 @@ version = ">=2.2.0" [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "nose", "requests", "mock"] +[[package]] +category = "dev" +description = "pytest: simple powerful testing with Python" +name = "pytest" +optional = false +python-versions = ">=3.5" +version = "5.4.3" + +[package.dependencies] +atomicwrites = ">=1.0" +attrs = ">=17.4.0" +colorama = "*" +more-itertools = ">=4.0.0" +packaging = "*" +pluggy = ">=0.12,<1.0" +py = ">=1.5.0" +wcwidth = "*" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + +[package.dependencies.pathlib2] +python = "<3.6" +version = ">=2.2.0" + +[package.extras] +checkqa-mypy = ["mypy (v0.761)"] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] + [[package]] category = "dev" description = "Pytest plugin for measuring coverage." name = "pytest-cov" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.7.1" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.9.0" [package.dependencies] coverage = ">=4.4" pytest = ">=3.6" [package.extras] -testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "virtualenv"] +testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"] [[package]] category = "dev" @@ -895,7 +1137,7 @@ description = "Thin-wrapper around the mock package for easier use with py.test" name = "pytest-mock" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "1.10.4" +version = "1.13.0" [package.dependencies] pytest = ">=2.7" @@ -913,7 +1155,7 @@ description = "pytest-sugar is a plugin for pytest that changes the default look name = "pytest-sugar" optional = false python-versions = "*" -version = "0.9.2" +version = "0.9.3" [package.dependencies] packaging = ">=14.1" @@ -923,7 +1165,7 @@ termcolor = ">=1.1.0" [[package]] category = "main" description = "" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform == \"win32\" or python_version >= \"3.4\" and python_version < \"3.5\" and sys_platform == \"win32\" or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"win32\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform == \"win32\" or python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"win32\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"win32\"" name = "pywin32-ctypes" optional = false python-versions = "*" @@ -934,26 +1176,17 @@ category = "dev" description = "YAML parser and emitter for Python" name = "pyyaml" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "5.1.2" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "5.3.1" [[package]] -category = "main" -description = "Python HTTP for Humans." -name = "requests" +category = "dev" +description = "Alternative regular expression module, to replace re." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"3.6\" and python_version < \"4.0\"" +name = "regex" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "2.21.0" - -[package.dependencies] -certifi = ">=2017.4.17" -chardet = ">=3.0.2,<3.1.0" -idna = ">=2.5,<2.9" -urllib3 = ">=1.21.1,<1.25" - -[package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] +python-versions = "*" +version = "2020.5.14" [[package]] category = "main" @@ -961,16 +1194,16 @@ description = "Python HTTP for Humans." name = "requests" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -version = "2.22.0" +version = "2.23.0" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<3.1.0" -idna = ">=2.5,<2.9" +chardet = ">=3.0.2,<4" +idna = ">=2.5,<3" urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] [[package]] @@ -987,7 +1220,7 @@ requests = ">=2.0.1,<3.0.0" [[package]] category = "main" description = "scandir, a better directory iterator and faster os.walk()" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform != \"win32\"" name = "scandir" optional = false python-versions = "*" @@ -996,7 +1229,7 @@ version = "1.10.0" [[package]] category = "main" description = "Python bindings to FreeDesktop.org Secret Service API" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" name = "secretstorage" optional = false python-versions = "*" @@ -1011,36 +1244,48 @@ dbus-python = ["dbus-python"] [[package]] category = "main" description = "Python bindings to FreeDesktop.org Secret Service API" -marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +marker = "python_version >= \"3.5\" and python_version < \"3.6\" and sys_platform == \"linux\" or python_version >= \"3.6\" and python_version < \"4.0\" and sys_platform == \"linux\"" name = "secretstorage" optional = false python-versions = ">=3.5" -version = "3.1.1" +version = "3.1.2" [package.dependencies] cryptography = "*" -jeepney = "*" +jeepney = ">=0.4.2" [[package]] category = "main" description = "Tool to Detect Surrounding Shell" name = "shellingham" optional = false -python-versions = ">=2.6,!=3.0,!=3.1,!=3.2,!=3.3" -version = "1.3.1" +python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" +version = "1.3.2" + +[[package]] +category = "main" +description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.4\" or python_version >= \"2.7\" and python_version < \"2.8\" and (python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.4\")" +name = "singledispatch" +optional = false +python-versions = "*" +version = "3.4.0.3" + +[package.dependencies] +six = "*" [[package]] category = "main" description = "Python 2 and 3 compatibility utilities" name = "six" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*" -version = "1.12.0" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +version = "1.15.0" [[package]] category = "main" description = "A backport of the subprocess module from Python 3 for use on 2.x." -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\"" name = "subprocess32" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" @@ -1060,7 +1305,7 @@ description = "Python Library for Tom's Obvious, Minimal Language" name = "toml" optional = false python-versions = "*" -version = "0.10.0" +version = "0.10.1" [[package]] category = "main" @@ -1068,7 +1313,7 @@ description = "Style preserving TOML library" name = "tomlkit" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "0.5.5" +version = "0.5.11" [package.dependencies] [package.dependencies.enum34] @@ -1086,7 +1331,7 @@ version = ">=3.6,<4.0" [[package]] category = "dev" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" name = "tornado" optional = false python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*" @@ -1095,41 +1340,63 @@ version = "5.1.1" [[package]] category = "dev" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" and python_full_version >= \"2.7.9\" and python_full_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" name = "tornado" optional = false python-versions = ">= 3.5" -version = "6.0.3" +version = "6.0.4" [[package]] category = "dev" description = "tox is a generic virtualenv management and test command line tool" name = "tox" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "3.14.0" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "3.15.1" [package.dependencies] -filelock = ">=3.0.0,<4" +colorama = ">=0.4.1" +filelock = ">=3.0.0" packaging = ">=14" -pluggy = ">=0.12.0,<1" -py = ">=1.4.17,<2" -six = ">=1.0.0,<2" +pluggy = ">=0.12.0" +py = ">=1.4.17" +six = ">=1.14.0" toml = ">=0.9.4" -virtualenv = ">=14.0.0" +virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7" [package.dependencies.importlib-metadata] python = "<3.8" -version = ">=0.12,<1" +version = ">=0.12,<2" + +[package.extras] +docs = ["sphinx (>=2.0.0)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] +testing = ["freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-xdist (>=1.22.2)", "pytest-randomly (>=1.0.0)", "flaky (>=3.4.0)", "psutil (>=5.6.1)"] + +[[package]] +category = "dev" +description = "Fast, Extensible Progress Meter" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "tqdm" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*" +version = "4.46.1" [package.extras] -docs = ["sphinx (>=2.0.0,<3)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] -testing = ["freezegun (>=0.3.11,<1)", "pathlib2 (>=2.3.3,<3)", "pytest (>=4.0.0,<6)", "pytest-cov (>=2.5.1,<3)", "pytest-mock (>=1.10.0,<2)", "pytest-xdist (>=1.22.2,<2)", "pytest-randomly (>=1.2.3,<2)", "flaky (>=3.4.0,<4)", "psutil (>=5.6.1,<6)"] +dev = ["py-make (>=0.1.0)", "twine", "argopt", "pydoc-markdown"] + +[[package]] +category = "dev" +description = "a fork of Python 2 and 3 ast modules with type comment support" +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "typed-ast" +optional = false +python-versions = "*" +version = "1.4.1" [[package]] category = "main" description = "Type Hints for Python" -marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" name = "typing" optional = false python-versions = "*" @@ -1137,27 +1404,24 @@ version = "3.7.4.1" [[package]] category = "main" -description = "HTTP library with thread-safe connection pooling, file post, and more." -name = "urllib3" +description = "Backported and Experimental Type Hints for Python 3.5+" +marker = "python_version >= \"3.5\" and python_full_version < \"3.5.4\"" +name = "typing-extensions" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" -version = "1.24.3" - -[package.extras] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] +python-versions = "*" +version = "3.7.4.2" [[package]] category = "main" description = "HTTP library with thread-safe connection pooling, file post, and more." name = "urllib3" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" -version = "1.25.5" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" +version = "1.25.9" [package.extras] brotli = ["brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "pyOpenSSL (>=0.14)", "ipaddress"] socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] [[package]] @@ -1165,20 +1429,48 @@ category = "main" description = "Virtual Python Environment builder" name = "virtualenv" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -version = "16.7.5" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "20.0.21" + +[package.dependencies] +appdirs = ">=1.4.3,<2" +distlib = ">=0.3.0,<1" +filelock = ">=3.0.0,<4" +six = ">=1.9.0,<2" + +[package.dependencies.contextlib2] +python = "<3.3" +version = ">=0.6.0,<1" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12,<2" + +[package.dependencies.importlib-resources] +python = "<3.7" +version = ">=1.0,<2" + +[package.dependencies.pathlib2] +python = "<3.4" +version = ">=2.3.3,<3" [package.extras] -docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"] -testing = ["pytest (>=4.0.0,<5)", "coverage (>=4.5.0,<5)", "pytest-timeout (>=1.3.0,<2)", "six (>=1.10.0,<2)", "pytest-xdist", "pytest-localserver", "pypiserver", "mock", "xonsh"] +docs = ["sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)", "proselint (>=0.10.2)"] +testing = ["pytest (>=4)", "coverage (>=5)", "coverage-enable-subprocess (>=1)", "pytest-xdist (>=1.31.0)", "pytest-mock (>=2)", "pytest-env (>=0.6.2)", "pytest-randomly (>=1)", "pytest-timeout", "packaging (>=20.0)", "xonsh (>=0.9.16)"] [[package]] category = "dev" -description = "Measures number of Terminal column cells of wide-character codes" +description = "Measures the displayed width of unicode strings in a terminal" +marker = "python_version < \"3.5\" or python_version >= \"3.5\"" name = "wcwidth" optional = false python-versions = "*" -version = "0.1.7" +version = "0.2.3" + +[package.dependencies] +[package.dependencies."backports.functools-lru-cache"] +python = "<3.2" +version = ">=1.2.1" [[package]] category = "main" @@ -1189,110 +1481,640 @@ python-versions = "*" version = "0.5.1" [[package]] -category = "dev" +category = "main" description = "Backport of pathlib-compatible object wrapper for zip files" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3.8\" or python_version >= \"3.5\" and python_version < \"3.6\" or python_version >= \"3.5\" and python_version < \"3.8\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"3.8\"" name = "zipp" optional = false python-versions = ">=2.7" -version = "0.6.0" +version = "1.2.0" [package.dependencies] -more-itertools = "*" +[package.dependencies.contextlib2] +python = "<3.4" +version = "*" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] + +[[package]] +category = "main" +description = "Backport of pathlib-compatible object wrapper for zip files" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.6\" and python_version < \"3.8\" or python_version < \"3.8\" or python_version >= \"3.5\" and python_version < \"3.8\" or python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"3.8\"" +name = "zipp" +optional = false +python-versions = ">=3.6" +version = "3.1.0" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pathlib2", "contextlib2", "unittest2"] +testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "fef0a14e6eed6d3fd20670fe4c048b1f17bc12a08a8b8a5482dfcff6f569cb1d" -python-versions = "~2.7 || ^3.4" - -[metadata.hashes] -appdirs = ["9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92", "d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"] -asn1crypto = ["2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87", "9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"] -"aspy.yaml" = ["463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc", "e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45"] -atomicwrites = ["03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"] -attrs = ["69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", "f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399"] -black = ["09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf", "68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c"] -cachecontrol = ["cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"] -cachy = ["186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1", "338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"] -certifi = ["e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50", "fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"] -cffi = ["041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774", "046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d", "066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90", "066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b", "2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63", "300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45", "34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25", "46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3", "4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b", "4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647", "4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016", "50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4", "55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb", "5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753", "59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7", "73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9", "a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f", "a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8", "a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f", "a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc", "ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42", "b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3", "d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909", "d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45", "dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d", "e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512", "e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff", "ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201"] -cfgv = ["edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144", "fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"] -chardet = ["84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", "fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"] -cleo = ["2f1cfd55a4b30c002ef86d740ededc9c11d6f89ea0dc56a14abe5aaf32c2015c", "6c28adbb0815b99e530bb4f783602459ab916c76c4db26c7b934223014eb1a34"] -click = ["2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"] -clikit = ["229d259b9ec7adb6ce668aed70059ff79058b22794b958c178c50ece6ade5871", "b5034efd4dadb65e71544f978c70628dc56df4b0b47b0e6a7e521347dfc07fdf"] -colorama = ["05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", "f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"] -configparser = ["254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c", "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"] -contextlib2 = ["509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48", "f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00"] -coverage = ["08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", "0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", "141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", "19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", "23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", "245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", "331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", "386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", "3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", "60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", "63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", "6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", "6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", "7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", "826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", "93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", "9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", "af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", "bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", "bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", "c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", "dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", "df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", "e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", "e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", "eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", "eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", "ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", "efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", "fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", "ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"] -cryptography = ["24b61e5fcb506424d3ec4e18bca995833839bf13c59fc43e530e488f28d46b8c", "25dd1581a183e9e7a806fe0543f485103232f940fcfc301db65e630512cce643", "3452bba7c21c69f2df772762be0066c7ed5dc65df494a1d53a58b683a83e1216", "41a0be220dd1ed9e998f5891948306eb8c812b512dc398e5a01846d855050799", "5751d8a11b956fbfa314f6553d186b94aa70fdb03d8a4d4f1c82dcacf0cbe28a", "5f61c7d749048fa6e3322258b4263463bfccefecb0dd731b6561cb617a1d9bb9", "72e24c521fa2106f19623a3851e9f89ddfdeb9ac63871c7643790f872a305dfc", "7b97ae6ef5cba2e3bb14256625423413d5ce8d1abb91d4f29b6d1a081da765f8", "961e886d8a3590fd2c723cf07be14e2a91cf53c25f02435c04d39e90780e3b53", "96d8473848e984184b6728e2c9d391482008646276c3ff084a1bd89e15ff53a1", "ae536da50c7ad1e002c3eee101871d93abdc90d9c5f651818450a0d3af718609", "b0db0cecf396033abb4a93c95d1602f268b3a68bb0a9cc06a7cff587bb9a7292", "cfee9164954c186b191b91d4193989ca994703b2fff406f71cf454a2d3c7327e", "e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6", "f27d93f0139a3c056172ebb5d4f9056e770fdf0206c2f422ff2ebbad142e09ed", "f57b76e46a58b63d1c6375017f4564a28f19a5ca912691fd2e4261b3414b618d"] -entrypoints = ["589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", "c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"] -enum34 = ["2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850", "644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a", "6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"] -filelock = ["18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", "929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"] -funcsigs = ["330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"] -functools32 = ["89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0", "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"] -futures = ["49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16", "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"] -glob2 = ["f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"] -html5lib = ["20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3", "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"] -httpretty = ["01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc"] -identify = ["4f1fe9a59df4e80fcb0213086fcf502bc1765a01ea4fe8be48da3b65afd2a017", "d8919589bd2a5f99c66302fec0ef9027b12ae150b0b0213999ad3f695fc7296e"] -idna = ["c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", "ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"] -importlib-metadata = ["aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26", "d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af"] -importlib-resources = ["6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b", "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"] -ipaddress = ["64b28eec5e78e7510698f6d4da08800a5c575caa4a286c93d651c5d3ff7b6794", "b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c"] -jeepney = ["13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb", "f6a3f93464a0cf052f4e87da3c8b3ed1e27696758fb9739c63d3a74d9a1b6774"] -jinja2 = ["065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", "14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b"] -jsonschema = ["5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f", "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d"] -keyring = ["67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838", "7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6", "91037ccaf0c9a112a76f7740e4a416b9457a69b66c2799421581bee710a974b3", "f5bb20ea6c57c2360daf0c591931c9ea0d7660a8d9e32ca84d63273f131ea605"] -livereload = ["78d55f2c268a8823ba499305dcac64e28ddeb9a92571e12d543cd304faf5817b", "89254f78d7529d7ea0a3417d224c34287ebfe266b05e67e51facaf82c27f0f66"] -lockfile = ["6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799", "6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"] -markdown = ["c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa", "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c", "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", "56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"] -markupsafe = ["00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", "09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", "24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", "62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", "6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", "7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", "88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", "8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", "98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", "9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", "9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", "ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", "b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", "b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", "b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", "ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", "e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"] -mkdocs = ["17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939", "8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"] -mock = ["83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3", "d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"] -more-itertools = ["38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4", "c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc", "fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9", "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832", "92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"] -msgpack = ["0cc7ca04e575ba34fea7cfcd76039f55def570e6950e4155a4174368142c8e1b", "187794cd1eb73acccd528247e3565f6760bd842d7dc299241f830024a7dd5610", "1904b7cb65342d0998b75908304a03cb004c63ef31e16c8c43fee6b989d7f0d7", "24149a75643aeaa81ece4259084d11b792308a6cf74e796cbb35def94c89a25a", "30b88c47e0cdb6062daed88ca283b0d84fa0d2ad6c273aa0788152a1c643e408", "355f7fd0f90134229eaeefaee3cf42e0afc8518e8f3cd4b25f541a7104dcb8f9", "4abdb88a9b67e64810fb54b0c24a1fd76b12297b4f7a1467d85a14dd8367191a", "757bd71a9b89e4f1db0622af4436d403e742506dbea978eba566815dc65ec895", "76df51492bc6fa6cc8b65d09efdb67cbba3cbfe55004c3afc81352af92b4a43c", "774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170", "8a3ada8401736df2bf497f65589293a86c56e197a80ae7634ec2c3150a2f5082", "a06efd0482a1942aad209a6c18321b5e22d64eb531ea20af138b28172d8f35ba", "b8b4bd3dafc7b92608ae5462add1c8cc881851c2d4f5d8977fdea5b081d17f21", "c6e5024fc0cdf7f83b6624850309ddd7e06c48a75fa0d1c5173de4d93300eb19", "db7ff14abc73577b0bcbcf73ecff97d3580ecaa0fc8724babce21fdf3fe08ef6", "dedf54d72d9e7b6d043c244c8213fe2b8bbfe66874b9a65b39c4cc892dd99dd4", "ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830", "f0f47bafe9c9b8ed03e19a100a743662dd8c6d0135e684feea720a0d0046d116"] -nodeenv = ["ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"] -packaging = ["28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47", "d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108"] -pastel = ["a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef", "bf3b1901b2442ea0d8ab9a390594e5b0c9584709d543a3113506fe8b28cbace3"] -pathlib2 = ["2156525d6576d21c4dcaddfa427fae887ef89a7a9de5cbfe0728b3aafa78427e", "446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8"] -pep562 = ["58cb1cc9ee63d93e62b4905a50357618d526d289919814bea1f0da8f53b79395", "d2a48b178ebf5f8dd31709cc26a19808ef794561fa2fe50ea01ea2bad4d667ef"] -pexpect = ["2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1", "9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"] -pkginfo = ["7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb", "a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"] -pluggy = ["0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34"] -pre-commit = ["1d3c0587bda7c4e537a46c27f2c84aa006acc18facf9970bf947df596ce91f3f", "fa78ff96e8e9ac94c748388597693f18b041a181c94a4f039ad20f45287ba44a"] -ptyprocess = ["923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0", "d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"] -py = ["64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", "dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"] -pycparser = ["a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"] -pygments = ["5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a", "e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d", "71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127", "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"] -pygments-github-lexers = ["0f9e9fb607d351c127a1e55e82a6eb491ed1fc11b2d6a0444ba217dc6d1f82c1", "aaca57e77cd6fcfce8d6ee97a998962eebf7fbb810519a8ebde427c62823e133"] -pylev = ["063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3", "1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e"] -pymdown-extensions = ["25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df", "6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd", "24c1a0afbae101c4e2b2675ff4dd936470a90133f93398b9cbe0c855e2d2ec10", "960486dea995f1759dfd517aa140b3d851cd7b44d4c48d276fd2c74fc4e1bce9"] -pyparsing = ["6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", "d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"] -pyrsistent = ["3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"] -pytest = ["8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347", "d100a02770f665f5dcf7e3f08202db29857fee6d15f34c942be0a511f39814f0"] -pytest-cov = ["2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6", "e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"] -pytest-mock = ["43ce4e9dd5074993e7c021bb1c22cbb5363e612a2b5a76bc6d956775b10758b7", "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568"] -pytest-sugar = ["26cf8289fe10880cbbc130bd77398c4e6a8b936d8393b116a5c16121d95ab283", "fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab"] -pywin32-ctypes = ["24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942", "9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"] -pyyaml = ["0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", "5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", "5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", "7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", "7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", "87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", "9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", "a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", "b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", "b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", "bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", "f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8"] -requests = ["502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b", "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", "9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"] -requests-toolbelt = ["42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237", "f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"] -scandir = ["2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e", "2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022", "2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f", "2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f", "4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae", "67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173", "7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4", "8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32", "92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188", "b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d", "cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"] -secretstorage = ["3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6", "20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92", "7a119fb52a88e398dbb22a4b3eb39b779bfbace7e4153b7bc6e5954d86282a8a"] -shellingham = ["77d37a4fd287c1e663006f7ecf1b9deca9ad492d0082587bd813c44eb49e4e62", "985b23bbd1feae47ca6a6365eacd314d93d95a8a16f8f346945074c28fe6f3e0"] -six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"] -subprocess32 = ["88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b", "eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"] -termcolor = ["1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"] -toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"] -tomlkit = ["a8d806f3a453c2d292afe97918398354e405b93919e2e68771a3fd0a90e89576", "c6b0c11b85e888c12330c7605d43c1446aa148cd421163f90ca46ea813f2c336"] -tornado = ["0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d", "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409", "732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f", "8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f", "8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5", "d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb", "e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444", "349884248c36801afa19e342a77cc4458caca694b0eda633f5878e458a44cb2c", "398e0d35e086ba38a0427c3b37f4337327231942e731edaa6e9fd1865bbd6f60", "4e73ef678b1a859f0cb29e1d895526a20ea64b5ffd510a2307b5998c7df24281", "559bce3d31484b665259f50cd94c5c28b961b09315ccd838f284687245f416e5", "abbe53a39734ef4aba061fca54e30c6b4639d3e1f59653f0da37a0003de148c7", "c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9", "c9399267c926a4e7c418baa5cbe91c7d1cf362d505a1ef898fde44a07c9dd8a5"] -tox = ["0bc216b6a2e6afe764476b4a07edf2c1dab99ed82bb146a1130b2e828f5bff5e", "c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1"] -typing = ["91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23", "c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36", "f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"] -urllib3 = ["2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", "a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb", "2f3eadfea5d92bc7899e75b5968410b749a054b492d5a6379c1344a1481bc2cb", "9c6c593cb28f52075016307fc26b0a0f8e82bc7d1ff19aaaa959b91710a56c47"] -virtualenv = ["680af46846662bb38c5504b78bad9ed9e4f3ba2d54f54ba42494fdf94337fe30", "f78d81b62d3147396ac33fc9d77579ddc42cc2a98dd9ea38886f616b33bc7fb2"] -wcwidth = ["3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", "f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"] -webencodings = ["a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"] -zipp = ["3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e", "f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"] +content-hash = "6e86bcf4be1389d9d1dbd87bd5383089bec887c5a7e9c5e48b09b936699e035d" +python-versions = "~2.7 || ^3.5" + +[metadata.files] +appdirs = [ + {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, + {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, +] +"aspy.yaml" = [ + {file = "aspy.yaml-1.3.0-py2.py3-none-any.whl", hash = "sha256:463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc"}, + {file = "aspy.yaml-1.3.0.tar.gz", hash = "sha256:e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45"}, +] +atomicwrites = [ + {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, + {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, +] +attrs = [ + {file = "attrs-19.3.0-py2.py3-none-any.whl", hash = "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c"}, + {file = "attrs-19.3.0.tar.gz", hash = "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"}, +] +"backports.functools-lru-cache" = [ + {file = "backports.functools_lru_cache-1.6.1-py2.py3-none-any.whl", hash = "sha256:0bada4c2f8a43d533e4ecb7a12214d9420e66eb206d54bf2d682581ca4b80848"}, + {file = "backports.functools_lru_cache-1.6.1.tar.gz", hash = "sha256:8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"}, +] +black = [ + {file = "black-19.10b0-py36-none-any.whl", hash = "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b"}, + {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"}, +] +cachecontrol = [ + {file = "CacheControl-0.12.6-py2.py3-none-any.whl", hash = "sha256:10d056fa27f8563a271b345207402a6dcce8efab7e5b377e270329c62471b10d"}, + {file = "CacheControl-0.12.6.tar.gz", hash = "sha256:be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"}, +] +cachy = [ + {file = "cachy-0.3.0-py2.py3-none-any.whl", hash = "sha256:338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"}, + {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, +] +certifi = [ + {file = "certifi-2020.4.5.1-py2.py3-none-any.whl", hash = "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304"}, + {file = "certifi-2020.4.5.1.tar.gz", hash = "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"}, +] +cffi = [ + {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"}, + {file = "cffi-1.14.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:cf16e3cf6c0a5fdd9bc10c21687e19d29ad1fe863372b5543deaec1039581a30"}, + {file = "cffi-1.14.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f2b0fa0c01d8a0c7483afd9f31d7ecf2d71760ca24499c8697aeb5ca37dc090c"}, + {file = "cffi-1.14.0-cp27-cp27m-win32.whl", hash = "sha256:99f748a7e71ff382613b4e1acc0ac83bf7ad167fb3802e35e90d9763daba4d78"}, + {file = "cffi-1.14.0-cp27-cp27m-win_amd64.whl", hash = "sha256:c420917b188a5582a56d8b93bdd8e0f6eca08c84ff623a4c16e809152cd35793"}, + {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:399aed636c7d3749bbed55bc907c3288cb43c65c4389964ad5ff849b6370603e"}, + {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cab50b8c2250b46fe738c77dbd25ce017d5e6fb35d3407606e7a4180656a5a6a"}, + {file = "cffi-1.14.0-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:001bf3242a1bb04d985d63e138230802c6c8d4db3668fb545fb5005ddf5bb5ff"}, + {file = "cffi-1.14.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e56c744aa6ff427a607763346e4170629caf7e48ead6921745986db3692f987f"}, + {file = "cffi-1.14.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:b8c78301cefcf5fd914aad35d3c04c2b21ce8629b5e4f4e45ae6812e461910fa"}, + {file = "cffi-1.14.0-cp35-cp35m-win32.whl", hash = "sha256:8c0ffc886aea5df6a1762d0019e9cb05f825d0eec1f520c51be9d198701daee5"}, + {file = "cffi-1.14.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8a6c688fefb4e1cd56feb6c511984a6c4f7ec7d2a1ff31a10254f3c817054ae4"}, + {file = "cffi-1.14.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:95cd16d3dee553f882540c1ffe331d085c9e629499ceadfbda4d4fde635f4b7d"}, + {file = "cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:66e41db66b47d0d8672d8ed2708ba91b2f2524ece3dee48b5dfb36be8c2f21dc"}, + {file = "cffi-1.14.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:028a579fc9aed3af38f4892bdcc7390508adabc30c6af4a6e4f611b0c680e6ac"}, + {file = "cffi-1.14.0-cp36-cp36m-win32.whl", hash = "sha256:cef128cb4d5e0b3493f058f10ce32365972c554572ff821e175dbc6f8ff6924f"}, + {file = "cffi-1.14.0-cp36-cp36m-win_amd64.whl", hash = "sha256:337d448e5a725bba2d8293c48d9353fc68d0e9e4088d62a9571def317797522b"}, + {file = "cffi-1.14.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e577934fc5f8779c554639376beeaa5657d54349096ef24abe8c74c5d9c117c3"}, + {file = "cffi-1.14.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:62ae9af2d069ea2698bf536dcfe1e4eed9090211dbaafeeedf5cb6c41b352f66"}, + {file = "cffi-1.14.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:14491a910663bf9f13ddf2bc8f60562d6bc5315c1f09c704937ef17293fb85b0"}, + {file = "cffi-1.14.0-cp37-cp37m-win32.whl", hash = "sha256:c43866529f2f06fe0edc6246eb4faa34f03fe88b64a0a9a942561c8e22f4b71f"}, + {file = "cffi-1.14.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2089ed025da3919d2e75a4d963d008330c96751127dd6f73c8dc0c65041b4c26"}, + {file = "cffi-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3b911c2dbd4f423b4c4fcca138cadde747abdb20d196c4a48708b8a2d32b16dd"}, + {file = "cffi-1.14.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7e63cbcf2429a8dbfe48dcc2322d5f2220b77b2e17b7ba023d6166d84655da55"}, + {file = "cffi-1.14.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3d311bcc4a41408cf5854f06ef2c5cab88f9fded37a3b95936c9879c1640d4c2"}, + {file = "cffi-1.14.0-cp38-cp38-win32.whl", hash = "sha256:675686925a9fb403edba0114db74e741d8181683dcf216be697d208857e04ca8"}, + {file = "cffi-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:00789914be39dffba161cfc5be31b55775de5ba2235fe49aa28c148236c4e06b"}, + {file = "cffi-1.14.0.tar.gz", hash = "sha256:2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6"}, +] +cfgv = [ + {file = "cfgv-2.0.1-py2.py3-none-any.whl", hash = "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"}, + {file = "cfgv-2.0.1.tar.gz", hash = "sha256:edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144"}, + {file = "cfgv-3.0.0-py2.py3-none-any.whl", hash = "sha256:f22b426ed59cd2ab2b54ff96608d846c33dfb8766a67f0b4a6ce130ce244414f"}, + {file = "cfgv-3.0.0.tar.gz", hash = "sha256:04b093b14ddf9fd4d17c53ebfd55582d27b76ed30050193c14e560770c5360eb"}, +] +chardet = [ + {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, + {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, +] +cleo = [ + {file = "cleo-0.8.1-py2.py3-none-any.whl", hash = "sha256:141cda6dc94a92343be626bb87a0b6c86ae291dfc732a57bf04310d4b4201753"}, + {file = "cleo-0.8.1.tar.gz", hash = "sha256:3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"}, +] +click = [ + {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, + {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, +] +clikit = [ + {file = "clikit-0.6.2-py2.py3-none-any.whl", hash = "sha256:71268e074e68082306e23d7369a7b99f824a0ef926e55ba2665e911f7208489e"}, + {file = "clikit-0.6.2.tar.gz", hash = "sha256:442ee5db9a14120635c5990bcdbfe7c03ada5898291f0c802f77be71569ded59"}, +] +colorama = [ + {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"}, + {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, +] +configparser = [ + {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"}, + {file = "configparser-4.0.2.tar.gz", hash = "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"}, +] +contextlib2 = [ + {file = "contextlib2-0.6.0.post1-py2.py3-none-any.whl", hash = "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"}, + {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, +] +coverage = [ + {file = "coverage-5.1-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:0cb4be7e784dcdc050fc58ef05b71aa8e89b7e6636b99967fadbdba694cf2b65"}, + {file = "coverage-5.1-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:c317eaf5ff46a34305b202e73404f55f7389ef834b8dbf4da09b9b9b37f76dd2"}, + {file = "coverage-5.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b83835506dfc185a319031cf853fa4bb1b3974b1f913f5bb1a0f3d98bdcded04"}, + {file = "coverage-5.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:5f2294dbf7875b991c381e3d5af2bcc3494d836affa52b809c91697449d0eda6"}, + {file = "coverage-5.1-cp27-cp27m-win32.whl", hash = "sha256:de807ae933cfb7f0c7d9d981a053772452217df2bf38e7e6267c9cbf9545a796"}, + {file = "coverage-5.1-cp27-cp27m-win_amd64.whl", hash = "sha256:bf9cb9a9fd8891e7efd2d44deb24b86d647394b9705b744ff6f8261e6f29a730"}, + {file = "coverage-5.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:acf3763ed01af8410fc36afea23707d4ea58ba7e86a8ee915dfb9ceff9ef69d0"}, + {file = "coverage-5.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:dec5202bfe6f672d4511086e125db035a52b00f1648d6407cc8e526912c0353a"}, + {file = "coverage-5.1-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:7a5bdad4edec57b5fb8dae7d3ee58622d626fd3a0be0dfceda162a7035885ecf"}, + {file = "coverage-5.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1601e480b9b99697a570cea7ef749e88123c04b92d84cedaa01e117436b4a0a9"}, + {file = "coverage-5.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:dbe8c6ae7534b5b024296464f387d57c13caa942f6d8e6e0346f27e509f0f768"}, + {file = "coverage-5.1-cp35-cp35m-win32.whl", hash = "sha256:a027ef0492ede1e03a8054e3c37b8def89a1e3c471482e9f046906ba4f2aafd2"}, + {file = "coverage-5.1-cp35-cp35m-win_amd64.whl", hash = "sha256:0e61d9803d5851849c24f78227939c701ced6704f337cad0a91e0972c51c1ee7"}, + {file = "coverage-5.1-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:2d27a3f742c98e5c6b461ee6ef7287400a1956c11421eb574d843d9ec1f772f0"}, + {file = "coverage-5.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:66460ab1599d3cf894bb6baee8c684788819b71a5dc1e8fa2ecc152e5d752019"}, + {file = "coverage-5.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5c542d1e62eece33c306d66fe0a5c4f7f7b3c08fecc46ead86d7916684b36d6c"}, + {file = "coverage-5.1-cp36-cp36m-win32.whl", hash = "sha256:2742c7515b9eb368718cd091bad1a1b44135cc72468c731302b3d641895b83d1"}, + {file = "coverage-5.1-cp36-cp36m-win_amd64.whl", hash = "sha256:dead2ddede4c7ba6cb3a721870f5141c97dc7d85a079edb4bd8d88c3ad5b20c7"}, + {file = "coverage-5.1-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:01333e1bd22c59713ba8a79f088b3955946e293114479bbfc2e37d522be03355"}, + {file = "coverage-5.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:e1ea316102ea1e1770724db01998d1603ed921c54a86a2efcb03428d5417e489"}, + {file = "coverage-5.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:adeb4c5b608574a3d647011af36f7586811a2c1197c861aedb548dd2453b41cd"}, + {file = "coverage-5.1-cp37-cp37m-win32.whl", hash = "sha256:782caea581a6e9ff75eccda79287daefd1d2631cc09d642b6ee2d6da21fc0a4e"}, + {file = "coverage-5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:00f1d23f4336efc3b311ed0d807feb45098fc86dee1ca13b3d6768cdab187c8a"}, + {file = "coverage-5.1-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:402e1744733df483b93abbf209283898e9f0d67470707e3c7516d84f48524f55"}, + {file = "coverage-5.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:a3f3654d5734a3ece152636aad89f58afc9213c6520062db3978239db122f03c"}, + {file = "coverage-5.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6402bd2fdedabbdb63a316308142597534ea8e1895f4e7d8bf7476c5e8751fef"}, + {file = "coverage-5.1-cp38-cp38-win32.whl", hash = "sha256:8fa0cbc7ecad630e5b0f4f35b0f6ad419246b02bc750de7ac66db92667996d24"}, + {file = "coverage-5.1-cp38-cp38-win_amd64.whl", hash = "sha256:79a3cfd6346ce6c13145731d39db47b7a7b859c0272f02cdb89a3bdcbae233a0"}, + {file = "coverage-5.1-cp39-cp39-win32.whl", hash = "sha256:a82b92b04a23d3c8a581fc049228bafde988abacba397d57ce95fe95e0338ab4"}, + {file = "coverage-5.1-cp39-cp39-win_amd64.whl", hash = "sha256:bb28a7245de68bf29f6fb199545d072d1036a1917dca17a1e75bbb919e14ee8e"}, + {file = "coverage-5.1.tar.gz", hash = "sha256:f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052"}, +] +crashtest = [ + {file = "crashtest-0.3.0-py3-none-any.whl", hash = "sha256:06069a9267c54be31c42b03574b72407bf780e13c82cb0238f24ea69cf25b6dd"}, + {file = "crashtest-0.3.0.tar.gz", hash = "sha256:e9c06cc96400939ab5327123a3f699078eaad8a6283247d7b2ae0f6afffadf14"}, +] +cryptography = [ + {file = "cryptography-2.9.2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:daf54a4b07d67ad437ff239c8a4080cfd1cc7213df57d33c97de7b4738048d5e"}, + {file = "cryptography-2.9.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:3b3eba865ea2754738616f87292b7f29448aec342a7c720956f8083d252bf28b"}, + {file = "cryptography-2.9.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:c447cf087cf2dbddc1add6987bbe2f767ed5317adb2d08af940db517dd704365"}, + {file = "cryptography-2.9.2-cp27-cp27m-win32.whl", hash = "sha256:f118a95c7480f5be0df8afeb9a11bd199aa20afab7a96bcf20409b411a3a85f0"}, + {file = "cryptography-2.9.2-cp27-cp27m-win_amd64.whl", hash = "sha256:c4fd17d92e9d55b84707f4fd09992081ba872d1a0c610c109c18e062e06a2e55"}, + {file = "cryptography-2.9.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d0d5aeaedd29be304848f1c5059074a740fa9f6f26b84c5b63e8b29e73dfc270"}, + {file = "cryptography-2.9.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:1e4014639d3d73fbc5ceff206049c5a9a849cefd106a49fa7aaaa25cc0ce35cf"}, + {file = "cryptography-2.9.2-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:96c080ae7118c10fcbe6229ab43eb8b090fccd31a09ef55f83f690d1ef619a1d"}, + {file = "cryptography-2.9.2-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:e993468c859d084d5579e2ebee101de8f5a27ce8e2159959b6673b418fd8c785"}, + {file = "cryptography-2.9.2-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:88c881dd5a147e08d1bdcf2315c04972381d026cdb803325c03fe2b4a8ed858b"}, + {file = "cryptography-2.9.2-cp35-cp35m-win32.whl", hash = "sha256:651448cd2e3a6bc2bb76c3663785133c40d5e1a8c1a9c5429e4354201c6024ae"}, + {file = "cryptography-2.9.2-cp35-cp35m-win_amd64.whl", hash = "sha256:726086c17f94747cedbee6efa77e99ae170caebeb1116353c6cf0ab67ea6829b"}, + {file = "cryptography-2.9.2-cp36-cp36m-win32.whl", hash = "sha256:091d31c42f444c6f519485ed528d8b451d1a0c7bf30e8ca583a0cac44b8a0df6"}, + {file = "cryptography-2.9.2-cp36-cp36m-win_amd64.whl", hash = "sha256:bb1f0281887d89617b4c68e8db9a2c42b9efebf2702a3c5bf70599421a8623e3"}, + {file = "cryptography-2.9.2-cp37-cp37m-win32.whl", hash = "sha256:18452582a3c85b96014b45686af264563e3e5d99d226589f057ace56196ec78b"}, + {file = "cryptography-2.9.2-cp37-cp37m-win_amd64.whl", hash = "sha256:22e91636a51170df0ae4dcbd250d318fd28c9f491c4e50b625a49964b24fe46e"}, + {file = "cryptography-2.9.2-cp38-cp38-win32.whl", hash = "sha256:844a76bc04472e5135b909da6aed84360f522ff5dfa47f93e3dd2a0b84a89fa0"}, + {file = "cryptography-2.9.2-cp38-cp38-win_amd64.whl", hash = "sha256:1dfa985f62b137909496e7fc182dac687206d8d089dd03eaeb28ae16eec8e7d5"}, + {file = "cryptography-2.9.2.tar.gz", hash = "sha256:a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229"}, +] +distlib = [ + {file = "distlib-0.3.0.zip", hash = "sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21"}, +] +entrypoints = [ + {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, + {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"}, +] +enum34 = [ + {file = "enum34-1.1.10-py2-none-any.whl", hash = "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53"}, + {file = "enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328"}, + {file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"}, +] +filelock = [ + {file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"}, + {file = "filelock-3.0.12.tar.gz", hash = "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"}, +] +funcsigs = [ + {file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"}, + {file = "funcsigs-1.0.2.tar.gz", hash = "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"}, +] +functools32 = [ + {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"}, + {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"}, +] +future = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] +futures = [ + {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"}, + {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"}, +] +glob2 = [ + {file = "glob2-0.6.tar.gz", hash = "sha256:f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"}, +] +html5lib = [ + {file = "html5lib-1.0.1-py2.py3-none-any.whl", hash = "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3"}, + {file = "html5lib-1.0.1.tar.gz", hash = "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"}, +] +httpretty = [ + {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, +] +identify = [ + {file = "identify-1.4.19-py2.py3-none-any.whl", hash = "sha256:781fd3401f5d2b17b22a8b18b493a48d5d948e3330634e82742e23f9c20234ef"}, + {file = "identify-1.4.19.tar.gz", hash = "sha256:249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"}, +] +idna = [ + {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"}, + {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"}, +] +importlib-metadata = [ + {file = "importlib_metadata-1.6.0-py2.py3-none-any.whl", hash = "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f"}, + {file = "importlib_metadata-1.6.0.tar.gz", hash = "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"}, +] +importlib-resources = [ + {file = "importlib_resources-1.5.0-py2.py3-none-any.whl", hash = "sha256:85dc0b9b325ff78c8bef2e4ff42616094e16b98ebd5e3b50fe7e2f0bbcdcde49"}, + {file = "importlib_resources-1.5.0.tar.gz", hash = "sha256:6f87df66833e1942667108628ec48900e02a4ab4ad850e25fbf07cb17cf734ca"}, +] +ipaddress = [ + {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, + {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, +] +jeepney = [ + {file = "jeepney-0.4.3-py3-none-any.whl", hash = "sha256:d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf"}, + {file = "jeepney-0.4.3.tar.gz", hash = "sha256:3479b861cc2b6407de5188695fa1a8d57e5072d7059322469b62628869b8e36e"}, +] +jinja2 = [ + {file = "Jinja2-2.11.2-py2.py3-none-any.whl", hash = "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035"}, + {file = "Jinja2-2.11.2.tar.gz", hash = "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"}, +] +joblib = [ + {file = "joblib-0.14.1-py2.py3-none-any.whl", hash = "sha256:bdb4fd9b72915ffb49fde2229ce482dd7ae79d842ed8c2b4c932441495af1403"}, + {file = "joblib-0.14.1.tar.gz", hash = "sha256:0630eea4f5664c463f23fbf5dcfc54a2bc6168902719fa8e19daf033022786c8"}, + {file = "joblib-0.15.1-py3-none-any.whl", hash = "sha256:6825784ffda353cc8a1be573118085789e5b5d29401856b35b756645ab5aecb5"}, + {file = "joblib-0.15.1.tar.gz", hash = "sha256:61e49189c84b3c5d99a969d314853f4d1d263316cc694bec17548ebaa9c47b6e"}, +] +keyring = [ + {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, + {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"}, + {file = "keyring-20.0.1-py2.py3-none-any.whl", hash = "sha256:c674f032424b4bffc62abeac5523ec49cc84aed07a480c3233e0baf618efc15c"}, + {file = "keyring-20.0.1.tar.gz", hash = "sha256:963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"}, + {file = "keyring-21.2.1-py3-none-any.whl", hash = "sha256:3401234209015144a5d75701e71cb47239e552b0882313e9f51e8976f9e27843"}, + {file = "keyring-21.2.1.tar.gz", hash = "sha256:c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec"}, +] +livereload = [ + {file = "livereload-2.6.1-py2.py3-none-any.whl", hash = "sha256:78d55f2c268a8823ba499305dcac64e28ddeb9a92571e12d543cd304faf5817b"}, + {file = "livereload-2.6.1.tar.gz", hash = "sha256:89254f78d7529d7ea0a3417d224c34287ebfe266b05e67e51facaf82c27f0f66"}, +] +lockfile = [ + {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, + {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, +] +lunr = [ + {file = "lunr-0.5.8-py2.py3-none-any.whl", hash = "sha256:aab3f489c4d4fab4c1294a257a30fec397db56f0a50273218ccc3efdbf01d6ca"}, + {file = "lunr-0.5.8.tar.gz", hash = "sha256:c4fb063b98eff775dd638b3df380008ae85e6cb1d1a24d1cd81a10ef6391c26e"}, +] +markdown = [ + {file = "Markdown-3.1.1-py2.py3-none-any.whl", hash = "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"}, + {file = "Markdown-3.1.1.tar.gz", hash = "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"}, + {file = "Markdown-3.2.2-py3-none-any.whl", hash = "sha256:c467cd6233885534bf0fe96e62e3cf46cfc1605112356c4f9981512b8174de59"}, + {file = "Markdown-3.2.2.tar.gz", hash = "sha256:1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"}, +] +markdown-include = [ + {file = "markdown-include-0.5.1.tar.gz", hash = "sha256:72a45461b589489a088753893bc95c5fa5909936186485f4ed55caa57d10250f"}, +] +markupsafe = [ + {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, +] +mkdocs = [ + {file = "mkdocs-1.0.4-py2.py3-none-any.whl", hash = "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"}, + {file = "mkdocs-1.0.4.tar.gz", hash = "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939"}, + {file = "mkdocs-1.1.2-py3-none-any.whl", hash = "sha256:096f52ff52c02c7e90332d2e53da862fde5c062086e1b5356a6e392d5d60f5e9"}, + {file = "mkdocs-1.1.2.tar.gz", hash = "sha256:f0b61e5402b99d7789efa032c7a74c90a20220a9c81749da06dbfbcbd52ffb39"}, +] +mock = [ + {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"}, + {file = "mock-3.0.5.tar.gz", hash = "sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"}, +] +more-itertools = [ + {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, + {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, + {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, + {file = "more-itertools-8.3.0.tar.gz", hash = "sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be"}, + {file = "more_itertools-8.3.0-py3-none-any.whl", hash = "sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982"}, +] +msgpack = [ + {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"}, + {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"}, + {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"}, + {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"}, + {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"}, + {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"}, + {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"}, + {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"}, + {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"}, + {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"}, + {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"}, + {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"}, + {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"}, + {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"}, + {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"}, + {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"}, + {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"}, + {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"}, +] +nltk = [ + {file = "nltk-3.5.zip", hash = "sha256:845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"}, +] +nodeenv = [ + {file = "nodeenv-1.4.0-py2.py3-none-any.whl", hash = "sha256:4b0b77afa3ba9b54f4b6396e60b0c83f59eaeb2d63dc3cc7a70f7f4af96c82bc"}, +] +packaging = [ + {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, + {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, +] +pastel = [ + {file = "pastel-0.2.0-py2.py3-none-any.whl", hash = "sha256:18b559dc3ad4ba9b8bd5baebe6503f25f36d21460f021cf27a8d889cb5d17840"}, + {file = "pastel-0.2.0.tar.gz", hash = "sha256:46155fc523bdd4efcd450bbcb3f2b94a6e3b25edc0eb493e081104ad09e1ca36"}, +] +pathlib2 = [ + {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, + {file = "pathlib2-2.3.5.tar.gz", hash = "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"}, +] +pathspec = [ + {file = "pathspec-0.8.0-py2.py3-none-any.whl", hash = "sha256:7d91249d21749788d07a2d0f94147accd8f845507400749ea19c1ec9054a12b0"}, + {file = "pathspec-0.8.0.tar.gz", hash = "sha256:da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061"}, +] +pep562 = [ + {file = "pep562-1.0-py2.py3-none-any.whl", hash = "sha256:d2a48b178ebf5f8dd31709cc26a19808ef794561fa2fe50ea01ea2bad4d667ef"}, + {file = "pep562-1.0.tar.gz", hash = "sha256:58cb1cc9ee63d93e62b4905a50357618d526d289919814bea1f0da8f53b79395"}, +] +pexpect = [ + {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, + {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, +] +pkginfo = [ + {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"}, + {file = "pkginfo-1.5.0.1.tar.gz", hash = "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"}, +] +pluggy = [ + {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, + {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, +] +poetry-core = [ + {file = "poetry-core-1.0.0a7.tar.gz", hash = "sha256:f627d32e0c78e7219e0f3b040f3a2a6a6eb9074e0cc04f8d0fec13f258013929"}, + {file = "poetry_core-1.0.0a7-py2.py3-none-any.whl", hash = "sha256:ccaf834e5e015452fa637781c0125c24458dc66eb7af2db88a6d3cba1c42f6e0"}, +] +pre-commit = [ + {file = "pre_commit-1.21.0-py2.py3-none-any.whl", hash = "sha256:f92a359477f3252452ae2e8d3029de77aec59415c16ae4189bcfba40b757e029"}, + {file = "pre_commit-1.21.0.tar.gz", hash = "sha256:8f48d8637bdae6fa70cc97db9c1dd5aa7c5c8bf71968932a380628c25978b850"}, +] +ptyprocess = [ + {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"}, + {file = "ptyprocess-0.6.0.tar.gz", hash = "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"}, +] +py = [ + {file = "py-1.8.1-py2.py3-none-any.whl", hash = "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0"}, + {file = "py-1.8.1.tar.gz", hash = "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa"}, +] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pygments = [ + {file = "Pygments-2.5.2-py2.py3-none-any.whl", hash = "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b"}, + {file = "Pygments-2.5.2.tar.gz", hash = "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"}, + {file = "Pygments-2.6.1-py3-none-any.whl", hash = "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"}, + {file = "Pygments-2.6.1.tar.gz", hash = "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"}, +] +pygments-github-lexers = [ + {file = "pygments-github-lexers-0.0.5.tar.gz", hash = "sha256:aaca57e77cd6fcfce8d6ee97a998962eebf7fbb810519a8ebde427c62823e133"}, + {file = "pygments_github_lexers-0.0.5-py3.4.egg", hash = "sha256:0f9e9fb607d351c127a1e55e82a6eb491ed1fc11b2d6a0444ba217dc6d1f82c1"}, +] +pylev = [ + {file = "pylev-1.3.0-py2.py3-none-any.whl", hash = "sha256:1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e"}, + {file = "pylev-1.3.0.tar.gz", hash = "sha256:063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3"}, +] +pymdown-extensions = [ + {file = "pymdown-extensions-6.2.1.tar.gz", hash = "sha256:3bbe6048275f8a0d13a0fe44e0ea201e67268aa7bb40c2544eef16abbf168f7b"}, + {file = "pymdown_extensions-6.2.1-py2.py3-none-any.whl", hash = "sha256:dce5e17b93be0572322b7d06c9a13c13a9d98694d6468277911d50ca87d26f29"}, + {file = "pymdown-extensions-6.3.tar.gz", hash = "sha256:cb879686a586b22292899771f5e5bc3382808e92aa938f71b550ecdea709419f"}, + {file = "pymdown_extensions-6.3-py2.py3-none-any.whl", hash = "sha256:66fae2683c7a1dac53184f7de57f51f8dad73f9ead2f453e94e85096cb811335"}, +] +pyparsing = [ + {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, + {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, +] +pytest = [ + {file = "pytest-4.6.11-py2.py3-none-any.whl", hash = "sha256:a00a7d79cbbdfa9d21e7d0298392a8dd4123316bfac545075e6f8f24c94d8c97"}, + {file = "pytest-4.6.11.tar.gz", hash = "sha256:50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"}, + {file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"}, + {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, +] +pytest-cov = [ + {file = "pytest-cov-2.9.0.tar.gz", hash = "sha256:b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322"}, + {file = "pytest_cov-2.9.0-py2.py3-none-any.whl", hash = "sha256:c87dfd8465d865655a8213859f1b4749b43448b5fae465cb981e16d52a811424"}, +] +pytest-mock = [ + {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, + {file = "pytest_mock-1.13.0-py2.py3-none-any.whl", hash = "sha256:67e414b3caef7bff6fc6bd83b22b5bc39147e4493f483c2679bc9d4dc485a94d"}, +] +pytest-sugar = [ + {file = "pytest-sugar-0.9.3.tar.gz", hash = "sha256:1630b5b7ea3624919b73fde37cffb87965c5087a4afab8a43074ff44e0d810c4"}, +] +pywin32-ctypes = [ + {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, + {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, +] +pyyaml = [ + {file = "PyYAML-5.3.1-cp27-cp27m-win32.whl", hash = "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f"}, + {file = "PyYAML-5.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76"}, + {file = "PyYAML-5.3.1-cp35-cp35m-win32.whl", hash = "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2"}, + {file = "PyYAML-5.3.1-cp35-cp35m-win_amd64.whl", hash = "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c"}, + {file = "PyYAML-5.3.1-cp36-cp36m-win32.whl", hash = "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2"}, + {file = "PyYAML-5.3.1-cp36-cp36m-win_amd64.whl", hash = "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648"}, + {file = "PyYAML-5.3.1-cp37-cp37m-win32.whl", hash = "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"}, + {file = "PyYAML-5.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf"}, + {file = "PyYAML-5.3.1-cp38-cp38-win32.whl", hash = "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97"}, + {file = "PyYAML-5.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee"}, + {file = "PyYAML-5.3.1.tar.gz", hash = "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d"}, +] +regex = [ + {file = "regex-2020.5.14-cp27-cp27m-win32.whl", hash = "sha256:e565569fc28e3ba3e475ec344d87ed3cd8ba2d575335359749298a0899fe122e"}, + {file = "regex-2020.5.14-cp27-cp27m-win_amd64.whl", hash = "sha256:d466967ac8e45244b9dfe302bbe5e3337f8dc4dec8d7d10f5e950d83b140d33a"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:27ff7325b297fb6e5ebb70d10437592433601c423f5acf86e5bc1ee2919b9561"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ea55b80eb0d1c3f1d8d784264a6764f931e172480a2f1868f2536444c5f01e01"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:c9bce6e006fbe771a02bda468ec40ffccbf954803b470a0345ad39c603402577"}, + {file = "regex-2020.5.14-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:d881c2e657c51d89f02ae4c21d9adbef76b8325fe4d5cf0e9ad62f850f3a98fd"}, + {file = "regex-2020.5.14-cp36-cp36m-win32.whl", hash = "sha256:99568f00f7bf820c620f01721485cad230f3fb28f57d8fbf4a7967ec2e446994"}, + {file = "regex-2020.5.14-cp36-cp36m-win_amd64.whl", hash = "sha256:70c14743320a68c5dac7fc5a0f685be63bc2024b062fe2aaccc4acc3d01b14a1"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:a7c37f048ec3920783abab99f8f4036561a174f1314302ccfa4e9ad31cb00eb4"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:89d76ce33d3266173f5be80bd4efcbd5196cafc34100fdab814f9b228dee0fa4"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:51f17abbe973c7673a61863516bdc9c0ef467407a940f39501e786a07406699c"}, + {file = "regex-2020.5.14-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:ce5cc53aa9fbbf6712e92c7cf268274eaff30f6bd12a0754e8133d85a8fb0f5f"}, + {file = "regex-2020.5.14-cp37-cp37m-win32.whl", hash = "sha256:8044d1c085d49673aadb3d7dc20ef5cb5b030c7a4fa253a593dda2eab3059929"}, + {file = "regex-2020.5.14-cp37-cp37m-win_amd64.whl", hash = "sha256:c2062c7d470751b648f1cacc3f54460aebfc261285f14bc6da49c6943bd48bdd"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux1_i686.whl", hash = "sha256:329ba35d711e3428db6b45a53b1b13a0a8ba07cbbcf10bbed291a7da45f106c3"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:579ea215c81d18da550b62ff97ee187b99f1b135fd894a13451e00986a080cad"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:3a9394197664e35566242686d84dfd264c07b20f93514e2e09d3c2b3ffdf78fe"}, + {file = "regex-2020.5.14-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:ce367d21f33e23a84fb83a641b3834dd7dd8e9318ad8ff677fbfae5915a239f7"}, + {file = "regex-2020.5.14-cp38-cp38-win32.whl", hash = "sha256:1386e75c9d1574f6aa2e4eb5355374c8e55f9aac97e224a8a5a6abded0f9c927"}, + {file = "regex-2020.5.14-cp38-cp38-win_amd64.whl", hash = "sha256:7e61be8a2900897803c293247ef87366d5df86bf701083b6c43119c7c6c99108"}, + {file = "regex-2020.5.14.tar.gz", hash = "sha256:ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"}, +] +requests = [ + {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"}, + {file = "requests-2.23.0.tar.gz", hash = "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"}, +] +requests-toolbelt = [ + {file = "requests-toolbelt-0.8.0.tar.gz", hash = "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"}, + {file = "requests_toolbelt-0.8.0-py2.py3-none-any.whl", hash = "sha256:42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237"}, +] +scandir = [ + {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"}, + {file = "scandir-1.10.0-cp27-cp27m-win_amd64.whl", hash = "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"}, + {file = "scandir-1.10.0-cp34-cp34m-win32.whl", hash = "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f"}, + {file = "scandir-1.10.0-cp34-cp34m-win_amd64.whl", hash = "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e"}, + {file = "scandir-1.10.0-cp35-cp35m-win32.whl", hash = "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f"}, + {file = "scandir-1.10.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32"}, + {file = "scandir-1.10.0-cp36-cp36m-win32.whl", hash = "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022"}, + {file = "scandir-1.10.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4"}, + {file = "scandir-1.10.0-cp37-cp37m-win32.whl", hash = "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173"}, + {file = "scandir-1.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d"}, + {file = "scandir-1.10.0.tar.gz", hash = "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae"}, +] +secretstorage = [ + {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"}, + {file = "SecretStorage-3.1.2-py3-none-any.whl", hash = "sha256:b5ec909dde94d4ae2fa26af7c089036997030f0cf0a5cb372b4cccabd81c143b"}, + {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"}, +] +shellingham = [ + {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"}, + {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"}, +] +singledispatch = [ + {file = "singledispatch-3.4.0.3-py2.py3-none-any.whl", hash = "sha256:833b46966687b3de7f438c761ac475213e53b306740f1abfaa86e1d1aae56aa8"}, + {file = "singledispatch-3.4.0.3.tar.gz", hash = "sha256:5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"}, +] +six = [ + {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, + {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, +] +subprocess32 = [ + {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, + {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"}, +] +termcolor = [ + {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, +] +toml = [ + {file = "toml-0.10.1-py2.py3-none-any.whl", hash = "sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88"}, + {file = "toml-0.10.1.tar.gz", hash = "sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"}, +] +tomlkit = [ + {file = "tomlkit-0.5.11-py2.py3-none-any.whl", hash = "sha256:4e1bd6c9197d984528f9ff0cc9db667c317d8881288db50db20eeeb0f6b0380b"}, + {file = "tomlkit-0.5.11.tar.gz", hash = "sha256:f044eda25647882e5ef22b43a1688fb6ab12af2fc50e8456cdfc751c873101cf"}, +] +tornado = [ + {file = "tornado-5.1.1-cp35-cp35m-win32.whl", hash = "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f"}, + {file = "tornado-5.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d"}, + {file = "tornado-5.1.1-cp36-cp36m-win32.whl", hash = "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f"}, + {file = "tornado-5.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb"}, + {file = "tornado-5.1.1-cp37-cp37m-win32.whl", hash = "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"}, + {file = "tornado-5.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5"}, + {file = "tornado-5.1.1.tar.gz", hash = "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"}, + {file = "tornado-6.0.4-cp35-cp35m-win32.whl", hash = "sha256:5217e601700f24e966ddab689f90b7ea4bd91ff3357c3600fa1045e26d68e55d"}, + {file = "tornado-6.0.4-cp35-cp35m-win_amd64.whl", hash = "sha256:c98232a3ac391f5faea6821b53db8db461157baa788f5d6222a193e9456e1740"}, + {file = "tornado-6.0.4-cp36-cp36m-win32.whl", hash = "sha256:5f6a07e62e799be5d2330e68d808c8ac41d4a259b9cea61da4101b83cb5dc673"}, + {file = "tornado-6.0.4-cp36-cp36m-win_amd64.whl", hash = "sha256:c952975c8ba74f546ae6de2e226ab3cc3cc11ae47baf607459a6728585bb542a"}, + {file = "tornado-6.0.4-cp37-cp37m-win32.whl", hash = "sha256:2c027eb2a393d964b22b5c154d1a23a5f8727db6fda837118a776b29e2b8ebc6"}, + {file = "tornado-6.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:5618f72e947533832cbc3dec54e1dffc1747a5cb17d1fd91577ed14fa0dc081b"}, + {file = "tornado-6.0.4-cp38-cp38-win32.whl", hash = "sha256:22aed82c2ea340c3771e3babc5ef220272f6fd06b5108a53b4976d0d722bcd52"}, + {file = "tornado-6.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:c58d56003daf1b616336781b26d184023ea4af13ae143d9dda65e31e534940b9"}, + {file = "tornado-6.0.4.tar.gz", hash = "sha256:0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc"}, +] +tox = [ + {file = "tox-3.15.1-py2.py3-none-any.whl", hash = "sha256:322dfdf007d7d53323f767badcb068a5cfa7c44d8aabb698d131b28cf44e62c4"}, + {file = "tox-3.15.1.tar.gz", hash = "sha256:8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83"}, +] +tqdm = [ + {file = "tqdm-4.46.1-py2.py3-none-any.whl", hash = "sha256:07c06493f1403c1380b630ae3dcbe5ae62abcf369a93bbc052502279f189ab8c"}, + {file = "tqdm-4.46.1.tar.gz", hash = "sha256:cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"}, +] +typed-ast = [ + {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, + {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"}, + {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"}, + {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"}, + {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, + {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, + {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, + {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, + {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, + {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, + {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, + {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, + {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, + {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, + {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, +] +typing = [ + {file = "typing-3.7.4.1-py2-none-any.whl", hash = "sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36"}, + {file = "typing-3.7.4.1-py3-none-any.whl", hash = "sha256:f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"}, + {file = "typing-3.7.4.1.tar.gz", hash = "sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"}, +] +typing-extensions = [ + {file = "typing_extensions-3.7.4.2-py2-none-any.whl", hash = "sha256:f8d2bd89d25bc39dabe7d23df520442fa1d8969b82544370e03d88b5a591c392"}, + {file = "typing_extensions-3.7.4.2-py3-none-any.whl", hash = "sha256:6e95524d8a547a91e08f404ae485bbb71962de46967e1b71a0cb89af24e761c5"}, + {file = "typing_extensions-3.7.4.2.tar.gz", hash = "sha256:79ee589a3caca649a9bfd2a8de4709837400dfa00b6cc81962a1e6a1815969ae"}, +] +urllib3 = [ + {file = "urllib3-1.25.9-py2.py3-none-any.whl", hash = "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"}, + {file = "urllib3-1.25.9.tar.gz", hash = "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527"}, +] +virtualenv = [ + {file = "virtualenv-20.0.21-py2.py3-none-any.whl", hash = "sha256:a730548b27366c5e6cbdf6f97406d861cccece2e22275e8e1a757aeff5e00c70"}, + {file = "virtualenv-20.0.21.tar.gz", hash = "sha256:a116629d4e7f4d03433b8afa27f43deba09d48bc48f5ecefa4f015a178efb6cf"}, +] +wcwidth = [ + {file = "wcwidth-0.2.3-py2.py3-none-any.whl", hash = "sha256:980fbf4f3c196c0f329cdcd1e84c554d6a211f18e252e525a0cf4223154a41d6"}, + {file = "wcwidth-0.2.3.tar.gz", hash = "sha256:edbc2b718b4db6cdf393eefe3a420183947d6aa312505ce6754516f458ff8830"}, +] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] +zipp = [ + {file = "zipp-1.2.0-py2.py3-none-any.whl", hash = "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"}, + {file = "zipp-1.2.0.tar.gz", hash = "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1"}, + {file = "zipp-3.1.0-py3-none-any.whl", hash = "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b"}, + {file = "zipp-3.1.0.tar.gz", hash = "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"}, +] diff --git a/poetry/__init__.py b/poetry/__init__.py index ae18b1eb4d6..26cfe4052b1 100644 --- a/poetry/__init__.py +++ b/poetry/__init__.py @@ -1,13 +1,4 @@ -import os -import sys +from pkgutil import extend_path -_ROOT = os.path.dirname(os.path.realpath(__file__)) -_VENDOR = os.path.join(_ROOT, "_vendor") -_CURRENT_VENDOR = os.path.join( - _VENDOR, "py{}".format(".".join(str(v) for v in sys.version_info[:2])) -) -# Add vendored dependencies to path. -sys.path.insert(0, _CURRENT_VENDOR) - -from .__version__ import __version__ # noqa +__path__ = extend_path(__path__, __name__) diff --git a/poetry/__main__.py b/poetry/__main__.py index 76ffb5d16cc..b280ed84e4a 100644 --- a/poetry/__main__.py +++ b/poetry/__main__.py @@ -1,5 +1,6 @@ import sys + if __name__ == "__main__": from .console import main diff --git a/poetry/__version__.py b/poetry/__version__.py index 5313823061b..b8d9ea00cbe 100644 --- a/poetry/__version__.py +++ b/poetry/__version__.py @@ -1 +1 @@ -__version__ = "1.0.0b1" +__version__ = "1.1.0a1" diff --git a/poetry/config/config.py b/poetry/config/config.py index 583f906abd6..d7fc62d35f9 100644 --- a/poetry/config/config.py +++ b/poetry/config/config.py @@ -2,8 +2,10 @@ import os import re + from copy import deepcopy from typing import Any +from typing import Callable from typing import Dict from typing import Optional @@ -14,10 +16,16 @@ from .config_source import ConfigSource from .dict_config_source import DictConfigSource + _NOT_SET = object() -boolean_validator = lambda val: val in {"true", "false", "1", "0"} -boolean_normalizer = lambda val: val in ["true", "1"] + +def boolean_validator(val): + return val in {"true", "false", "1", "0"} + + +def boolean_normalizer(val): + return val in ["true", "1"] class Config(object): diff --git a/poetry/console/application.py b/poetry/console/application.py index a67e459d500..72f293124f8 100644 --- a/poetry/console/application.py +++ b/poetry/console/application.py @@ -1,38 +1,31 @@ -import os - from cleo import Application as BaseApplication -from poetry import __version__ - -from .commands import AboutCommand -from .commands import AddCommand -from .commands import BuildCommand -from .commands import CheckCommand -from .commands import ConfigCommand -from .commands import ExportCommand -from .commands import InitCommand -from .commands import InstallCommand -from .commands import LockCommand -from .commands import NewCommand -from .commands import PublishCommand -from .commands import RemoveCommand -from .commands import RunCommand -from .commands import SearchCommand -from .commands import ShellCommand -from .commands import ShowCommand -from .commands import UpdateCommand -from .commands import VersionCommand - -from .commands.debug import DebugCommand - -from .commands.cache import CacheCommand - -from .commands.self import SelfCommand - +from poetry.__version__ import __version__ + +from .commands.about import AboutCommand +from .commands.add import AddCommand +from .commands.build import BuildCommand +from .commands.cache.cache import CacheCommand +from .commands.check import CheckCommand +from .commands.config import ConfigCommand +from .commands.debug.debug import DebugCommand +from .commands.env.env import EnvCommand +from .commands.export import ExportCommand +from .commands.init import InitCommand +from .commands.install import InstallCommand +from .commands.lock import LockCommand +from .commands.new import NewCommand +from .commands.publish import PublishCommand +from .commands.remove import RemoveCommand +from .commands.run import RunCommand +from .commands.search import SearchCommand +from .commands.self.self import SelfCommand +from .commands.shell import ShellCommand +from .commands.show import ShowCommand +from .commands.update import UpdateCommand +from .commands.version import VersionCommand from .config import ApplicationConfig -from .commands.env import EnvCommand - class Application(BaseApplication): def __init__(self): diff --git a/poetry/console/commands/about.py b/poetry/console/commands/about.py index 6ea7ec58d45..a84a2b6fec6 100644 --- a/poetry/console/commands/about.py +++ b/poetry/console/commands/about.py @@ -12,5 +12,5 @@ def handle(self): """Poetry - Package Management for Python Poetry is a dependency manager tracking local dependencies of your projects and libraries. -See https://github.com/sdispater/poetry for more information.""" +See https://github.com/python-poetry/poetry for more information.""" ) diff --git a/poetry/console/commands/add.py b/poetry/console/commands/add.py index 3fcc8a075f6..5747fe386df 100644 --- a/poetry/console/commands/add.py +++ b/poetry/console/commands/add.py @@ -1,8 +1,8 @@ from cleo import argument from cleo import option -from .init import InitCommand from .env_command import EnvCommand +from .init import InitCommand class AddCommand(EnvCommand, InitCommand): @@ -33,12 +33,19 @@ class AddCommand(EnvCommand, InitCommand): "Platforms for which the dependency must be installed.", flag=False, ), + option( + "source", + None, + "Name of the source to use to install the package.", + flag=False, + ), option("allow-prereleases", None, "Accept prereleases."), option( "dry-run", None, "Output the operations but do not execute anything (implicitly enables --verbose).", ), + option("lock", None, "Do not perform operations (only update the lockfile)."), ] help = """The add command adds required packages to your pyproject.toml and installs them. @@ -49,8 +56,8 @@ class AddCommand(EnvCommand, InitCommand): loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from poetry.installation import Installer - from poetry.semver import parse_constraint + from poetry.installation.installer import Installer + from poetry.core.semver import parse_constraint from tomlkit import inline_table packages = self.argument("name") @@ -86,7 +93,9 @@ def handle(self): raise ValueError("Package {} is already present".format(name)) requirements = self._determine_requirements( - packages, allow_prereleases=self.option("allow-prereleases") + packages, + allow_prereleases=self.option("allow-prereleases"), + source=self.option("source"), ) for _constraint in requirements: @@ -105,7 +114,7 @@ def handle(self): constraint["optional"] = True if self.option("allow-prereleases"): - constraint["allows-prereleases"] = True + constraint["allow-prereleases"] = True if self.option("extras"): extras = [] @@ -123,6 +132,9 @@ def handle(self): if self.option("platform"): constraint["platform"] = self.option("platform") + if self.option("source"): + constraint["source"] = self.option("source") + if len(constraint) == 1 and "version" in constraint: constraint = constraint["version"] @@ -143,6 +155,8 @@ def handle(self): installer.dry_run(self.option("dry-run")) installer.update(True) + if self.option("lock"): + installer.lock() installer.whitelist([r["name"] for r in requirements]) try: diff --git a/poetry/console/commands/build.py b/poetry/console/commands/build.py index a8d72fc1d9e..d2473ab0bfd 100644 --- a/poetry/console/commands/build.py +++ b/poetry/console/commands/build.py @@ -12,8 +12,13 @@ class BuildCommand(EnvCommand): option("format", "f", "Limit the format to either sdist or wheel.", flag=False) ] + loggers = [ + "poetry.core.masonry.builders.sdist", + "poetry.core.masonry.builders.wheel", + ] + def handle(self): - from poetry.masonry import Builder + from poetry.core.masonry import Builder fmt = "all" if self.option("format"): @@ -21,10 +26,10 @@ def handle(self): package = self.poetry.package self.line( - "Building {} ({})".format( + "Building {} ({})".format( package.pretty_name, package.version ) ) - builder = Builder(self.poetry, self.env, self.io) + builder = Builder(self.poetry) builder.build(fmt) diff --git a/poetry/console/commands/cache/__init__.py b/poetry/console/commands/cache/__init__.py index 8789474f74a..e69de29bb2d 100644 --- a/poetry/console/commands/cache/__init__.py +++ b/poetry/console/commands/cache/__init__.py @@ -1 +0,0 @@ -from .cache import CacheCommand diff --git a/poetry/console/commands/cache/cache.py b/poetry/console/commands/cache/cache.py index 9f80da7310d..695e27e0af7 100644 --- a/poetry/console/commands/cache/cache.py +++ b/poetry/console/commands/cache/cache.py @@ -1,5 +1,6 @@ -from ..command import Command +from poetry.console.commands.cache.list import CacheListCommand +from ..command import Command from .clear import CacheClearCommand @@ -8,7 +9,7 @@ class CacheCommand(Command): name = "cache" description = "Interact with Poetry's cache" - commands = [CacheClearCommand()] + commands = [CacheClearCommand(), CacheListCommand()] def handle(self): return self.call("help", self._config.name) diff --git a/poetry/console/commands/cache/clear.py b/poetry/console/commands/cache/clear.py index 347f534afc0..c46dab01281 100644 --- a/poetry/console/commands/cache/clear.py +++ b/poetry/console/commands/cache/clear.py @@ -16,19 +16,17 @@ class CacheClearCommand(Command): def handle(self): from cachy import CacheManager - from poetry.locations import CACHE_DIR - from poetry.utils._compat import Path + from poetry.locations import REPOSITORY_CACHE_DIR cache = self.argument("cache") parts = cache.split(":") root = parts[0] - base_cache = Path(CACHE_DIR) / "cache" / "repositories" - cache_dir = base_cache / root + cache_dir = REPOSITORY_CACHE_DIR / root try: - cache_dir.relative_to(base_cache) + cache_dir.relative_to(REPOSITORY_CACHE_DIR) except ValueError: raise ValueError("{} is not a valid repository cache".format(root)) diff --git a/poetry/console/commands/cache/list.py b/poetry/console/commands/cache/list.py new file mode 100644 index 00000000000..6a030fa2eba --- /dev/null +++ b/poetry/console/commands/cache/list.py @@ -0,0 +1,21 @@ +import os + +from ..command import Command + + +class CacheListCommand(Command): + + name = "list" + description = "List Poetry's caches." + + def handle(self): + from poetry.locations import REPOSITORY_CACHE_DIR + + if os.path.exists(str(REPOSITORY_CACHE_DIR)): + caches = list(sorted(REPOSITORY_CACHE_DIR.iterdir())) + if caches: + for cache in caches: + self.line("{}".format(cache.name)) + return 0 + + self.line("No caches found") diff --git a/poetry/console/commands/config.py b/poetry/console/commands/config.py index 2819f7ec9df..68154296ee9 100644 --- a/poetry/console/commands/config.py +++ b/poetry/console/commands/config.py @@ -5,10 +5,7 @@ from cleo import option from poetry.factory import Factory -from poetry.utils.helpers import ( - keyring_repository_password_del, - keyring_repository_password_set, -) + from .command import Command @@ -42,12 +39,11 @@ class ConfigCommand(Command): @property def unique_config_values(self): + from poetry.config.config import boolean_normalizer + from poetry.config.config import boolean_validator from poetry.locations import CACHE_DIR from poetry.utils._compat import Path - boolean_validator = lambda val: val in {"true", "false", "1", "0"} - boolean_normalizer = lambda val: val in ["true", "1"] - unique_config_values = { "cache-dir": ( str, @@ -183,11 +179,14 @@ def handle(self): # handle auth m = re.match(r"^(http-basic|pypi-token)\.(.+)", self.argument("key")) if m: + from poetry.utils.password_manager import PasswordManager + + password_manager = PasswordManager(config) if self.option("unset"): - keyring_repository_password_del(config, m.group(2)) - config.auth_config_source.remove_property( - "{}.{}".format(m.group(1), m.group(2)) - ) + if m.group(1) == "http-basic": + password_manager.delete_http_password(m.group(2)) + elif m.group(1) == "pypi-token": + password_manager.delete_pypi_token(m.group(2)) return 0 @@ -205,15 +204,7 @@ def handle(self): username = values[0] password = values[1] - property_value = dict(username=username) - try: - keyring_repository_password_set(m.group(2), username, password) - except RuntimeError: - property_value.update(password=password) - - config.auth_config_source.add_property( - "{}.{}".format(m.group(1), m.group(2)), property_value - ) + password_manager.set_http_password(m.group(2), username, password) elif m.group(1) == "pypi-token": if len(values) != 1: raise ValueError( @@ -222,9 +213,28 @@ def handle(self): token = values[0] + password_manager.set_pypi_token(m.group(2), token) + + return 0 + + # handle certs + m = re.match( + r"(?:certificates)\.([^.]+)\.(cert|client-cert)", self.argument("key") + ) + if m: + if self.option("unset"): + config.auth_config_source.remove_property( + "certificates.{}.{}".format(m.group(1), m.group(2)) + ) + + return 0 + + if len(values) == 1: config.auth_config_source.add_property( - "{}.{}".format(m.group(1), m.group(2)), token + "certificates.{}.{}".format(m.group(1), m.group(2)), values[0] ) + else: + raise ValueError("You must pass exactly 1 value") return 0 diff --git a/poetry/console/commands/debug/__init__.py b/poetry/console/commands/debug/__init__.py index 72da13a8c7d..e69de29bb2d 100644 --- a/poetry/console/commands/debug/__init__.py +++ b/poetry/console/commands/debug/__init__.py @@ -1 +0,0 @@ -from .debug import DebugCommand diff --git a/poetry/console/commands/debug/resolve.py b/poetry/console/commands/debug/resolve.py index b826ef1bf31..c4c64b483c3 100644 --- a/poetry/console/commands/debug/resolve.py +++ b/poetry/console/commands/debug/resolve.py @@ -1,14 +1,10 @@ -import re - -from typing import List - from cleo import argument from cleo import option -from ..command import Command +from ..init import InitCommand -class DebugResolveCommand(Command): +class DebugResolveCommand(InitCommand): name = "resolve" description = "Debugs dependency resolution." @@ -32,10 +28,11 @@ class DebugResolveCommand(Command): loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from poetry.packages import ProjectPackage + from poetry.core.packages.project_package import ProjectPackage + from poetry.io.null_io import NullIO from poetry.puzzle import Solver + from poetry.repositories.pool import Pool from poetry.repositories.repository import Repository - from poetry.semver import parse_constraint from poetry.utils.env import EnvManager packages = self.argument("package") @@ -43,12 +40,25 @@ def handle(self): if not packages: package = self.poetry.package else: + # Using current pool for determine_requirements() + self._pool = self.poetry.pool + package = ProjectPackage( self.poetry.package.name, self.poetry.package.version ) - requirements = self._format_requirements(packages) - for name, constraint in requirements.items(): + # Silencing output + is_quiet = self.io.output.is_quiet() + if not is_quiet: + self.io.output.set_quiet(True) + + requirements = self._determine_requirements(packages) + + if not is_quiet: + self.io.output.set_quiet(False) + + for constraint in requirements: + name = constraint.pop("name") dep = package.add_dependency(name, constraint) extras = [] for extra in self.option("extras"): @@ -90,21 +100,29 @@ def handle(self): return 0 - env = EnvManager(self.poetry.config).get(self.poetry.file.parent) - current_python_version = parse_constraint( - ".".join(str(v) for v in env.version_info) - ) table = self.table([], style="borderless") rows = [] + + if self.option("install"): + env = EnvManager(self.poetry).get() + pool = Pool() + locked_repository = Repository() + for op in ops: + locked_repository.add_package(op.package) + + pool.add_repository(locked_repository) + + solver = Solver(package, pool, Repository(), Repository(), NullIO()) + with solver.use_environment(env): + ops = solver.solve() + for op in ops: + if self.option("install") and op.skipped: + continue + pkg = op.package - if self.option("install"): - if not pkg.python_constraint.allows( - current_python_version - ) or not env.is_valid_for_marker(pkg.marker): - continue row = [ - "{}".format(pkg.name), + "{}".format(pkg.name), "{}".format(pkg.version), "", ] @@ -116,55 +134,3 @@ def handle(self): table.set_rows(rows) table.render(self.io) - - def _determine_requirements(self, requires): # type: (List[str]) -> List[str] - from poetry.semver import parse_constraint - - if not requires: - return [] - - requires = self._parse_name_version_pairs(requires) - for requirement in requires: - if "version" in requirement: - parse_constraint(requirement["version"]) - - return requires - - def _parse_name_version_pairs(self, pairs): # type: (list) -> list - result = [] - - for i in range(len(pairs)): - if pairs[i].startswith("git+https://"): - url = pairs[i].lstrip("git+") - rev = None - if "@" in url: - url, rev = url.split("@") - - pair = {"name": url.split("/")[-1].rstrip(".git"), "git": url} - if rev: - pair["rev"] = rev - - result.append(pair) - - continue - - pair = re.sub("^([^=: ]+)[=: ](.*)$", "\\1 \\2", pairs[i].strip()) - pair = pair.strip() - - if " " in pair: - name, version = pair.split(" ", 2) - result.append({"name": name, "version": version}) - else: - result.append({"name": pair, "version": "*"}) - - return result - - def _format_requirements(self, requirements): # type: (List[str]) -> dict - requires = {} - requirements = self._determine_requirements(requirements) - - for requirement in requirements: - name = requirement.pop("name") - requires[name] = requirement - - return requires diff --git a/poetry/console/commands/env/__init__.py b/poetry/console/commands/env/__init__.py index 8407782aedb..e69de29bb2d 100644 --- a/poetry/console/commands/env/__init__.py +++ b/poetry/console/commands/env/__init__.py @@ -1 +0,0 @@ -from .env import EnvCommand diff --git a/poetry/console/commands/env/env.py b/poetry/console/commands/env/env.py index 22f7e59ac4d..f979b66e436 100644 --- a/poetry/console/commands/env/env.py +++ b/poetry/console/commands/env/env.py @@ -1,5 +1,4 @@ from ..command import Command - from .info import EnvInfoCommand from .list import EnvListCommand from .remove import EnvRemoveCommand diff --git a/poetry/console/commands/env/info.py b/poetry/console/commands/env/info.py index d81343c7efc..301d88f9520 100644 --- a/poetry/console/commands/env/info.py +++ b/poetry/console/commands/env/info.py @@ -13,14 +13,13 @@ class EnvInfoCommand(Command): def handle(self): from poetry.utils.env import EnvManager - poetry = self.poetry - env = EnvManager(poetry.config).get(cwd=poetry.file.parent) + env = EnvManager(self.poetry).get() if self.option("path"): if not env.is_venv(): return 1 - self.write(str(env.path)) + self.line(str(env.path)) return diff --git a/poetry/console/commands/env/list.py b/poetry/console/commands/env/list.py index edd82debb0d..272a853b976 100644 --- a/poetry/console/commands/env/list.py +++ b/poetry/console/commands/env/list.py @@ -13,11 +13,10 @@ class EnvListCommand(Command): def handle(self): from poetry.utils.env import EnvManager - poetry = self.poetry - manager = EnvManager(poetry.config) - current_env = manager.get(self.poetry.file.parent) + manager = EnvManager(self.poetry) + current_env = manager.get() - for venv in manager.list(self.poetry.file.parent): + for venv in manager.list(): name = venv.path.name if self.option("full-path"): name = str(venv.path) diff --git a/poetry/console/commands/env/remove.py b/poetry/console/commands/env/remove.py index f03588998e0..5f208851deb 100644 --- a/poetry/console/commands/env/remove.py +++ b/poetry/console/commands/env/remove.py @@ -15,8 +15,7 @@ class EnvRemoveCommand(Command): def handle(self): from poetry.utils.env import EnvManager - poetry = self.poetry - manager = EnvManager(poetry.config) - venv = manager.remove(self.argument("python"), poetry.file.parent) + manager = EnvManager(self.poetry) + venv = manager.remove(self.argument("python")) self.line("Deleted virtualenv: {}".format(venv.path)) diff --git a/poetry/console/commands/env/use.py b/poetry/console/commands/env/use.py index e7b84da17bc..ef9cf3def6b 100644 --- a/poetry/console/commands/env/use.py +++ b/poetry/console/commands/env/use.py @@ -13,14 +13,13 @@ class EnvUseCommand(Command): def handle(self): from poetry.utils.env import EnvManager - poetry = self.poetry - manager = EnvManager(poetry.config) + manager = EnvManager(self.poetry) if self.argument("python") == "system": - manager.deactivate(poetry.file.parent, self._io) + manager.deactivate(self._io) return - env = manager.activate(self.argument("python"), poetry.file.parent, self._io) + env = manager.activate(self.argument("python"), self._io) self.line("Using virtualenv: {}".format(env.path)) diff --git a/poetry/console/commands/export.py b/poetry/console/commands/export.py index 37cfc1394e8..126b657b937 100644 --- a/poetry/console/commands/export.py +++ b/poetry/console/commands/export.py @@ -11,7 +11,13 @@ class ExportCommand(Command): description = "Exports the lock file to alternative formats." options = [ - option("format", "f", "Format to export to.", flag=False), + option( + "format", + "f", + "Format to export to. Currently, only requirements.txt is supported.", + flag=False, + default=Exporter.FORMAT_REQUIREMENTS_TXT, + ), option("output", "o", "The name of the output file.", flag=False), option("without-hashes", None, "Exclude hashes from the exported file."), option("dev", None, "Include development dependencies."), diff --git a/poetry/console/commands/init.py b/poetry/console/commands/init.py index a6626417043..fb1a90500f7 100644 --- a/poetry/console/commands/init.py +++ b/poetry/console/commands/init.py @@ -3,6 +3,7 @@ import os import re +import sys from typing import Dict from typing import List @@ -12,10 +13,9 @@ from cleo import option from tomlkit import inline_table -from poetry.utils._compat import Path from poetry.utils._compat import OrderedDict +from poetry.utils._compat import Path from poetry.utils._compat import urlparse -from poetry.utils.helpers import temporary_directory from .command import Command from .env_command import EnvCommand @@ -52,7 +52,7 @@ class InitCommand(Command): ] help = """\ -The init command creates a basic pyproject.toml file in the current directory. +The init command creates a basic pyproject.toml file in the current directory. """ def __init__(self): @@ -63,8 +63,8 @@ def __init__(self): def handle(self): from poetry.layouts import layout from poetry.utils._compat import Path - from poetry.utils.env import EnvManager - from poetry.vcs.git import GitConfig + from poetry.utils.env import SystemEnv + from poetry.core.vcs.git import GitConfig if (Path.cwd() / "pyproject.toml").exists(): self.line("A pyproject.toml file already exists.") @@ -126,7 +126,7 @@ def handle(self): question.set_validator(self._validate_license) license = self.ask(question) - current_env = EnvManager().get(Path.cwd()) + current_env = SystemEnv(Path(sys.executable)) default_python = "^{}".format( ".".join(str(v) for v in current_env.version_info[:2]) ) @@ -147,11 +147,11 @@ def handle(self): "You can specify a package in the following forms:\n" " - A single name (requests)\n" " - A name and a constraint (requests ^2.23.0)\n" - " - A git url (https://github.com/sdispater/poetry.git)\n" - " - A git url with a revision (https://github.com/sdispater/poetry.git@develop)\n" + " - A git url (git+https://github.com/python-poetry/poetry.git)\n" + " - A git url with a revision (git+https://github.com/python-poetry/poetry.git#develop)\n" " - A file path (../my-package/my-package.whl)\n" " - A directory (../my-package/)\n" - " - An url (https://example.com/packages/my-package-0.1.0.tar.gz)\n" + " - A url (https://example.com/packages/my-package-0.1.0.tar.gz)\n" ) help_displayed = False if self.confirm(question, True): @@ -165,8 +165,7 @@ def handle(self): dev_requirements = {} question = ( - "Would you like to define your dev dependencies" - " (require-dev) interactively" + "Would you like to define your development dependencies interactively?" ) if self.confirm(question, True): if not help_displayed: @@ -204,12 +203,14 @@ def handle(self): f.write(content) def _determine_requirements( - self, requires, allow_prereleases=False + self, requires, allow_prereleases=False, source=None ): # type: (List[str], bool) -> List[Dict[str, str]] if not requires: requires = [] - package = self.ask("Add a package:") + package = self.ask( + "Search for package to add (or leave blank to continue):" + ) while package is not None: constraint = self._parse_requirements([package])[0] if ( @@ -247,7 +248,7 @@ def _determine_requirements( choices.append(found_package.pretty_name) self.line( - "Found {} packages matching {}".format( + "Found {} packages matching {}".format( len(matches), package ) ) @@ -275,7 +276,7 @@ def _determine_requirements( ) self.line( - "Using version {} for {}".format( + "Using version {} for {}".format( package_constraint, package ) ) @@ -298,13 +299,15 @@ def _determine_requirements( elif "version" not in requirement: # determine the best version automatically name, version = self._find_best_version_for_package( - requirement["name"], allow_prereleases=allow_prereleases + requirement["name"], + allow_prereleases=allow_prereleases, + source=source, ) requirement["version"] = version requirement["name"] = name self.line( - "Using version {} for {}".format(version, name) + "Using version {} for {}".format(version, name) ) else: # check that the specified version/constraint exists @@ -313,6 +316,7 @@ def _determine_requirements( requirement["name"], requirement["version"], allow_prereleases=allow_prereleases, + source=source, ) requirement["name"] = name @@ -322,13 +326,13 @@ def _determine_requirements( return result def _find_best_version_for_package( - self, name, required_version=None, allow_prereleases=False + self, name, required_version=None, allow_prereleases=False, source=None ): # type: (...) -> Tuple[str, str] from poetry.version.version_selector import VersionSelector selector = VersionSelector(self._get_pool()) package = selector.find_best_candidate( - name, required_version, allow_prereleases=allow_prereleases + name, required_version, allow_prereleases=allow_prereleases, source=source ) if not package: @@ -363,22 +367,21 @@ def _parse_requirements( if url_parsed.scheme and url_parsed.netloc: # Url if url_parsed.scheme in ["git+https", "git+ssh"]: - url = requirement.lstrip("git+") - rev = None - if "@" in url: - url, rev = url.split("@") + from poetry.core.vcs.git import Git + from poetry.core.vcs.git import ParsedUrl - pair = OrderedDict( - [("name", url.split("/")[-1].rstrip(".git")), ("git", url)] - ) - if rev: - pair["rev"] = rev + parsed = ParsedUrl.parse(requirement) + url = Git.normalize_url(requirement) + + pair = OrderedDict([("name", parsed.name), ("git", url.url)]) + if parsed.rev: + pair["rev"] = url.revision if extras: pair["extras"] = extras package = Provider.get_package_from_vcs( - "git", url, reference=pair.get("rev") + "git", url.url, reference=pair.get("rev") ) pair["name"] = package.name result.append(pair) @@ -424,12 +427,17 @@ def _parse_requirements( require = OrderedDict() if " " in pair: name, version = pair.split(" ", 2) + extras_m = re.search(r"\[([\w\d,-_]+)\]$", name) + if extras_m: + extras = [e.strip() for e in extras_m.group(1).split(",")] + name, _ = name.split("[") + require["name"] = name if version != "latest": require["version"] = version else: m = re.match( - "^([^><=!: ]+)((?:>=|<=|>|<|!=|~=|~|\^).*)$", requirement.strip() + r"^([^><=!: ]+)((?:>=|<=|>|<|!=|~=|~|\^).*)$", requirement.strip() ) if m: name, constraint = m.group(1), m.group(2) @@ -473,7 +481,7 @@ def _format_requirements( return requires def _validate_author(self, author, default): - from poetry.packages.package import AUTHOR_REGEX + from poetry.core.packages.package import AUTHOR_REGEX author = author or default @@ -490,7 +498,7 @@ def _validate_author(self, author, default): return author def _validate_license(self, license): - from poetry.spdx import license_by_id + from poetry.core.spdx import license_by_id if license: license_by_id(license) diff --git a/poetry/console/commands/install.py b/poetry/console/commands/install.py index d93f33bb341..d4fc00ea501 100644 --- a/poetry/console/commands/install.py +++ b/poetry/console/commands/install.py @@ -19,6 +19,9 @@ class InstallCommand(EnvCommand): "Output the operations but do not execute anything " "(implicitly enables --verbose).", ), + option( + "remove-untracked", None, "Removes packages not present in the lock file.", + ), option( "extras", "E", @@ -34,15 +37,20 @@ class InstallCommand(EnvCommand): exist it will look for pyproject.toml and do the same. poetry install + +By default, the above command will also install the current project. To install only the +dependencies and not including the current project, run the command with the +--no-root option like below: + + poetry install --no-root """ _loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from clikit.io import NullIO - from poetry.installation import Installer + from poetry.installation.installer import Installer from poetry.masonry.builders import EditableBuilder - from poetry.masonry.utils.module import ModuleOrPackageNotFound + from poetry.core.masonry.utils.module import ModuleOrPackageNotFound installer = Installer( self.io, self.env, self.poetry.package, self.poetry.locker, self.poetry.pool @@ -58,6 +66,7 @@ def handle(self): installer.extras(extras) installer.dev_mode(not self.option("no-dev")) installer.dry_run(self.option("dry-run")) + installer.remove_untracked(self.option("remove-untracked")) installer.verbose(self.option("verbose")) return_code = installer.run() @@ -69,7 +78,7 @@ def handle(self): return 0 try: - builder = EditableBuilder(self.poetry, self._env, NullIO()) + builder = EditableBuilder(self.poetry, self._env, self._io) except ModuleOrPackageNotFound: # This is likely due to the fact that the project is an application # not following the structure expected by Poetry @@ -77,7 +86,7 @@ def handle(self): return 0 self.line( - " - Installing {} ({})".format( + " - Installing {} ({})".format( self.poetry.package.pretty_name, self.poetry.package.pretty_version ) ) diff --git a/poetry/console/commands/lock.py b/poetry/console/commands/lock.py index 66cfabb1b94..8639425b446 100644 --- a/poetry/console/commands/lock.py +++ b/poetry/console/commands/lock.py @@ -6,8 +6,10 @@ class LockCommand(EnvCommand): name = "lock" description = "Locks the project dependencies." - help = """The lock command reads the pyproject.toml file from -the current directory, processes it, and locks the depdencies in the poetry.lock file. + help = """ +The lock command reads the pyproject.toml file from the +current directory, processes it, and locks the dependencies in the poetry.lock +file. poetry lock """ @@ -15,7 +17,7 @@ class LockCommand(EnvCommand): loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from poetry.installation import Installer + from poetry.installation.installer import Installer installer = Installer( self.io, self.env, self.poetry.package, self.poetry.locker, self.poetry.pool diff --git a/poetry/console/commands/new.py b/poetry/console/commands/new.py index f8822c6ae6d..126ed706683 100644 --- a/poetry/console/commands/new.py +++ b/poetry/console/commands/new.py @@ -1,6 +1,10 @@ +import sys + from cleo import argument from cleo import option +from poetry.utils.helpers import module_name + from .command import Command @@ -23,9 +27,10 @@ class NewCommand(Command): def handle(self): from poetry.layouts import layout + from poetry.core.semver import parse_constraint from poetry.utils._compat import Path - from poetry.utils.env import EnvManager - from poetry.vcs.git import GitConfig + from poetry.utils.env import SystemEnv + from poetry.core.vcs.git import GitConfig if self.option("src"): layout_ = layout("src") @@ -58,21 +63,30 @@ def handle(self): if author_email: author += " <{}>".format(author_email) - current_env = EnvManager().get(Path.cwd()) + current_env = SystemEnv(Path(sys.executable)) default_python = "^{}".format( ".".join(str(v) for v in current_env.version_info[:2]) ) + + dev_dependencies = {} + python_constraint = parse_constraint(default_python) + if parse_constraint("<3.5").allows_any(python_constraint): + dev_dependencies["pytest"] = "^4.6" + if parse_constraint(">=3.5").allows_all(python_constraint): + dev_dependencies["pytest"] = "^5.2" + layout_ = layout_( name, "0.1.0", author=author, readme_format=readme_format, python=default_python, + dev_dependencies=dev_dependencies, ) layout_.create(path) self.line( "Created package {} in {}".format( - name, path.relative_to(Path.cwd()) + module_name(name), path.relative_to(Path.cwd()) ) ) diff --git a/poetry/console/commands/publish.py b/poetry/console/commands/publish.py index b888ea045b0..557cd1d7ab7 100644 --- a/poetry/console/commands/publish.py +++ b/poetry/console/commands/publish.py @@ -1,5 +1,7 @@ from cleo import option +from poetry.utils._compat import Path + from .command import Command @@ -14,7 +16,17 @@ class PublishCommand(Command): ), option("username", "u", "The username to access the repository.", flag=False), option("password", "p", "The password to access the repository.", flag=False), + option( + "cert", None, "Certificate authority to access the repository.", flag=False + ), + option( + "client-cert", + None, + "Client certificate to access the repository.", + flag=False, + ), option("build", None, "Build the package before publishing."), + option("dry-run", None, "Perform all actions except upload the package."), ] help = """The publish command builds and uploads the package to a remote repository. @@ -29,7 +41,7 @@ class PublishCommand(Command): loggers = ["poetry.masonry.publishing.publisher"] def handle(self): - from poetry.masonry.publishing.publisher import Publisher + from poetry.publishing.publisher import Publisher publisher = Publisher(self.poetry, self.io) @@ -57,6 +69,16 @@ def handle(self): self.line("") + cert = Path(self.option("cert")) if self.option("cert") else None + client_cert = ( + Path(self.option("client-cert")) if self.option("client-cert") else None + ) + publisher.publish( - self.option("repository"), self.option("username"), self.option("password") + self.option("repository"), + self.option("username"), + self.option("password"), + cert, + client_cert, + self.option("dry-run"), ) diff --git a/poetry/console/commands/remove.py b/poetry/console/commands/remove.py index 8931cc2214b..c713b8a000b 100644 --- a/poetry/console/commands/remove.py +++ b/poetry/console/commands/remove.py @@ -28,7 +28,7 @@ class RemoveCommand(EnvCommand): loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from poetry.installation import Installer + from poetry.installation.installer import Installer packages = self.argument("packages") is_dev = self.option("dev") diff --git a/poetry/console/commands/run.py b/poetry/console/commands/run.py index 3edac407ad5..fda01114426 100644 --- a/poetry/console/commands/run.py +++ b/poetry/console/commands/run.py @@ -40,19 +40,17 @@ def run_script(self, script, args): cmd = ["python", "-c"] cmd += [ - '"import sys; ' + "import sys; " "from importlib import import_module; " "sys.argv = {!r}; {}" - "import_module('{}').{}()\"".format( - args, src_in_sys_path, module, callable_ - ) + "import_module('{}').{}()".format(args, src_in_sys_path, module, callable_) ] - return self.env.run(*cmd, shell=True, call=True) + return self.env.execute(*cmd) @property def _module(self): - from ...masonry.utils.module import Module + from poetry.core.masonry.utils.module import Module poetry = self.poetry package = poetry.package diff --git a/poetry/console/commands/search.py b/poetry/console/commands/search.py index 7f1872254d1..299dee6a96a 100644 --- a/poetry/console/commands/search.py +++ b/poetry/console/commands/search.py @@ -1,5 +1,4 @@ from cleo import argument -from cleo import option from .command import Command @@ -10,16 +9,11 @@ class SearchCommand(Command): description = "Searches for packages on remote repositories." arguments = [argument("tokens", "The tokens to search for.", multiple=True)] - options = [option("only-name", "N", "Search only by name.")] def handle(self): from poetry.repositories.pypi_repository import PyPiRepository - flags = PyPiRepository.SEARCH_FULLTEXT - if self.option("only-name"): - flags = PyPiRepository.SEARCH_NAME - - results = PyPiRepository().search(self.argument("tokens"), flags) + results = PyPiRepository().search(self.argument("tokens")) for result in results: self.line("") diff --git a/poetry/console/commands/self/__init__.py b/poetry/console/commands/self/__init__.py index 53c3465c732..e69de29bb2d 100644 --- a/poetry/console/commands/self/__init__.py +++ b/poetry/console/commands/self/__init__.py @@ -1 +0,0 @@ -from .self import SelfCommand diff --git a/poetry/console/commands/self/self.py b/poetry/console/commands/self/self.py index d5774941bf6..3e5cafa9180 100644 --- a/poetry/console/commands/self/self.py +++ b/poetry/console/commands/self/self.py @@ -1,5 +1,4 @@ from ..command import Command - from .update import SelfUpdateCommand diff --git a/poetry/console/commands/self/update.py b/poetry/console/commands/self/update.py index f5501ec1e3b..dee590ca499 100644 --- a/poetry/console/commands/self/update.py +++ b/poetry/console/commands/self/update.py @@ -1,6 +1,10 @@ +from __future__ import unicode_literals + import hashlib import os +import re import shutil +import stat import subprocess import sys import tarfile @@ -8,6 +12,12 @@ from functools import cmp_to_key from gzip import GzipFile +from cleo import argument +from cleo import option + +from ..command import Command + + try: from urllib.error import HTTPError from urllib.request import urlopen @@ -15,10 +25,26 @@ from urllib2 import HTTPError from urllib2 import urlopen -from cleo import argument -from cleo import option -from ..command import Command +BIN = """# -*- coding: utf-8 -*- +import glob +import sys +import os + +lib = os.path.normpath(os.path.join(os.path.realpath(__file__), "../..", "lib")) +vendors = os.path.join(lib, "poetry", "_vendor") +current_vendors = os.path.join( + vendors, "py{}".format(".".join(str(v) for v in sys.version_info[:2])) +) +sys.path.insert(0, lib) +sys.path.insert(0, current_vendors) + +if __name__ == "__main__": + from poetry.console import main + main() +""" + +BAT = '@echo off\r\n{python_executable} "{poetry_bin}" %*\r\n' class SelfUpdateCommand(Command): @@ -29,16 +55,18 @@ class SelfUpdateCommand(Command): arguments = [argument("version", "The version to update to.", optional=True)] options = [option("preview", None, "Install prereleases.")] - BASE_URL = "https://github.com/sdispater/poetry/releases/download" + REPOSITORY_URL = "https://github.com/python-poetry/poetry" + BASE_URL = REPOSITORY_URL + "/releases/download" @property def home(self): from poetry.utils._compat import Path - from poetry.utils.appdirs import expanduser - home = Path(expanduser("~")) + return Path(os.environ.get("POETRY_HOME", "~/.poetry")).expanduser() - return home / ".poetry" + @property + def bin(self): + return self.home / "bin" @property def lib(self): @@ -51,17 +79,9 @@ def lib_backup(self): def handle(self): from poetry.__version__ import __version__ from poetry.repositories.pypi_repository import PyPiRepository - from poetry.semver import Version - from poetry.utils._compat import Path + from poetry.core.semver import Version - current = Path(__file__) - try: - current.relative_to(self.home) - except ValueError: - raise RuntimeError( - "Poetry was not installed with the recommended installer. " - "Cannot update automatically." - ) + self._check_recommended_installation() version = self.argument("version") if not version: @@ -133,6 +153,8 @@ def update(self, release): if self.lib_backup.exists(): shutil.rmtree(str(self.lib_backup)) + self.make_bin() + self.line("") self.line("") self.line( @@ -144,26 +166,26 @@ def update(self, release): def _update(self, version): from poetry.utils.helpers import temporary_directory - platform = sys.platform - if platform == "linux2": - platform = "linux" + release_name = self._get_release_name(version) - checksum = "poetry-{}-{}.sha256sum".format(version, platform) + checksum = "{}.sha256sum".format(release_name) + + base_url = self.BASE_URL try: - r = urlopen(self.BASE_URL + "/{}/{}".format(version, checksum)) + r = urlopen(base_url + "/{}/{}".format(version, checksum)) except HTTPError as e: if e.code == 404: raise RuntimeError("Could not find {} file".format(checksum)) raise - checksum = r.read().decode() + checksum = r.read().decode().strip() # We get the payload from the remote host - name = "poetry-{}-{}.tar.gz".format(version, platform) + name = "{}.tar.gz".format(release_name) try: - r = urlopen(self.BASE_URL + "/{}/{}".format(version, name)) + r = urlopen(base_url + "/{}/{}".format(version, name)) except HTTPError as e: if e.code == 404: raise RuntimeError("Could not find {} file".format(name)) @@ -214,8 +236,94 @@ def _update(self, version): def process(self, *args): return subprocess.check_output(list(args), stderr=subprocess.STDOUT) + def _check_recommended_installation(self): + from poetry.utils._compat import Path + + current = Path(__file__) + try: + current.relative_to(self.home) + except ValueError: + raise RuntimeError( + "Poetry was not installed with the recommended installer. " + "Cannot update automatically." + ) + + def _get_release_name(self, version): + platform = sys.platform + if platform == "linux2": + platform = "linux" + + return "poetry-{}-{}".format(version, platform) + def _bin_path(self, base_path, bin): - if sys.platform == "win32": + from poetry.utils._compat import WINDOWS + + if WINDOWS: return (base_path / "Scripts" / bin).with_suffix(".exe") return base_path / "bin" / bin + + def make_bin(self): + from poetry.utils._compat import WINDOWS + + self.bin.mkdir(0o755, parents=True, exist_ok=True) + + python_executable = self._which_python() + + if WINDOWS: + with self.bin.joinpath("poetry.bat").open("w", newline="") as f: + f.write( + BAT.format( + python_executable=python_executable, + poetry_bin=str(self.bin / "poetry").replace( + os.environ["USERPROFILE"], "%USERPROFILE%" + ), + ) + ) + + bin_content = BIN + if not WINDOWS: + bin_content = "#!/usr/bin/env {}\n".format(python_executable) + bin_content + + self.bin.joinpath("poetry").write_text(bin_content, encoding="utf-8") + + if not WINDOWS: + # Making the file executable + st = os.stat(str(self.bin.joinpath("poetry"))) + os.chmod(str(self.bin.joinpath("poetry")), st.st_mode | stat.S_IEXEC) + + def _which_python(self): + """ + Decides which python executable we'll embed in the launcher script. + """ + from poetry.utils._compat import WINDOWS + + allowed_executables = ["python", "python3"] + if WINDOWS: + allowed_executables += ["py.exe -3", "py.exe -2"] + + # \d in regex ensures we can convert to int later + version_matcher = re.compile(r"^Python (?P\d+)\.(?P\d+)\..+$") + fallback = None + for executable in allowed_executables: + try: + raw_version = subprocess.check_output( + executable + " --version", stderr=subprocess.STDOUT, shell=True + ).decode("utf-8") + except subprocess.CalledProcessError: + continue + + match = version_matcher.match(raw_version.strip()) + if match and tuple(map(int, match.groups())) >= (3, 0): + # favor the first py3 executable we can find. + return executable + + if fallback is None: + # keep this one as the fallback; it was the first valid executable we found. + fallback = executable + + if fallback is None: + # Avoid breaking existing scripts + fallback = "python" + + return fallback diff --git a/poetry/console/commands/shell.py b/poetry/console/commands/shell.py index bdc8c0b1401..033ab207e31 100644 --- a/poetry/console/commands/shell.py +++ b/poetry/console/commands/shell.py @@ -1,7 +1,7 @@ import sys -from os import environ from distutils.util import strtobool +from os import environ from .env_command import EnvCommand diff --git a/poetry/console/commands/show.py b/poetry/console/commands/show.py index e8abc65e12b..24caae800bf 100644 --- a/poetry/console/commands/show.py +++ b/poetry/console/commands/show.py @@ -35,7 +35,7 @@ class ShowCommand(EnvCommand): def handle(self): from clikit.utils.terminal import Terminal from poetry.repositories.installed_repository import InstalledRepository - from poetry.semver import Version + from poetry.core.semver import Version package = self.argument("package") @@ -80,20 +80,20 @@ def handle(self): return 0 rows = [ - ["name", " : {}".format(pkg.pretty_name)], - ["version", " : {}".format(pkg.pretty_version)], + ["name", " : {}".format(pkg.pretty_name)], + ["version", " : {}".format(pkg.pretty_version)], ["description", " : {}".format(pkg.description)], ] table.add_rows(rows) - table.render() + table.render(self.io) if pkg.requires: self.line("") self.line("dependencies") for dependency in pkg.requires: self.line( - " - {} {}".format( + " - {} {}".format( dependency.pretty_name, dependency.pretty_constraint ) ) @@ -172,6 +172,13 @@ def handle(self): # Non installed in non decorated mode install_marker = " (!)" + if ( + show_latest + and self.option("outdated") + and latest_statuses[locked.pretty_name] == "up-to-date" + ): + continue + line = "{:{}}{}".format( color, name, name_length - len(install_marker), install_marker ) @@ -183,9 +190,6 @@ def handle(self): latest = latest_packages[locked.pretty_name] update_status = latest_statuses[locked.pretty_name] - if self.option("outdated") and update_status == "up-to-date": - continue - if write_latest: color = "green" if update_status == "semver-safe-update": @@ -211,7 +215,7 @@ def handle(self): self.line(line) def display_package_tree(self, io, package, installed_repo): - io.write("{}".format(package.pretty_name)) + io.write("{}".format(package.pretty_name)) description = "" if package.description: description = " " + package.description @@ -343,7 +347,7 @@ def find_latest_package(self, package, include_dev): return selector.find_best_candidate(name, ">={}".format(package.pretty_version)) def get_update_status(self, latest, package): - from poetry.semver import parse_constraint + from poetry.core.semver import parse_constraint if latest.full_pretty_version == package.full_pretty_version: return "up-to-date" diff --git a/poetry/console/commands/update.py b/poetry/console/commands/update.py index 31499ef92d5..5c00f27ba61 100644 --- a/poetry/console/commands/update.py +++ b/poetry/console/commands/update.py @@ -28,7 +28,7 @@ class UpdateCommand(EnvCommand): loggers = ["poetry.repositories.pypi_repository"] def handle(self): - from poetry.installation import Installer + from poetry.installation.installer import Installer packages = self.argument("packages") diff --git a/poetry/console/commands/version.py b/poetry/console/commands/version.py index 4a764e7927e..21ed676f54f 100644 --- a/poetry/console/commands/version.py +++ b/poetry/console/commands/version.py @@ -1,4 +1,5 @@ from cleo import argument +from cleo import option from .command import Command @@ -7,7 +8,7 @@ class VersionCommand(Command): name = "version" description = ( - "Shows the version of the project or bumps it when a valid" + "Shows the version of the project or bumps it when a valid " "bump rule is provided." ) @@ -18,9 +19,10 @@ class VersionCommand(Command): optional=True, ) ] + options = [option("short", "s", "Output the version number only")] help = """\ -The version command shows the current version of the project or bumps the version of +The version 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. @@ -47,7 +49,7 @@ def handle(self): ) self.line( - "Bumping version from {} to {}".format( + "Bumping version from {} to {}".format( self.poetry.package.pretty_version, version ) ) @@ -58,14 +60,17 @@ def handle(self): self.poetry.file.write(content) else: - self.line( - "Project ({}) version is {}".format( - self.poetry.package.name, self.poetry.package.pretty_version + if self.option("short"): + self.line("{}".format(self.poetry.package.pretty_version)) + else: + self.line( + "{} {}".format( + self.poetry.package.name, self.poetry.package.pretty_version + ) ) - ) def increment_version(self, version, rule): - from poetry.semver import Version + from poetry.core.semver import Version try: version = Version.parse(version) diff --git a/poetry/console/config/application_config.py b/poetry/console/config/application_config.py index 4fbda59cf9e..e8f752752fd 100644 --- a/poetry/console/config/application_config.py +++ b/poetry/console/config/application_config.py @@ -1,14 +1,34 @@ import logging +from typing import Any + from cleo.config import ApplicationConfig as BaseApplicationConfig -from clikit.api.event import ConsoleEvents +from clikit.api.application.application import Application +from clikit.api.args.raw_args import RawArgs +from clikit.api.event import PRE_HANDLE from clikit.api.event import PreHandleEvent +from clikit.api.event import PreResolveEvent +from clikit.api.event.event_dispatcher import EventDispatcher +from clikit.api.exceptions import CliKitException from clikit.api.formatter import Style +from clikit.api.io import Input +from clikit.api.io import InputStream +from clikit.api.io import Output +from clikit.api.io import OutputStream +from clikit.api.io.flags import DEBUG +from clikit.api.io.flags import VERBOSE +from clikit.api.io.flags import VERY_VERBOSE +from clikit.api.io.io import IO +from clikit.formatter import AnsiFormatter +from clikit.formatter import PlainFormatter +from clikit.io.input_stream import StandardInputStream +from clikit.io.output_stream import ErrorOutputStream +from clikit.io.output_stream import StandardOutputStream from poetry.console.commands.command import Command from poetry.console.commands.env_command import EnvCommand -from poetry.console.logging import IOFormatter -from poetry.console.logging import IOHandler +from poetry.console.logging.io_formatter import IOFormatter +from poetry.console.logging.io_handler import IOHandler class ApplicationConfig(BaseApplicationConfig): @@ -16,36 +36,33 @@ def configure(self): super(ApplicationConfig, self).configure() self.add_style(Style("c1").fg("cyan")) - self.add_style(Style("info").fg("cyan")) + self.add_style(Style("c2").fg("green")) + self.add_style(Style("info").fg("blue")) self.add_style(Style("comment").fg("green")) self.add_style(Style("error").fg("red").bold()) - self.add_style(Style("warning").fg("yellow")) - self.add_style(Style("debug").fg("black").bold()) + self.add_style(Style("warning").fg("yellow").bold()) + self.add_style(Style("debug").fg("default").dark()) - self.add_event_listener( - ConsoleEvents.PRE_HANDLE.value, self.register_command_loggers - ) - self.add_event_listener(ConsoleEvents.PRE_HANDLE.value, self.set_env) + self.add_event_listener(PRE_HANDLE, self.register_command_loggers) + self.add_event_listener(PRE_HANDLE, self.set_env) def register_command_loggers( - self, - event, # type: PreHandleEvent - event_name, # type: str - _, - ): # type: (...) -> None + self, event, event_name, _ + ): # type: (PreHandleEvent, str, Any) -> None command = event.command.config.handler if not isinstance(command, Command): return io = event.io - if not command.loggers: - return + loggers = ["poetry.packages.package", "poetry.utils.password_manager"] + + loggers += command.loggers handler = IOHandler(io) handler.setFormatter(IOFormatter()) - for logger in command.loggers: + for logger in loggers: logger = logging.getLogger(logger) logger.handlers = [handler] @@ -59,8 +76,7 @@ def register_command_loggers( logger.setLevel(level) - def set_env(self, event, event_name, _): # type: (PreHandleEvent, str, _) -> None - from poetry.semver import parse_constraint + def set_env(self, event, event_name, _): # type: (PreHandleEvent, str, Any) -> None from poetry.utils.env import EnvManager command = event.command.config.handler # type: EnvCommand @@ -70,27 +86,109 @@ def set_env(self, event, event_name, _): # type: (PreHandleEvent, str, _) -> No io = event.io poetry = command.poetry - env_manager = EnvManager(poetry.config) + env_manager = EnvManager(poetry) + env = env_manager.create_venv(io) - # Checking compatibility of the current environment with - # the python dependency specified in pyproject.toml - current_env = env_manager.get(poetry.file.parent) - supported_python = poetry.package.python_constraint - current_python = parse_constraint( - ".".join(str(v) for v in current_env.version_info[:3]) - ) + if env.is_venv() and io.is_verbose(): + io.write_line("Using virtualenv: {}".format(env.path)) + + command.set_env(env) - if not supported_python.allows(current_python): - raise RuntimeError( - "The current Python version ({}) is not supported by the project ({})\n" - "Please activate a compatible Python version.".format( - current_python, poetry.package.python_versions + def resolve_help_command( + self, event, event_name, dispatcher + ): # type: (PreResolveEvent, str, EventDispatcher) -> None + args = event.raw_args + application = event.application + + if args.has_option_token("-h") or args.has_option_token("--help"): + from clikit.api.resolver import ResolvedCommand + + try: + resolved_command = self.command_resolver.resolve(args, application) + except CliKitException: + # We weren't able to resolve the command, + # due to a parse error most likely, + # so we fall back on the default behavior + return super(ApplicationConfig, self).resolve_help_command( + event, event_name, dispatcher ) - ) - env = env_manager.create_venv(poetry.file.parent, io, poetry.package.name) + # If the current command is the run one, skip option + # check and interpret them as part of the executed command + if resolved_command.command.name == "run": + event.set_resolved_command(resolved_command) - if env.is_venv() and io.is_verbose(): - io.write_line("Using virtualenv: {}".format(env.path)) + return event.stop_propagation() - command.set_env(env) + command = application.get_command("help") + + # Enable lenient parsing + parsed_args = command.parse(args, True) + + event.set_resolved_command(ResolvedCommand(command, parsed_args)) + event.stop_propagation() + + def create_io( + self, + application, + args, + input_stream=None, + output_stream=None, + error_stream=None, + ): # type: (Application, RawArgs, InputStream, OutputStream, OutputStream) -> IO + if input_stream is None: + input_stream = StandardInputStream() + + if output_stream is None: + output_stream = StandardOutputStream() + + if error_stream is None: + error_stream = ErrorOutputStream() + + style_set = application.config.style_set + + if output_stream.supports_ansi(): + output_formatter = AnsiFormatter(style_set) + else: + output_formatter = PlainFormatter(style_set) + + if error_stream.supports_ansi(): + error_formatter = AnsiFormatter(style_set) + else: + error_formatter = PlainFormatter(style_set) + + io = self.io_class( + Input(input_stream), + Output(output_stream, output_formatter), + Output(error_stream, error_formatter), + ) + + resolved_command = application.resolve_command(args) + # If the current command is the run one, skip option + # check and interpret them as part of the executed command + if resolved_command.command.name == "run": + return io + + if args.has_option_token("--no-ansi"): + formatter = PlainFormatter(style_set) + io.output.set_formatter(formatter) + io.error_output.set_formatter(formatter) + elif args.has_option_token("--ansi"): + formatter = AnsiFormatter(style_set, True) + io.output.set_formatter(formatter) + io.error_output.set_formatter(formatter) + + if args.has_option_token("-vvv") or self.is_debug(): + io.set_verbosity(DEBUG) + elif args.has_option_token("-vv"): + io.set_verbosity(VERY_VERBOSE) + elif args.has_option_token("-v"): + io.set_verbosity(VERBOSE) + + if args.has_option_token("--quiet") or args.has_option_token("-q"): + io.set_quiet(True) + + if args.has_option_token("--no-interaction") or args.has_option_token("-n"): + io.set_interactive(False) + + return io diff --git a/poetry/console/logging/__init__.py b/poetry/console/logging/__init__.py index 95a3172eb36..e69de29bb2d 100644 --- a/poetry/console/logging/__init__.py +++ b/poetry/console/logging/__init__.py @@ -1,2 +0,0 @@ -from .io_formatter import IOFormatter -from .io_handler import IOHandler diff --git a/poetry/console/logging/formatters/__init__.py b/poetry/console/logging/formatters/__init__.py new file mode 100644 index 00000000000..247f51bec8e --- /dev/null +++ b/poetry/console/logging/formatters/__init__.py @@ -0,0 +1,7 @@ +from .builder_formatter import BuilderLogFormatter + + +FORMATTERS = { + "poetry.core.masonry.builders.sdist": BuilderLogFormatter(), + "poetry.core.masonry.builders.wheel": BuilderLogFormatter(), +} diff --git a/poetry/console/logging/formatters/builder_formatter.py b/poetry/console/logging/formatters/builder_formatter.py new file mode 100644 index 00000000000..df2f7e301fa --- /dev/null +++ b/poetry/console/logging/formatters/builder_formatter.py @@ -0,0 +1,13 @@ +import re + +from .formatter import Formatter + + +class BuilderLogFormatter(Formatter): + def format(self, msg): # type: (str) -> str + if msg.startswith(" - Building ") or msg.startswith(" - Built "): + msg = re.sub(r" - (Buil(?:t|ing)) (.+)", " - \\1 \\2", msg) + elif msg.startswith(" - Adding: "): + msg = re.sub(r" - Adding: (.+)", " - Adding: \\1", msg) + + return msg diff --git a/poetry/console/logging/formatters/formatter.py b/poetry/console/logging/formatters/formatter.py new file mode 100644 index 00000000000..35b59374be4 --- /dev/null +++ b/poetry/console/logging/formatters/formatter.py @@ -0,0 +1,6 @@ +import logging + + +class Formatter(object): + def format(self, record): # type: (logging.LogRecord) -> str + raise NotImplementedError() diff --git a/poetry/console/logging/io_formatter.py b/poetry/console/logging/io_formatter.py index c9e389a3e4b..9ff57fec761 100644 --- a/poetry/console/logging/io_formatter.py +++ b/poetry/console/logging/io_formatter.py @@ -1,5 +1,7 @@ import logging +from .formatters import FORMATTERS + class IOFormatter(logging.Formatter): @@ -15,7 +17,9 @@ def format(self, record): level = record.levelname.lower() msg = record.msg - if level in self._colors: + if record.name in FORMATTERS: + msg = FORMATTERS[record.name].format(msg) + elif level in self._colors: msg = "<{}>{}".format(self._colors[level], msg) return msg diff --git a/poetry/console/logging/io_handler.py b/poetry/console/logging/io_handler.py index fb869129a35..3a8f886260f 100644 --- a/poetry/console/logging/io_handler.py +++ b/poetry/console/logging/io_handler.py @@ -19,7 +19,7 @@ def emit(self, record): level = record.levelname.lower() err = level in ("warning", "error", "exception", "critical") if err: - self._io.error(msg, newline=True) + self._io.error_line(msg) else: self._io.write_line(msg) except Exception: diff --git a/poetry/factory.py b/poetry/factory.py index faf4de860e9..48cac9809da 100644 --- a/poetry/factory.py +++ b/poetry/factory.py @@ -1,30 +1,25 @@ from __future__ import absolute_import from __future__ import unicode_literals -import shutil - from typing import Dict -from typing import List from typing import Optional from clikit.api.io.io import IO +from poetry.core.factory import Factory as BaseFactory +from poetry.core.utils.toml_file import TomlFile + from .config.config import Config from .config.file_config_source import FileConfigSource from .io.null_io import NullIO -from .json import validate_object from .locations import CONFIG_DIR -from .packages.dependency import Dependency from .packages.locker import Locker -from .packages.project_package import ProjectPackage from .poetry import Poetry from .repositories.pypi_repository import PyPiRepository -from .spdx import license_by_id from .utils._compat import Path -from .utils.toml_file import TomlFile -class Factory: +class Factory(BaseFactory): """ Factory class to create various elements needed by Poetry. """ @@ -35,125 +30,17 @@ def create_poetry( if io is None: io = NullIO() - poetry_file = self.locate(cwd) - - local_config = TomlFile(poetry_file.as_posix()).read() - if "tool" not in local_config or "poetry" not in local_config["tool"]: - raise RuntimeError( - "[tool.poetry] section not found in {}".format(poetry_file.name) - ) - local_config = local_config["tool"]["poetry"] - - # Checking validity - check_result = self.validate(local_config) - if check_result["errors"]: - message = "" - for error in check_result["errors"]: - message += " - {}\n".format(error) - - raise RuntimeError("The Poetry configuration is invalid:\n" + message) - - # Load package - name = local_config["name"] - version = local_config["version"] - package = ProjectPackage(name, version, version) - package.root_dir = poetry_file.parent - - for author in local_config["authors"]: - package.authors.append(author) - - for maintainer in local_config.get("maintainers", []): - package.maintainers.append(maintainer) - - package.description = local_config.get("description", "") - package.homepage = local_config.get("homepage") - package.repository_url = local_config.get("repository") - package.documentation_url = local_config.get("documentation") - try: - license_ = license_by_id(local_config.get("license", "")) - except ValueError: - license_ = None - - package.license = license_ - package.keywords = local_config.get("keywords", []) - package.classifiers = local_config.get("classifiers", []) - - if "readme" in local_config: - package.readme = Path(poetry_file.parent) / local_config["readme"] - - if "platform" in local_config: - package.platform = local_config["platform"] - - if "dependencies" in local_config: - for name, constraint in local_config["dependencies"].items(): - if name.lower() == "python": - package.python_versions = constraint - continue - - if isinstance(constraint, list): - for _constraint in constraint: - package.add_dependency(name, _constraint) - - continue - - package.add_dependency(name, constraint) - - if "dev-dependencies" in local_config: - for name, constraint in local_config["dev-dependencies"].items(): - if isinstance(constraint, list): - for _constraint in constraint: - package.add_dependency(name, _constraint, category="dev") - - continue - - package.add_dependency(name, constraint, category="dev") - - extras = local_config.get("extras", {}) - for extra_name, requirements in extras.items(): - package.extras[extra_name] = [] - - # Checking for dependency - for req in requirements: - req = Dependency(req, "*") - - for dep in package.requires: - if dep.name == req.name: - dep.in_extras.append(extra_name) - package.extras[extra_name].append(dep) - - break - - if "build" in local_config: - package.build = local_config["build"] + base_poetry = super(Factory, self).create_poetry(cwd) - if "include" in local_config: - package.include = local_config["include"] - - if "exclude" in local_config: - package.exclude = local_config["exclude"] - - if "packages" in local_config: - package.packages = local_config["packages"] - - # Custom urls - if "urls" in local_config: - package.custom_urls = local_config["urls"] - - # Moving lock if necessary (pyproject.lock -> poetry.lock) - lock = poetry_file.parent / "poetry.lock" - if not lock.exists(): - # Checking for pyproject.lock - old_lock = poetry_file.with_suffix(".lock") - if old_lock.exists(): - shutil.move(str(old_lock), str(lock)) - - locker = Locker(poetry_file.parent / "poetry.lock", local_config) + locker = Locker( + base_poetry.file.parent / "poetry.lock", base_poetry.local_config + ) # Loading global configuration config = self.create_config(io) # Loading local configuration - local_config_file = TomlFile(poetry_file.parent / "poetry.toml") + local_config_file = TomlFile(base_poetry.file.parent / "poetry.toml") if local_config_file.exists(): if io.is_debug(): io.write_line( @@ -162,10 +49,16 @@ def create_poetry( config.merge(local_config_file.read()) - poetry = Poetry(poetry_file, local_config, package, locker, config) + poetry = Poetry( + base_poetry.file.path, + base_poetry.local_config, + base_poetry.package, + locker, + config, + ) # Configuring sources - for source in local_config.get("source", []): + for source in poetry.local_config.get("source", []): repository = self.create_legacy_repository(source, config) is_default = source.get("default", False) is_secondary = source.get("secondary", False) @@ -233,7 +126,8 @@ def create_legacy_repository( ): # type: (Dict[str, str], Config) -> LegacyRepository from .repositories.auth import Auth from .repositories.legacy_repository import LegacyRepository - from .utils.helpers import get_http_basic_auth + from .utils.helpers import get_client_cert, get_cert + from .utils.password_manager import PasswordManager if "url" in source: # PyPI-like repository @@ -242,80 +136,19 @@ def create_legacy_repository( else: raise RuntimeError("Unsupported source specified") + password_manager = PasswordManager(auth_config) name = source["name"] url = source["url"] - credentials = get_http_basic_auth(auth_config, name) - if not credentials: - return LegacyRepository(name, url) - - auth = Auth(url, credentials[0], credentials[1]) - - return LegacyRepository(name, url, auth=auth) - - @classmethod - def validate( - cls, config, strict=False - ): # type: (dict, bool) -> Dict[str, List[str]] - """ - Checks the validity of a configuration - """ - result = {"errors": [], "warnings": []} - # Schema validation errors - validation_errors = validate_object(config, "poetry-schema") - - result["errors"] += validation_errors - - if strict: - # If strict, check the file more thoroughly - - # Checking license - license = config.get("license") - if license: - try: - license_by_id(license) - except ValueError: - result["errors"].append("{} is not a valid license".format(license)) - - if "dependencies" in config: - python_versions = config["dependencies"]["python"] - if python_versions == "*": - result["warnings"].append( - "A wildcard Python dependency is ambiguous. " - "Consider specifying a more explicit one." - ) - - # Checking for scripts with extras - if "scripts" in config: - scripts = config["scripts"] - for name, script in scripts.items(): - if not isinstance(script, dict): - continue - - extras = script["extras"] - for extra in extras: - if extra not in config["extras"]: - result["errors"].append( - 'Script "{}" requires extra "{}" which is not defined.'.format( - name, extra - ) - ) - - return result - - @classmethod - def locate(cls, cwd): # type: (Path) -> Path - candidates = [Path(cwd)] - candidates.extend(Path(cwd).parents) - - for path in candidates: - poetry_file = path / "pyproject.toml" - - if poetry_file.exists(): - return poetry_file - + credentials = password_manager.get_http_auth(name) + if credentials: + auth = Auth(url, credentials["username"], credentials["password"]) else: - raise RuntimeError( - "Poetry could not find a pyproject.toml file in {} or its parents".format( - cwd - ) - ) + auth = None + + return LegacyRepository( + name, + url, + auth=auth, + cert=get_cert(auth_config, name), + client_cert=get_client_cert(auth_config, name), + ) diff --git a/poetry/masonry/utils/__init__.py b/poetry/inspection/__init__.py similarity index 100% rename from poetry/masonry/utils/__init__.py rename to poetry/inspection/__init__.py diff --git a/poetry/inspection/info.py b/poetry/inspection/info.py new file mode 100644 index 00000000000..dc72da44a49 --- /dev/null +++ b/poetry/inspection/info.py @@ -0,0 +1,503 @@ +import glob +import logging +import os +import tarfile +import zipfile + +from typing import Dict +from typing import Iterator +from typing import List +from typing import Optional +from typing import Union + +import pkginfo + +from poetry.core.factory import Factory +from poetry.core.packages import Package +from poetry.core.packages import ProjectPackage +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.utils._compat import PY35 +from poetry.core.utils._compat import Path +from poetry.core.utils.helpers import parse_requires +from poetry.core.utils.helpers import temporary_directory +from poetry.core.version.markers import InvalidMarker +from poetry.utils.env import EnvCommandError +from poetry.utils.env import EnvManager +from poetry.utils.env import VirtualEnv +from poetry.utils.setup_reader import SetupReader +from poetry.utils.toml_file import TomlFile + + +logger = logging.getLogger(__name__) + + +class PackageInfoError(ValueError): + def __init__(self, path): # type: (Union[Path, str]) -> None + super(PackageInfoError, self).__init__( + "Unable to determine package info for path: {}".format(str(path)) + ) + + +class PackageInfo: + def __init__( + self, + name=None, # type: Optional[str] + version=None, # type: Optional[str] + summary=None, # type: Optional[str] + platform=None, # type: Optional[str] + requires_dist=None, # type: Optional[List[str]] + requires_python=None, # type: Optional[str] + files=None, # type: Optional[List[str]] + cache_version=None, # type: Optional[str] + ): + self.name = name + self.version = version + self.summary = summary + self.platform = platform + self.requires_dist = requires_dist + self.requires_python = requires_python + self.files = files or [] + self._cache_version = cache_version + + @property + def cache_version(self): # type: () -> Optional[str] + return self._cache_version + + def update(self, other): # type: (PackageInfo) -> PackageInfo + self.name = other.name or self.name + self.version = other.version or self.version + self.summary = other.summary or self.summary + self.platform = other.platform or self.platform + self.requires_dist = other.requires_dist or self.requires_dist + self.requires_python = other.requires_python or self.requires_python + self.files = other.files or self.files + self._cache_version = other.cache_version or self._cache_version + return self + + def asdict(self): # type: () -> Dict[str, Optional[Union[str, List[str]]]] + """ + Helper method to convert package info into a dictionary used for caching. + """ + return { + "name": self.name, + "version": self.version, + "summary": self.summary, + "platform": self.platform, + "requires_dist": self.requires_dist, + "requires_python": self.requires_python, + "files": self.files, + "_cache_version": self._cache_version, + } + + @classmethod + def load( + cls, data + ): # type: (Dict[str, Optional[Union[str, List[str]]]]) -> PackageInfo + """ + Helper method to load data from a dictionary produced by `PackageInfo.asdict()`. + + :param data: Data to load. This is expected to be a `dict` object output by `asdict()`. + """ + cache_version = data.pop("_cache_version", None) + return cls(cache_version=cache_version, **data) + + @classmethod + def _log(cls, msg, level="info"): + """Internal helper method to log information.""" + getattr(logger, level)("{}: {}".format(cls.__name__, msg)) + + def to_package( + self, name=None, extras=None, root_dir=None + ): # type: (Optional[str], Optional[List[str]], Optional[Path]) -> Package + """ + Create a new `poetry.core.packages.package.Package` instance using metadata from this instance. + + :param name: Name to use for the package, if not specified name from this instance is used. + :param extras: Extras to activate for this package. + :param root_dir: Optional root directory to use for the package. If set, dependency strings + will be parsed relative to this directory. + """ + name = name or self.name + + if not self.version: + # The version could not be determined, so we raise an error since it is mandatory. + raise RuntimeError( + "Unable to retrieve the package version for {}".format(name) + ) + + package = Package(name=name, version=self.version) + package.description = self.summary + package.root_dir = root_dir + package.python_versions = self.requires_python or "*" + package.files = self.files + + for req in self.requires_dist or []: + try: + # Attempt to parse the PEP-508 requirement string + dependency = dependency_from_pep_508(req, relative_to=root_dir) + except InvalidMarker: + # Invalid marker, We strip the markers hoping for the best + req = req.split(";")[0] + dependency = dependency_from_pep_508(req, relative_to=root_dir) + except ValueError: + # Likely unable to parse constraint so we skip it + self._log( + "Invalid constraint ({}) found in {}-{} dependencies, " + "skipping".format(req, package.name, package.version), + level="debug", + ) + continue + + if dependency.in_extras: + # this dependency is required by an extra package + for extra in dependency.in_extras: + if extra not in package.extras: + # this is the first time we encounter this extra for this package + package.extras[extra] = [] + + # Activate extra dependencies if specified + if extras and extra in extras: + dependency.activate() + + package.extras[extra].append(dependency) + + if not dependency.is_optional() or dependency.is_activated(): + # we skip add only if the dependency is option and was not activated as part of an extra + package.requires.append(dependency) + + return package + + @classmethod + def _from_distribution( + cls, dist + ): # type: (Union[pkginfo.BDist, pkginfo.SDist, pkginfo.Wheel]) -> PackageInfo + """ + Helper method to parse package information from a `pkginfo.Distribution` instance. + + :param dist: The distribution instance to parse information from. + """ + if dist.requires_dist: + requirements = list(dist.requires_dist) + else: + requirements = [] + requires = Path(dist.filename) / "requires.txt" + if requires.exists(): + with requires.open(encoding="utf-8") as f: + requirements = parse_requires(f.read()) + + return cls( + name=dist.name, + version=dist.version, + summary=dist.summary, + platform=dist.supported_platforms, + requires_dist=requirements or None, + requires_python=dist.requires_python, + ) + + @classmethod + def _from_sdist_file(cls, path): # type: (Path) -> PackageInfo + """ + Helper method to parse package information from an sdist file. We attempt to first inspect the + file using `pkginfo.SDist`. If this does not provide us with package requirements, we extract the + source and handle it as a directory. + + :param path: The sdist file to parse information from. + """ + info = None + + try: + info = cls._from_distribution(pkginfo.SDist(str(path))) + except ValueError: + # Unable to determine dependencies + # We pass and go deeper + pass + else: + if info.requires_dist is not None: + # we successfully retrieved dependencies from sdist metadata + return info + + # Still not dependencies found + # So, we unpack and introspect + suffix = path.suffix + + if suffix == ".zip": + context = zipfile.ZipFile + else: + if suffix == ".bz2": + suffixes = path.suffixes + if len(suffixes) > 1 and suffixes[-2] == ".tar": + suffix = ".tar.bz2" + else: + suffix = ".tar.gz" + + context = tarfile.open + + with temporary_directory() as tmp: + tmp = Path(tmp) + with context(str(path)) as archive: + archive.extractall(str(tmp)) + + # a little bit of guess work to determine the directory we care about + elements = list(tmp.glob("*")) + + if len(elements) == 1 and elements[0].is_dir(): + sdist_dir = elements[0] + else: + sdist_dir = tmp / path.name.rstrip(suffix) + + # now this is an unpacked directory we know how to deal with + new_info = cls.from_directory(path=sdist_dir) + + if not info: + return new_info + + return info.update(new_info) + + @classmethod + def from_setup_py(cls, path): # type: (Union[str, Path]) -> PackageInfo + """ + Mechanism to parse package information from a `setup.py` file. This uses the implentation + at `poetry.utils.setup_reader.SetupReader` in order to parse the file. This is not reliable for + complex setup files and should only attempted as a fallback. + + :param path: Path to `setup.py` file + :return: + """ + result = SetupReader.read_from_directory(Path(path)) + python_requires = result["python_requires"] + if python_requires is None: + python_requires = "*" + + requires = "" + for dep in result["install_requires"]: + requires += dep + "\n" + + if result["extras_require"]: + requires += "\n" + + for extra_name, deps in result["extras_require"].items(): + requires += "[{}]\n".format(extra_name) + + for dep in deps: + requires += dep + "\n" + + requires += "\n" + + requirements = parse_requires(requires) + + return cls( + name=result.get("name"), + version=result.get("version"), + summary=result.get("description", ""), + requires_dist=requirements or None, + requires_python=python_requires, + ) + + @staticmethod + def _find_dist_info(path): # type: (Path) -> Iterator[Path] + """ + Discover all `*.*-info` directories in a given path. + + :param path: Path to search. + """ + pattern = "**/*.*-info" + if PY35: + # Sometimes pathlib will fail on recursive symbolic links, so we need to workaround it + # and use the glob module instead. Note that this does not happen with pathlib2 + # so it's safe to use it for Python < 3.4. + directories = glob.iglob(Path(path, pattern).as_posix(), recursive=True) + else: + directories = path.glob(pattern) + + for d in directories: + yield Path(d) + + @classmethod + def from_metadata(cls, path): # type: (Union[str, Path]) -> PackageInfo + """ + Helper method to parse package information from an unpacked metadata directory. + + :param path: The metadata directory to parse information from. + """ + path = Path(path) + + if path.suffix in {".dist-info", ".egg-info"}: + directories = [path.suffix] + else: + directories = cls._find_dist_info(path=path) + + for directory in directories: + try: + if directory.suffix == ".egg-info": + dist = pkginfo.UnpackedSDist(str(directory)) + elif directory.suffix == ".dist-info": + dist = pkginfo.Wheel(str(directory)) + else: + continue + info = cls._from_distribution(dist=dist) + if info: + return info + except ValueError: + pass + + @classmethod + def from_package(cls, package): # type: (Package) -> PackageInfo + """ + Helper method to inspect a `Package` object, in order to generate package info. + + :param package: This must be a poetry package instance. + """ + requires = {dependency.to_pep_508() for dependency in package.requires} + + for extra_requires in package.extras.values(): + for dependency in extra_requires: + requires.add(dependency.to_pep_508()) + + return cls( + name=package.name, + version=package.version, + summary=package.description, + platform=package.platform, + requires_dist=list(requires), + requires_python=package.python_versions, + files=package.files, + ) + + @staticmethod + def _get_poetry_package(path): # type: (Path) -> Optional[ProjectPackage] + pyproject = path.joinpath("pyproject.toml") + try: + # Note: we ignore any setup.py file at this step + if pyproject.exists(): + # TODO: add support for handling non-poetry PEP-517 builds + pyproject = TomlFile(pyproject) + pyproject_content = pyproject.read() + supports_poetry = ( + "tool" in pyproject_content + and "poetry" in pyproject_content["tool"] + ) + if supports_poetry: + return Factory().create_poetry(path).package + except RuntimeError: + pass + + @classmethod + def from_directory( + cls, path, allow_build=False + ): # type: (Union[str, Path], bool) -> PackageInfo + """ + Generate package information from a package source directory. When `allow_build` is enabled and + introspection of all available metadata fails, the package is attempted to be build in an isolated + environment so as to generate required metadata. + + :param path: Path to generate package information from. + :param allow_build: If enabled, as a fallback, build the project to gather metadata. + """ + path = Path(path) + + setup_py = path.joinpath("setup.py") + + project_package = cls._get_poetry_package(path) + if project_package: + return cls.from_package(project_package) + + if not setup_py.exists(): + # this means we cannot do anything else here + raise PackageInfoError(path) + + current_dir = os.getcwd() + + info = cls.from_metadata(path) + + if info and info.requires_dist is not None: + # return only if requirements are discovered + return info + + if not allow_build: + return cls.from_setup_py(path=path) + + try: + # TODO: replace with PEP517 + # we need to switch to the correct path in order for egg_info command to work + os.chdir(str(path)) + + # Execute egg_info + cls._execute_setup() + except EnvCommandError: + cls._log( + "Falling back to parsing setup.py file for {}".format(path), "debug" + ) + # egg_info could not be generated, we fallback to ast parser + return cls.from_setup_py(path=path) + else: + info = cls.from_metadata(path) + if info: + return info + finally: + os.chdir(current_dir) + + # if we reach here, everything has failed and all hope is lost + raise PackageInfoError(path) + + @classmethod + def from_sdist(cls, path): # type: (Union[Path, pkginfo.SDist]) -> PackageInfo + """ + Gather package information from an sdist file, packed or unpacked. + + :param path: Path to an sdist file or unpacked directory. + """ + if path.is_file(): + return cls._from_sdist_file(path=path) + + # if we get here then it is neither an sdist instance nor a file + # so, we assume this is an directory + return cls.from_directory(path=path) + + @classmethod + def from_wheel(cls, path): # type: (Path) -> PackageInfo + """ + Gather package information from a wheel. + + :param path: Path to wheel. + """ + try: + return cls._from_distribution(pkginfo.Wheel(str(path))) + except ValueError: + return PackageInfo() + + @classmethod + def from_bdist(cls, path): # type: (Path) -> PackageInfo + """ + Gather package information from a bdist (wheel etc.). + + :param path: Path to bdist. + """ + if isinstance(path, (pkginfo.BDist, pkginfo.Wheel)): + cls._from_distribution(dist=path) + + if path.suffix == ".whl": + return cls.from_wheel(path=path) + + try: + return cls._from_distribution(pkginfo.BDist(str(path))) + except ValueError: + raise PackageInfoError(path) + + @classmethod + def from_path(cls, path): # type: (Path) -> PackageInfo + """ + Gather package information from a given path (bdist, sdist, directory). + + :param path: Path to inspect. + """ + try: + return cls.from_bdist(path=path) + except PackageInfoError: + return cls.from_sdist(path=path) + + @classmethod + def _execute_setup(cls): + with temporary_directory() as tmp_dir: + EnvManager.build_venv(tmp_dir) + venv = VirtualEnv(Path(tmp_dir), Path(tmp_dir)) + venv.run("python", "setup.py", "egg_info") diff --git a/poetry/installation/installer.py b/poetry/installation/installer.py index 704cc3e133b..59df0ddfdff 100644 --- a/poetry/installation/installer.py +++ b/poetry/installation/installer.py @@ -2,11 +2,10 @@ from typing import Union from clikit.api.io import IO -from clikit.io import NullIO -from poetry.packages import Dependency +from poetry.core.packages.project_package import ProjectPackage +from poetry.io.null_io import NullIO from poetry.packages import Locker -from poetry.packages import Package from poetry.puzzle import Solver from poetry.puzzle.operations import Install from poetry.puzzle.operations import Uninstall @@ -15,9 +14,8 @@ from poetry.repositories import Pool from poetry.repositories import Repository from poetry.repositories.installed_repository import InstalledRepository -from poetry.semver import parse_constraint -from poetry.utils.helpers import canonicalize_name from poetry.utils.extras import get_extra_package_names +from poetry.utils.helpers import canonicalize_name from .base_installer import BaseInstaller from .pip_installer import PipInstaller @@ -28,7 +26,7 @@ def __init__( self, io, # type: IO env, - package, # type: Package + package, # type: ProjectPackage locker, # type: Locker pool, # type: Pool installed=None, # type: (Union[InstalledRepository, None]) @@ -40,6 +38,7 @@ def __init__( self._pool = pool self._dry_run = False + self._remove_untracked = False self._update = False self._verbose = False self._write_lock = True @@ -84,6 +83,14 @@ def dry_run(self, dry_run=True): # type: (bool) -> Installer def is_dry_run(self): # type: () -> bool return self._dry_run + def remove_untracked(self, remove_untracked=True): # type: (bool) -> Installer + self._remove_untracked = remove_untracked + + return self + + def is_remove_untracked(self): # type: () -> bool + return self._remove_untracked + def verbose(self, verbose=True): # type: (bool) -> Installer self._verbose = verbose @@ -157,6 +164,7 @@ def _do_install(self, local_repo): self._installed_repository, locked_repository, self._io, + remove_untracked=self._remove_untracked, ) ops = solver.solve(use_latest=self._whitelist) @@ -198,31 +206,40 @@ def _do_install(self, local_repo): root = root.clone() del root.dev_requires[:] - with root.with_python_versions( - ".".join([str(i) for i in self._env.version_info[:3]]) - ): - # We resolve again by only using the lock file - pool = Pool(ignore_repository_names=True) - - # Making a new repo containing the packages - # newly resolved and the ones from the current lock file - repo = Repository() - for package in local_repo.packages + locked_repository.packages: - if not repo.has_package(package): - repo.add_package(package) - - pool.add_repository(repo) - - # We whitelist all packages to be sure - # that the latest ones are picked up - whitelist = [] - for pkg in locked_repository.packages: - whitelist.append(pkg.name) - - solver = Solver( - root, pool, self._installed_repository, locked_repository, NullIO() + if self._io.is_verbose(): + self._io.write_line("") + self._io.write_line( + "Finding the necessary packages for the current system" ) + # We resolve again by only using the lock file + pool = Pool(ignore_repository_names=True) + + # Making a new repo containing the packages + # newly resolved and the ones from the current lock file + repo = Repository() + for package in local_repo.packages + locked_repository.packages: + if not repo.has_package(package): + repo.add_package(package) + + pool.add_repository(repo) + + # We whitelist all packages to be sure + # that the latest ones are picked up + whitelist = [] + for pkg in locked_repository.packages: + whitelist.append(pkg.name) + + solver = Solver( + root, + pool, + self._installed_repository, + locked_repository, + NullIO(), + remove_untracked=self._remove_untracked, + ) + + with solver.use_environment(self._env): ops = solver.solve(use_latest=whitelist) # We need to filter operations so that packages @@ -235,33 +252,22 @@ def _do_install(self, local_repo): # Execute operations actual_ops = [op for op in ops if not op.skipped] if not actual_ops and (self._execute_operations or self._dry_run): - self._io.write_line("Nothing to install or update") + self._io.write_line("No dependencies to install or update") if actual_ops and (self._execute_operations or self._dry_run): - installs = [] - updates = [] - uninstalls = [] - skipped = [] + installs = 0 + updates = 0 + uninstalls = 0 + skipped = 0 for op in ops: if op.skipped: - skipped.append(op) - continue - - if op.job_type == "install": - installs.append( - "{}:{}".format( - op.package.pretty_name, op.package.full_pretty_version - ) - ) + skipped += 1 + elif op.job_type == "install": + installs += 1 elif op.job_type == "update": - updates.append( - "{}:{}".format( - op.target_package.pretty_name, - op.target_package.full_pretty_version, - ) - ) + updates += 1 elif op.job_type == "uninstall": - uninstalls.append(op.package.pretty_name) + uninstalls += 1 self._io.write_line("") self._io.write_line( @@ -270,13 +276,13 @@ def _do_install(self, local_repo): "{} update{}, " "{} removal{}" "{}".format( - len(installs), - "" if len(installs) == 1 else "s", - len(updates), - "" if len(updates) == 1 else "s", - len(uninstalls), - "" if len(uninstalls) == 1 else "s", - ", {} skipped".format(len(skipped)) + installs, + "" if installs == 1 else "s", + updates, + "" if updates == 1 else "s", + uninstalls, + "" if uninstalls == 1 else "s", + ", {} skipped".format(skipped) if skipped and self.is_verbose() else "", ) @@ -306,7 +312,7 @@ def _execute_install(self, operation): # type: (Install) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Skipping {} ({}) {}".format( + " - Skipping {} ({}) {}".format( operation.package.pretty_name, operation.package.full_pretty_version, operation.skip_reason, @@ -317,7 +323,7 @@ def _execute_install(self, operation): # type: (Install) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Installing {} ({})".format( + " - Installing {} ({})".format( operation.package.pretty_name, operation.package.full_pretty_version ) ) @@ -334,7 +340,7 @@ def _execute_update(self, operation): # type: (Update) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Skipping {} ({}) {}".format( + " - Skipping {} ({}) {}".format( target.pretty_name, target.full_pretty_version, operation.skip_reason, @@ -345,7 +351,7 @@ def _execute_update(self, operation): # type: (Update) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Updating {} ({} -> {})".format( + " - Updating {} ({} -> {})".format( target.pretty_name, source.full_pretty_version, target.full_pretty_version, @@ -361,7 +367,7 @@ def _execute_uninstall(self, operation): # type: (Uninstall) -> None if operation.skipped: if self.is_verbose() and (self._execute_operations or self.is_dry_run()): self._io.write_line( - " - Not removing {} ({}) {}".format( + " - Not removing {} ({}) {}".format( operation.package.pretty_name, operation.package.full_pretty_version, operation.skip_reason, @@ -372,7 +378,7 @@ def _execute_uninstall(self, operation): # type: (Uninstall) -> None if self._execute_operations or self.is_dry_run(): self._io.write_line( - " - Removing {} ({})".format( + " - Removing {} ({})".format( operation.package.pretty_name, operation.package.full_pretty_version ) ) @@ -440,15 +446,6 @@ def _filter_operations( if op.job_type == "uninstall": continue - current_python = parse_constraint( - ".".join(str(v) for v in self._env.version_info[:3]) - ) - if not package.python_constraint.allows( - current_python - ) or not self._env.is_valid_for_marker(package.marker): - op.skip("Not needed for the current environment") - continue - if self._update: extras = {} for extra, deps in self._package.extras.items(): diff --git a/poetry/installation/pip_installer.py b/poetry/installation/pip_installer.py index a730b673373..a5227cc6928 100644 --- a/poetry/installation/pip_installer.py +++ b/poetry/installation/pip_installer.py @@ -1,26 +1,23 @@ import os import tempfile -from io import open from subprocess import CalledProcessError from clikit.api.io import IO -from clikit.io import NullIO +from poetry.repositories.pool import Pool +from poetry.utils._compat import encode +from poetry.utils.env import Env from poetry.utils.helpers import safe_rmtree +from .base_installer import BaseInstaller + try: import urllib.parse as urlparse except ImportError: import urlparse -from poetry.repositories.pool import Pool -from poetry.utils._compat import encode -from poetry.utils.env import Env - -from .base_installer import BaseInstaller - class PipInstaller(BaseInstaller): def __init__(self, env, io, pool): # type: (Env, IO, Pool) -> None @@ -41,7 +38,10 @@ def install(self, package, update=False): args = ["install", "--no-deps"] - if package.source_type == "legacy" and package.source_url: + if ( + package.source_type not in {"git", "directory", "file", "url"} + and package.source_url + ): repository = self._pool.repository(package.source_reference) parsed = urlparse.urlparse(package.source_url) if parsed.scheme == "http": @@ -52,6 +52,12 @@ def install(self, package, update=False): ) args += ["--trusted-host", parsed.hostname] + if repository.cert: + args += ["--cert", str(repository.cert)] + + if repository.client_cert: + args += ["--client-cert", str(repository.client_cert)] + index_url = repository.authenticated_url args += ["--index-url", index_url] @@ -65,7 +71,7 @@ def install(self, package, update=False): if update: args.append("-U") - if package.hashes and not package.source_type: + if package.files and not package.source_url: # Format as a requirements.txt # We need to create a requirements.txt file # for each package in order to check hashes. @@ -88,16 +94,15 @@ def install(self, package, update=False): self.run(*args) - def update(self, _, target): + def update(self, package, target): + if package.source_type != target.source_type: + # If the source type has changed, we remove the current + # package to avoid perpetual updates in some cases + self.remove(package) + self.install(target, update=True) def remove(self, package): - # If we have a VCS package, remove its source directory - if package.source_type == "git": - src_dir = self._env.path / "src" / package.name - if src_dir.exists(): - safe_rmtree(str(src_dir)) - try: self.run("uninstall", package.name, "-y") except CalledProcessError as e: @@ -106,14 +111,26 @@ def remove(self, package): raise + # This is a workaround for https://github.com/pypa/pip/issues/4176 + nspkg_pth_file = self._env.site_packages / "{}-nspkg.pth".format(package.name) + if nspkg_pth_file.exists(): + nspkg_pth_file.unlink() + + # If we have a VCS package, remove its source directory + if package.source_type == "git": + src_dir = self._env.path / "src" / package.name + if src_dir.exists(): + safe_rmtree(str(src_dir)) + def run(self, *args, **kwargs): # type: (...) -> str - return self._env.run("python", "-m", "pip", *args, **kwargs) + return self._env.run_pip(*args, **kwargs) def requirement(self, package, formatted=False): if formatted and not package.source_type: req = "{}=={}".format(package.name, package.version) - for h in package.hashes: + for f in package.files: hash_type = "sha256" + h = f["hash"] if ":" in h: hash_type, h = h.split(":") @@ -162,10 +179,9 @@ def create_temporary_requirement(self, package): return name def install_directory(self, package): - from poetry.masonry.builder import SdistBuilder - from poetry.poetry import Poetry - from poetry.utils._compat import decode - from poetry.utils.env import NullEnv + from poetry.factory import Factory + from poetry.io.null_io import NullIO + from poetry.masonry.builders.editable import EditableBuilder from poetry.utils.toml_file import TomlFile if package.root_dir: @@ -185,36 +201,53 @@ def install_directory(self, package): "tool" in pyproject_content and "poetry" in pyproject_content["tool"] ) # Even if there is a build system specified - # pip as of right now does not support it fully - # TODO: Check for pip version when proper PEP-517 support lands - # has_build_system = ("build-system" in pyproject_content) - - setup = os.path.join(req, "setup.py") - has_setup = os.path.exists(setup) - if not has_setup and has_poetry and (package.develop or not has_build_system): - # We actually need to rely on creating a temporary setup.py - # file since pip, as of this comment, does not support - # build-system for editable packages - # We also need it for non-PEP-517 packages - builder = SdistBuilder(Poetry.create(pyproject.parent), NullEnv(), NullIO()) - - with open(setup, "w", encoding="utf-8") as f: - f.write(decode(builder.build_setup())) + # some versions of pip (< 19.0.0) don't understand it + # so we need to check the version of pip to know + # if we can rely on the build system + pip_version = self._env.pip_version + pip_version_with_build_system_support = pip_version.__class__(19, 0, 0) + has_build_system = ( + "build-system" in pyproject_content + and pip_version >= pip_version_with_build_system_support + ) + + if has_poetry: + package_poetry = Factory().create_poetry(pyproject.parent) + if package.develop and not package_poetry.package.build_script: + # This is a Poetry package in editable mode + # we can use the EditableBuilder without going through pip + # to install it, unless it has a build script. + builder = EditableBuilder(package_poetry, self._env, NullIO()) + builder.build() + + return + elif not has_build_system or package_poetry.package.build_script: + from poetry.core.masonry.builders.sdist import SdistBuilder + + # We need to rely on creating a temporary setup.py + # file since the version of pip does not support + # build-systems + # We also need it for non-PEP-517 packages + builder = SdistBuilder(package_poetry) + + with builder.setup_py(): + if package.develop: + args.append("-e") + + args.append(req) + + return self.run(*args) if package.develop: args.append("-e") args.append(req) - try: - return self.run(*args) - finally: - if not has_setup and os.path.exists(setup): - os.remove(setup) + return self.run(*args) def install_git(self, package): - from poetry.packages import Package - from poetry.vcs import Git + from poetry.core.packages import Package + from poetry.core.vcs import Git src_dir = self._env.path / "src" / package.name if src_dir.exists(): diff --git a/poetry/json/__init__.py b/poetry/json/__init__.py index 24452baca66..d50eb7a7500 100644 --- a/poetry/json/__init__.py +++ b/poetry/json/__init__.py @@ -1,11 +1,12 @@ import json import os -import jsonschema - from io import open from typing import List +import jsonschema + + SCHEMA_DIR = os.path.join(os.path.dirname(__file__), "schemas") @@ -31,7 +32,9 @@ def validate_object(obj, schema_name): # type: (dict, str) -> List[str] for error in validation_errors: message = error.message if error.path: - message = "[{}] {}".format(".".join(error.path), message) + message = "[{}] {}".format( + ".".join(str(x) for x in error.absolute_path), message + ) errors.append(message) diff --git a/poetry/json/schemas/poetry-schema.json b/poetry/json/schemas/poetry-schema.json index c02c93aff79..e94b90d28cc 100644 --- a/poetry/json/schemas/poetry-schema.json +++ b/poetry/json/schemas/poetry-schema.json @@ -247,6 +247,10 @@ "type": "string", "description": "The PEP 508 compliant environment markers for which the dependency should be installed." }, + "allow-prereleases": { + "type": "boolean", + "description": "Whether the dependency allows prereleases or not." + }, "allows-prereleases": { "type": "boolean", "description": "Whether the dependency allows prereleases or not." @@ -304,6 +308,10 @@ "type": "string", "description": "The PEP 508 compliant environment markers for which the dependency should be installed." }, + "allow-prereleases": { + "type": "boolean", + "description": "Whether the dependency allows prereleases or not." + }, "allows-prereleases": { "type": "boolean", "description": "Whether the dependency allows prereleases or not." @@ -452,6 +460,9 @@ }, { "$ref": "#/definitions/path-dependency" + }, + { + "$ref": "#/definitions/url-dependency" } ] } diff --git a/poetry/layouts/layout.py b/poetry/layouts/layout.py index 95c172cb87b..1339cb9c5f5 100644 --- a/poetry/layouts/layout.py +++ b/poetry/layouts/layout.py @@ -40,7 +40,7 @@ def test_version(): ACCEPTED_README_FORMATS = ["md", "rst"] -BUILD_SYSTEM_MIN_VERSION = "0.12" +BUILD_SYSTEM_MIN_VERSION = "1.0.0a5" BUILD_SYSTEM_MAX_VERSION = None @@ -65,10 +65,7 @@ def __init__( self._license = license self._python = python self._dependencies = dependencies or {} - if dev_dependencies is None: - dev_dependencies = {"pytest": "^3.5"} - - self._dev_dependencies = dev_dependencies + self._dev_dependencies = dev_dependencies or {} if not author: author = "Your Name " @@ -118,8 +115,8 @@ def generate_poetry_content(self): if BUILD_SYSTEM_MAX_VERSION is not None: build_system_version += ",<" + BUILD_SYSTEM_MAX_VERSION - build_system.add("requires", ["poetry" + build_system_version]) - build_system.add("build-backend", "poetry.masonry.api") + build_system.add("requires", ["poetry-core" + build_system_version]) + build_system.add("build-backend", "poetry.core.masonry.api") content.add("build-system", build_system) @@ -137,8 +134,6 @@ def _create_readme(self, path): readme_file.touch() def _create_tests(self, path): - self._dev_dependencies["pytest"] = "^3.0" - tests = path / "tests" tests_init = tests / "__init__.py" tests_default = tests / "test_{}.py".format(self._package_name) diff --git a/poetry/layouts/src.py b/poetry/layouts/src.py index 8ad9ff7b9be..06db7a71f92 100644 --- a/poetry/layouts/src.py +++ b/poetry/layouts/src.py @@ -2,6 +2,7 @@ from .layout import Layout + DEFAULT = u"""__version__ = '{version}' """ diff --git a/poetry/layouts/standard.py b/poetry/layouts/standard.py index 4e8aa74d7f9..eca4c435c40 100644 --- a/poetry/layouts/standard.py +++ b/poetry/layouts/standard.py @@ -2,6 +2,7 @@ from .layout import Layout + DEFAULT = u"""__version__ = '{version}' """ diff --git a/poetry/locations.py b/poetry/locations.py index 17fb4d42a99..003950d500d 100644 --- a/poetry/locations.py +++ b/poetry/locations.py @@ -1,6 +1,9 @@ +from .utils._compat import Path from .utils.appdirs import user_cache_dir from .utils.appdirs import user_config_dir CACHE_DIR = user_cache_dir("pypoetry") CONFIG_DIR = user_config_dir("pypoetry") + +REPOSITORY_CACHE_DIR = Path(CACHE_DIR) / "cache" / "repositories" diff --git a/poetry/masonry/__init__.py b/poetry/masonry/__init__.py index ddd3a14f153..e69de29bb2d 100644 --- a/poetry/masonry/__init__.py +++ b/poetry/masonry/__init__.py @@ -1,10 +0,0 @@ -""" -This module handles the packaging and publishing -of python projects. - -A lot of the code used here has been taken from -`flit `__ and adapted -to work with the poetry codebase, so kudos to them for showing the way. -""" - -from .builder import Builder diff --git a/poetry/masonry/api.py b/poetry/masonry/api.py index 49b1a884514..417def2c834 100644 --- a/poetry/masonry/api.py +++ b/poetry/masonry/api.py @@ -1,74 +1,14 @@ -""" -PEP-517 compliant buildsystem API -""" -import logging -import sys - -from clikit.io import NullIO - -from poetry.factory import Factory -from poetry.utils._compat import Path -from poetry.utils._compat import unicode -from poetry.utils.env import SystemEnv - -from .builders import SdistBuilder -from .builders import WheelBuilder - -log = logging.getLogger(__name__) - - -def get_requires_for_build_wheel(config_settings=None): - """ - Returns a list of requirements for building, as strings - """ - poetry = Factory().create_poetry(Path(".")) - - main, _ = SdistBuilder.convert_dependencies(poetry.package, poetry.package.requires) - - return main - - -# For now, we require all dependencies to build either a wheel or an sdist. -get_requires_for_build_sdist = get_requires_for_build_wheel - - -def prepare_metadata_for_build_wheel(metadata_directory, config_settings=None): - poetry = Factory().create_poetry(Path(".")) - builder = WheelBuilder(poetry, SystemEnv(Path(sys.prefix)), NullIO()) - - dist_info = Path(metadata_directory, builder.dist_info) - dist_info.mkdir(parents=True, exist_ok=True) - - if "scripts" in poetry.local_config or "plugins" in poetry.local_config: - with (dist_info / "entry_points.txt").open("w", encoding="utf-8") as f: - builder._write_entry_points(f) - - with (dist_info / "WHEEL").open("w", encoding="utf-8") as f: - builder._write_wheel_file(f) - - with (dist_info / "METADATA").open("w", encoding="utf-8") as f: - builder._write_metadata_file(f) - - return dist_info.name - - -def build_wheel(wheel_directory, config_settings=None, metadata_directory=None): - """Builds a wheel, places it in wheel_directory""" - poetry = Factory().create_poetry(Path(".")) - - return unicode( - WheelBuilder.make_in( - poetry, SystemEnv(Path(sys.prefix)), NullIO(), Path(wheel_directory) - ) - ) - - -def build_sdist(sdist_directory, config_settings=None): - """Builds an sdist, places it in sdist_directory""" - poetry = Factory().create_poetry(Path(".")) - - path = SdistBuilder(poetry, SystemEnv(Path(sys.prefix)), NullIO()).build( - Path(sdist_directory) - ) - - return unicode(path.name) +from poetry.core.masonry.api import build_sdist +from poetry.core.masonry.api import build_wheel +from poetry.core.masonry.api import get_requires_for_build_sdist +from poetry.core.masonry.api import get_requires_for_build_wheel +from poetry.core.masonry.api import prepare_metadata_for_build_wheel + + +__all__ = [ + "build_sdist", + "build_wheel", + "get_requires_for_build_sdist", + "get_requires_for_build_wheel", + "prepare_metadata_for_build_wheel", +] diff --git a/poetry/masonry/builder.py b/poetry/masonry/builder.py deleted file mode 100644 index e5489b424da..00000000000 --- a/poetry/masonry/builder.py +++ /dev/null @@ -1,21 +0,0 @@ -from .builders import CompleteBuilder -from .builders import SdistBuilder -from .builders import WheelBuilder - - -class Builder: - - _FORMATS = {"sdist": SdistBuilder, "wheel": WheelBuilder, "all": CompleteBuilder} - - def __init__(self, poetry, env, io): - self._poetry = poetry - self._env = env - self._io = io - - def build(self, fmt): - if fmt not in self._FORMATS: - raise ValueError("Invalid format: {}".format(fmt)) - - builder = self._FORMATS[fmt](self._poetry, self._env, self._io) - - return builder.build() diff --git a/poetry/masonry/builders/__init__.py b/poetry/masonry/builders/__init__.py index 4fd8d4880ef..f1f02b72d67 100644 --- a/poetry/masonry/builders/__init__.py +++ b/poetry/masonry/builders/__init__.py @@ -1,4 +1 @@ -from .complete import CompleteBuilder from .editable import EditableBuilder -from .sdist import SdistBuilder -from .wheel import WheelBuilder diff --git a/poetry/masonry/builders/builder.py b/poetry/masonry/builders/builder.py deleted file mode 100644 index 14ca2de7db6..00000000000 --- a/poetry/masonry/builders/builder.py +++ /dev/null @@ -1,285 +0,0 @@ -# -*- coding: utf-8 -*- -import re -import shutil -import tempfile -from collections import defaultdict -from contextlib import contextmanager -from typing import Set -from typing import Union - -from clikit.api.io.flags import VERY_VERBOSE - -from poetry.utils._compat import Path -from poetry.utils._compat import basestring -from poetry.utils._compat import glob -from poetry.utils._compat import lru_cache -from poetry.utils._compat import to_str -from poetry.vcs import get_vcs -from ..metadata import Metadata -from ..utils.module import Module -from ..utils.package_include import PackageInclude - -AUTHOR_REGEX = re.compile(r"(?u)^(?P[- .,\w\d'’\"()]+) <(?P.+?)>$") - -METADATA_BASE = """\ -Metadata-Version: 2.1 -Name: {name} -Version: {version} -Summary: {summary} -""" - - -class Builder(object): - AVAILABLE_PYTHONS = {"2", "2.7", "3", "3.4", "3.5", "3.6", "3.7"} - - format = None - - def __init__( - self, poetry, env, io, ignore_packages_formats=False - ): # type: (Poetry, Env, IO) -> None - self._poetry = poetry - self._env = env - self._io = io - self._package = poetry.package - self._path = poetry.file.parent - - packages = [] - for p in self._package.packages: - formats = p.get("format", []) - if not isinstance(formats, list): - formats = [formats] - - if ( - formats - and self.format - and self.format not in formats - and not ignore_packages_formats - ): - continue - - packages.append(p) - - self._module = Module( - self._package.name, - self._path.as_posix(), - packages=packages, - includes=self._package.include, - ) - self._meta = Metadata.from_package(self._package) - - def build(self): - raise NotImplementedError() - - @lru_cache(maxsize=None) - def find_excluded_files(self): # type: () -> Set[str] - # Checking VCS - vcs = get_vcs(self._path) - if not vcs: - vcs_ignored_files = set() - else: - vcs_ignored_files = set(vcs.get_ignored_files()) - - explicitely_excluded = set() - for excluded_glob in self._package.exclude: - excluded_path = Path(self._path, excluded_glob) - - try: - is_dir = excluded_path.is_dir() - except OSError: - # On Windows, testing if a path with a glob is a directory will raise an OSError - is_dir = False - if is_dir: - excluded_glob = Path(excluded_glob, "**/*") - - for excluded in glob( - Path(self._path, excluded_glob).as_posix(), recursive=True - ): - explicitely_excluded.add( - Path(excluded).relative_to(self._path).as_posix() - ) - - ignored = vcs_ignored_files | explicitely_excluded - result = set() - for file in ignored: - result.add(file) - - # The list of excluded files might be big and we will do a lot - # containment check (x in excluded). - # Returning a set make those tests much much faster. - return result - - def is_excluded(self, filepath): # type: (Union[str, Path]) -> bool - if not isinstance(filepath, basestring): - filepath = filepath.as_posix() - - return filepath in self.find_excluded_files() - - def find_files_to_add(self, exclude_build=True): # type: (bool) -> list - """ - Finds all files to add to the tarball - """ - to_add = [] - - for include in self._module.includes: - for file in include.elements: - if "__pycache__" in str(file): - continue - - if file.is_dir(): - continue - - file = file.relative_to(self._path) - - if self.is_excluded(file) and isinstance(include, PackageInclude): - continue - - if file.suffix == ".pyc": - continue - - if file in to_add: - # Skip duplicates - continue - - self._io.write_line( - " - Adding: {}".format(str(file)), VERY_VERBOSE - ) - to_add.append(file) - - # Include project files - self._io.write_line( - " - Adding: pyproject.toml", VERY_VERBOSE - ) - to_add.append(Path("pyproject.toml")) - - # If a license file exists, add it - for license_file in self._path.glob("LICENSE*"): - self._io.write_line( - " - Adding: {}".format( - license_file.relative_to(self._path) - ), - VERY_VERBOSE, - ) - to_add.append(license_file.relative_to(self._path)) - - # If a README is specificed we need to include it - # to avoid errors - if "readme" in self._poetry.local_config: - readme = self._path / self._poetry.local_config["readme"] - if readme.exists(): - self._io.write_line( - " - Adding: {}".format( - readme.relative_to(self._path) - ), - VERY_VERBOSE, - ) - to_add.append(readme.relative_to(self._path)) - - # If a build script is specified and explicitely required - # we add it to the list of files - if self._package.build and not exclude_build: - to_add.append(Path(self._package.build)) - - return sorted(to_add) - - def get_metadata_content(self): # type: () -> bytes - content = METADATA_BASE.format( - name=self._meta.name, - version=self._meta.version, - summary=to_str(self._meta.summary), - ) - - # Optional fields - if self._meta.home_page: - content += "Home-page: {}\n".format(self._meta.home_page) - - if self._meta.license: - content += "License: {}\n".format(self._meta.license) - - if self._meta.keywords: - content += "Keywords: {}\n".format(self._meta.keywords) - - if self._meta.author: - content += "Author: {}\n".format(to_str(self._meta.author)) - - if self._meta.author_email: - content += "Author-email: {}\n".format(to_str(self._meta.author_email)) - - if self._meta.maintainer: - content += "Maintainer: {}\n".format(to_str(self._meta.maintainer)) - - if self._meta.maintainer_email: - content += "Maintainer-email: {}\n".format( - to_str(self._meta.maintainer_email) - ) - - if self._meta.requires_python: - content += "Requires-Python: {}\n".format(self._meta.requires_python) - - for classifier in self._meta.classifiers: - content += "Classifier: {}\n".format(classifier) - - for extra in sorted(self._meta.provides_extra): - content += "Provides-Extra: {}\n".format(extra) - - for dep in sorted(self._meta.requires_dist): - content += "Requires-Dist: {}\n".format(dep) - - for url in sorted(self._meta.project_urls, key=lambda u: u[0]): - content += "Project-URL: {}\n".format(to_str(url)) - - if self._meta.description_content_type: - content += "Description-Content-Type: {}\n".format( - self._meta.description_content_type - ) - - if self._meta.description is not None: - content += "\n" + to_str(self._meta.description) + "\n" - - return content - - def convert_entry_points(self): # type: () -> dict - result = defaultdict(list) - - # Scripts -> Entry points - for name, ep in self._poetry.local_config.get("scripts", {}).items(): - extras = "" - if isinstance(ep, dict): - extras = "[{}]".format(", ".join(ep["extras"])) - ep = ep["callable"] - - result["console_scripts"].append("{} = {}{}".format(name, ep, extras)) - - # Plugins -> entry points - plugins = self._poetry.local_config.get("plugins", {}) - for groupname, group in plugins.items(): - for name, ep in sorted(group.items()): - result[groupname].append("{} = {}".format(name, ep)) - - for groupname in result: - result[groupname] = sorted(result[groupname]) - - return dict(result) - - @classmethod - def convert_author(cls, author): # type: (...) -> dict - m = AUTHOR_REGEX.match(author) - - name = m.group("name") - email = m.group("email") - - return {"name": name, "email": email} - - @classmethod - @contextmanager - def temporary_directory(cls, *args, **kwargs): - try: - from tempfile import TemporaryDirectory - - with TemporaryDirectory(*args, **kwargs) as name: - yield name - except ImportError: - name = tempfile.mkdtemp(*args, **kwargs) - - yield name - - shutil.rmtree(name) diff --git a/poetry/masonry/builders/complete.py b/poetry/masonry/builders/complete.py deleted file mode 100644 index ec40014c42e..00000000000 --- a/poetry/masonry/builders/complete.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import tarfile - -from poetry.factory import Factory -from poetry.io.null_io import NullIO -from poetry.utils._compat import Path -from poetry.utils.helpers import temporary_directory - -from contextlib import contextmanager - -from .builder import Builder -from .sdist import SdistBuilder -from .wheel import WheelBuilder - - -class CompleteBuilder(Builder): - def build(self): - # We start by building the tarball - # We will use it to build the wheel - sdist_builder = SdistBuilder(self._poetry, self._env, self._io) - build_for_all_formats = False - for p in self._package.packages: - formats = p.get("format", []) - if not isinstance(formats, list): - formats = [formats] - - if formats and sdist_builder.format not in formats: - build_for_all_formats = True - break - - sdist_file = sdist_builder.build() - - self._io.write_line("") - - dist_dir = self._path / "dist" - - if build_for_all_formats: - sdist_builder = SdistBuilder( - self._poetry, self._env, NullIO(), ignore_packages_formats=True - ) - with temporary_directory() as tmp_dir: - sdist_file = sdist_builder.build(Path(tmp_dir)) - - with self.unpacked_tarball(sdist_file) as tmpdir: - WheelBuilder.make_in( - Factory().create_poetry(tmpdir), - self._env, - self._io, - dist_dir, - original=self._poetry, - ) - else: - with self.unpacked_tarball(sdist_file) as tmpdir: - WheelBuilder.make_in( - Factory().create_poetry(tmpdir), - self._env, - self._io, - dist_dir, - original=self._poetry, - ) - - @classmethod - @contextmanager - def unpacked_tarball(cls, path): - tf = tarfile.open(str(path)) - - with cls.temporary_directory() as tmpdir: - tf.extractall(tmpdir) - files = os.listdir(tmpdir) - - assert len(files) == 1, files - - yield Path(tmpdir) / files[0] diff --git a/poetry/masonry/builders/editable.py b/poetry/masonry/builders/editable.py index 78d46db7f8e..655bfbc546b 100644 --- a/poetry/masonry/builders/editable.py +++ b/poetry/masonry/builders/editable.py @@ -1,23 +1,59 @@ from __future__ import unicode_literals +import hashlib import os import shutil -from collections import defaultdict +from base64 import urlsafe_b64encode -from poetry.semver.version import Version +from poetry.core.masonry.builders.builder import Builder +from poetry.core.masonry.builders.sdist import SdistBuilder +from poetry.core.semver.version import Version +from poetry.utils._compat import WINDOWS +from poetry.utils._compat import Path from poetry.utils._compat import decode -from .builder import Builder -from .sdist import SdistBuilder + +SCRIPT_TEMPLATE = """\ +#!{python} +from {module} import {callable_holder} + +if __name__ == '__main__': + {callable_}() +""" + +WINDOWS_CMD_TEMPLATE = """\ +@echo off\r\n"{python}" "%~dp0\\{script}" %*\r\n +""" class EditableBuilder(Builder): + def __init__(self, poetry, env, io): + super(EditableBuilder, self).__init__(poetry) + + self._env = env + self._io = io + def build(self): - return self._setup_build() + self._debug( + " - Building package {} in editable mode".format( + self._package.name + ) + ) + + if self._package.build_script: + self._debug( + " - Falling back on using a setup.py" + ) + return self._setup_build() + + added_files = [] + added_files += self._add_pth() + added_files += self._add_scripts() + self._add_dist_info(added_files) def _setup_build(self): - builder = SdistBuilder(self._poetry, self._env, self._io) + builder = SdistBuilder(self._poetry) setup = self._path / "setup.py" has_setup = setup.exists() @@ -31,16 +67,14 @@ def _setup_build(self): try: if self._env.pip_version < Version(19, 0): - self._env.run("python", "-m", "pip", "install", "-e", str(self._path)) + self._env.run_pip("install", "-e", str(self._path), "--no-deps") else: # Temporarily rename pyproject.toml shutil.move( str(self._poetry.file), str(self._poetry.file.with_suffix(".tmp")) ) try: - self._env.run( - "python", "-m", "pip", "install", "-e", str(self._path) - ) + self._env.run_pip("install", "-e", str(self._path), "--no-deps") finally: shutil.move( str(self._poetry.file.with_suffix(".tmp")), @@ -50,71 +84,128 @@ def _setup_build(self): if not has_setup: os.remove(str(setup)) - def _build_egg_info(self): - egg_info = self._path / "{}.egg-info".format( - self._package.name.replace("-", "_") + def _add_pth(self): + pth = self._env.site_packages.joinpath(self._module.name).with_suffix(".pth") + self._debug( + " - Adding {} to {} for {}".format( + pth.name, self._env.site_packages, self._poetry.file.parent + ) ) - egg_info.mkdir(exist_ok=True) + with pth.open("w", encoding="utf-8") as f: + f.write(decode(str(self._poetry.file.parent.resolve()))) + + return [pth] + + def _add_scripts(self): + added = [] + entry_points = self.convert_entry_points() + scripts_path = Path(self._env.paths["scripts"]) + + scripts = entry_points.get("console_scripts", []) + for script in scripts: + name, script = script.split(" = ") + module, callable_ = script.split(":") + callable_holder = callable_.rsplit(".", 1)[0] + + script_file = scripts_path.joinpath(name) + self._debug( + " - Adding the {} script to {}".format( + name, scripts_path + ) + ) + with script_file.open("w", encoding="utf-8") as f: + f.write( + decode( + SCRIPT_TEMPLATE.format( + python=self._env._bin("python"), + module=module, + callable_holder=callable_holder, + callable_=callable_, + ) + ) + ) + + script_file.chmod(0o755) + + added.append(script_file) - with egg_info.joinpath("PKG-INFO").open("w", encoding="utf-8") as f: - f.write(decode(self.get_metadata_content())) + if WINDOWS: + cmd_script = script_file.with_suffix(".cmd") + cmd = WINDOWS_CMD_TEMPLATE.format( + python=self._env._bin("python"), script=name + ) + self._debug( + " - Adding the {} script wrapper to {}".format( + cmd_script.name, scripts_path + ) + ) - with egg_info.joinpath("entry_points.txt").open("w", encoding="utf-8") as f: - entry_points = self.convert_entry_points() + with cmd_script.open("w", encoding="utf-8") as f: + f.write(decode(cmd)) - for group_name in sorted(entry_points): - f.write("[{}]\n".format(group_name)) - for ep in sorted(entry_points[group_name]): - f.write(ep.replace(" ", "") + "\n") + added.append(cmd_script) - f.write("\n") + return added + + def _add_dist_info(self, added_files): + from poetry.core.masonry.builders.wheel import WheelBuilder + + added_files = added_files[:] + + builder = WheelBuilder(self._poetry) + dist_info = self._env.site_packages.joinpath(builder.dist_info) + + self._debug( + " - Adding the {} directory to {}".format( + dist_info.name, self._env.site_packages + ) + ) - with egg_info.joinpath("requires.txt").open("w", encoding="utf-8") as f: - f.write(self._generate_requires()) + if dist_info.exists(): + shutil.rmtree(str(dist_info)) - def _build_egg_link(self): - egg_link = self._env.site_packages / "{}.egg-link".format(self._package.name) - with egg_link.open("w", encoding="utf-8") as f: - f.write(str(self._poetry.file.parent.resolve()) + "\n") - f.write(".") + dist_info.mkdir() - def _add_easy_install_entry(self): - easy_install_pth = self._env.site_packages / "easy-install.pth" - path = str(self._poetry.file.parent.resolve()) - content = "" - if easy_install_pth.exists(): - with easy_install_pth.open(encoding="utf-8") as f: - content = f.read() + with dist_info.joinpath("METADATA").open("w", encoding="utf-8") as f: + builder._write_metadata_file(f) - if path in content: - return + added_files.append(dist_info.joinpath("METADATA")) - content += "{}\n".format(path) + with dist_info.joinpath("INSTALLER").open("w", encoding="utf-8") as f: + f.write("poetry") - with easy_install_pth.open("w", encoding="utf-8") as f: - f.write(content) + added_files.append(dist_info.joinpath("INSTALLER")) - def _generate_requires(self): - extras = defaultdict(list) + if self.convert_entry_points(): + with dist_info.joinpath("entry_points.txt").open( + "w", encoding="utf-8" + ) as f: + builder._write_entry_points(f) - requires = "" - for dep in sorted(self._package.requires, key=lambda d: d.name): - marker = dep.marker - if marker.is_any(): - requires += "{}\n".format(dep.base_pep_508_name) - continue + added_files.append(dist_info.joinpath("entry_points.txt")) - extras[str(marker)].append(dep.base_pep_508_name) + with dist_info.joinpath("RECORD").open("w", encoding="utf-8") as f: + for path in added_files: + hash = self._get_file_hash(path) + size = path.stat().st_size + f.write("{},sha256={},{}\n".format(str(path), hash, size)) - if extras: - requires += "\n" + # RECORD itself is recorded with no hash or size + f.write("{},,\n".format(dist_info.joinpath("RECORD"))) - for marker, deps in sorted(extras.items()): - requires += "[:{}]\n".format(marker) + def _get_file_hash(self, filepath): + hashsum = hashlib.sha256() + with filepath.open("rb") as src: + while True: + buf = src.read(1024 * 8) + if not buf: + break + hashsum.update(buf) - for dep in deps: - requires += dep + "\n" + src.seek(0) - requires += "\n" + return urlsafe_b64encode(hashsum.digest()).decode("ascii").rstrip("=") - return requires + def _debug(self, msg): + if self._io.is_debug(): + self._io.write_line(msg) diff --git a/poetry/masonry/builders/sdist.py b/poetry/masonry/builders/sdist.py deleted file mode 100644 index 268f8f5c6f8..00000000000 --- a/poetry/masonry/builders/sdist.py +++ /dev/null @@ -1,346 +0,0 @@ -# -*- coding: utf-8 -*- -import os -import re -import tarfile - -from collections import defaultdict -from copy import copy -from gzip import GzipFile -from io import BytesIO -from posixpath import join as pjoin -from pprint import pformat - -from poetry.utils._compat import Path -from poetry.utils._compat import encode -from poetry.utils._compat import to_str - -from ..utils.helpers import normalize_file_permissions -from ..utils.package_include import PackageInclude - -from .builder import Builder - - -SETUP = """\ -# -*- coding: utf-8 -*- -from distutils.core import setup - -{before} -setup_kwargs = {{ - 'name': {name!r}, - 'version': {version!r}, - 'description': {description!r}, - 'long_description': {long_description!r}, - 'author': {author!r}, - 'author_email': {author_email!r}, - 'maintainer': {maintainer!r}, - 'maintainer_email': {maintainer_email!r}, - 'url': {url!r}, - {extra} -}} -{after} - -setup(**setup_kwargs) -""" - - -class SdistBuilder(Builder): - - format = "sdist" - - def build(self, target_dir=None): # type: (Path) -> Path - self._io.write_line(" - Building sdist") - if target_dir is None: - target_dir = self._path / "dist" - - if not target_dir.exists(): - target_dir.mkdir(parents=True) - - target = target_dir / "{}-{}.tar.gz".format( - self._package.pretty_name, self._meta.version - ) - gz = GzipFile(target.as_posix(), mode="wb") - tar = tarfile.TarFile( - target.as_posix(), mode="w", fileobj=gz, format=tarfile.PAX_FORMAT - ) - - try: - tar_dir = "{}-{}".format(self._package.pretty_name, self._meta.version) - - files_to_add = self.find_files_to_add(exclude_build=False) - - for relpath in files_to_add: - path = self._path / relpath - tar_info = tar.gettarinfo( - str(path), arcname=pjoin(tar_dir, str(relpath)) - ) - tar_info = self.clean_tarinfo(tar_info) - - if tar_info.isreg(): - with path.open("rb") as f: - tar.addfile(tar_info, f) - else: - tar.addfile(tar_info) # Symlinks & ? - - setup = self.build_setup() - tar_info = tarfile.TarInfo(pjoin(tar_dir, "setup.py")) - tar_info.size = len(setup) - tar.addfile(tar_info, BytesIO(setup)) - - pkg_info = self.build_pkg_info() - - tar_info = tarfile.TarInfo(pjoin(tar_dir, "PKG-INFO")) - tar_info.size = len(pkg_info) - tar.addfile(tar_info, BytesIO(pkg_info)) - finally: - tar.close() - gz.close() - - self._io.write_line(" - Built {}".format(target.name)) - - return target - - def build_setup(self): # type: () -> bytes - before, extra, after = [], [], [] - package_dir = {} - - # If we have a build script, use it - if self._package.build: - after += [ - "from {} import *".format(self._package.build.split(".")[0]), - "build(setup_kwargs)", - ] - - modules = [] - packages = [] - package_data = {} - for include in self._module.includes: - if include.formats and "sdist" not in include.formats: - continue - - if isinstance(include, PackageInclude): - if include.is_package(): - pkg_dir, _packages, _package_data = self.find_packages(include) - - if pkg_dir is not None: - package_dir[""] = os.path.relpath(pkg_dir, str(self._path)) - - packages += [p for p in _packages if p not in packages] - package_data.update(_package_data) - else: - module = include.elements[0].relative_to(include.base).stem - - if include.source is not None: - package_dir[""] = str(include.base.relative_to(self._path)) - - if module not in modules: - modules.append(module) - else: - pass - - if package_dir: - before.append("package_dir = \\\n{}\n".format(pformat(package_dir))) - extra.append("'package_dir': package_dir,") - - if packages: - before.append("packages = \\\n{}\n".format(pformat(sorted(packages)))) - extra.append("'packages': packages,") - - if package_data: - before.append("package_data = \\\n{}\n".format(pformat(package_data))) - extra.append("'package_data': package_data,") - - if modules: - before.append("modules = \\\n{}".format(pformat(modules))) - extra.append("'py_modules': modules,".format()) - - dependencies, extras = self.convert_dependencies( - self._package, self._package.requires - ) - if dependencies: - before.append( - "install_requires = \\\n{}\n".format(pformat(sorted(dependencies))) - ) - extra.append("'install_requires': install_requires,") - - if extras: - before.append("extras_require = \\\n{}\n".format(pformat(extras))) - extra.append("'extras_require': extras_require,") - - entry_points = self.convert_entry_points() - if entry_points: - before.append("entry_points = \\\n{}\n".format(pformat(entry_points))) - extra.append("'entry_points': entry_points,") - - if self._package.python_versions != "*": - python_requires = self._meta.requires_python - - extra.append("'python_requires': {!r},".format(python_requires)) - - return encode( - SETUP.format( - before="\n".join(before), - name=to_str(self._meta.name), - version=to_str(self._meta.version), - description=to_str(self._meta.summary), - long_description=to_str(self._meta.description), - author=to_str(self._meta.author), - author_email=to_str(self._meta.author_email), - maintainer=to_str(self._meta.maintainer), - maintainer_email=to_str(self._meta.maintainer_email), - url=to_str(self._meta.home_page), - extra="\n ".join(extra), - after="\n".join(after), - ) - ) - - def build_pkg_info(self): - return encode(self.get_metadata_content()) - - def find_packages(self, include): - """ - Discover subpackages and data. - - It also retrieves necessary files. - """ - pkgdir = None - if include.source is not None: - pkgdir = str(include.base) - - base = str(include.elements[0].parent) - - pkg_name = include.package - pkg_data = defaultdict(list) - # Undocumented distutils feature: - # the empty string matches all package names - pkg_data[""].append("*") - packages = [pkg_name] - subpkg_paths = set() - - def find_nearest_pkg(rel_path): - parts = rel_path.split(os.sep) - for i in reversed(range(1, len(parts))): - ancestor = "/".join(parts[:i]) - if ancestor in subpkg_paths: - pkg = ".".join([pkg_name] + parts[:i]) - return pkg, "/".join(parts[i:]) - - # Relative to the top-level package - return pkg_name, Path(rel_path).as_posix() - - for path, dirnames, filenames in os.walk(str(base), topdown=True): - if os.path.basename(path) == "__pycache__": - continue - - from_top_level = os.path.relpath(path, base) - if from_top_level == ".": - continue - - is_subpkg = "__init__.py" in filenames - if is_subpkg: - subpkg_paths.add(from_top_level) - parts = from_top_level.split(os.sep) - packages.append(".".join([pkg_name] + parts)) - else: - pkg, from_nearest_pkg = find_nearest_pkg(from_top_level) - - data_elements = [ - f.relative_to(self._path) - for f in Path(path).glob("*") - if not f.is_dir() - ] - - data = [e for e in data_elements if not self.is_excluded(e)] - if not data: - continue - - if len(data) == len(data_elements): - pkg_data[pkg].append(pjoin(from_nearest_pkg, "*")) - else: - for d in data: - if d.is_dir(): - continue - - pkg_data[pkg] += [pjoin(from_nearest_pkg, d.name) for d in data] - - # Sort values in pkg_data - pkg_data = {k: sorted(v) for (k, v) in pkg_data.items() if v} - - return pkgdir, sorted(packages), pkg_data - - @classmethod - def convert_dependencies( - cls, package, dependencies # type: Package # type: List[Dependency] - ): - main = [] - extras = defaultdict(list) - req_regex = re.compile(r"^(.+) \((.+)\)$") - - for dependency in dependencies: - if dependency.is_optional(): - for extra_name, reqs in package.extras.items(): - for req in reqs: - if req.name == dependency.name: - requirement = to_str( - dependency.to_pep_508(with_extras=False) - ) - if ";" in requirement: - requirement, conditions = requirement.split(";") - - requirement = requirement.strip() - if req_regex.match(requirement): - requirement = req_regex.sub( - "\\1\\2", requirement.strip() - ) - - extras[extra_name + ":" + conditions.strip()].append( - requirement - ) - - continue - - requirement = requirement.strip() - if req_regex.match(requirement): - requirement = req_regex.sub( - "\\1\\2", requirement.strip() - ) - extras[extra_name].append(requirement) - continue - - requirement = to_str(dependency.to_pep_508()) - if ";" in requirement: - requirement, conditions = requirement.split(";") - - requirement = requirement.strip() - if req_regex.match(requirement): - requirement = req_regex.sub("\\1\\2", requirement.strip()) - - extras[":" + conditions.strip()].append(requirement) - - continue - - requirement = requirement.strip() - if req_regex.match(requirement): - requirement = req_regex.sub("\\1\\2", requirement.strip()) - - main.append(requirement) - - return main, dict(extras) - - @classmethod - def clean_tarinfo(cls, tar_info): - """ - Clean metadata from a TarInfo object to make it more reproducible. - - - Set uid & gid to 0 - - Set uname and gname to "" - - Normalise permissions to 644 or 755 - - Set mtime if not None - """ - ti = copy(tar_info) - ti.uid = 0 - ti.gid = 0 - ti.uname = "" - ti.gname = "" - ti.mode = normalize_file_permissions(ti.mode) - - return ti diff --git a/poetry/masonry/builders/wheel.py b/poetry/masonry/builders/wheel.py deleted file mode 100644 index 9b7ce4834ef..00000000000 --- a/poetry/masonry/builders/wheel.py +++ /dev/null @@ -1,322 +0,0 @@ -from __future__ import unicode_literals - -import contextlib -import hashlib -import os -import re -import tempfile -import shutil -import stat -import zipfile - -from base64 import urlsafe_b64encode -from io import StringIO -from typing import Set - -from clikit.api.io.flags import VERY_VERBOSE - -from poetry.__version__ import __version__ -from poetry.semver import parse_constraint -from poetry.utils._compat import decode - -from ..utils.helpers import normalize_file_permissions -from ..utils.package_include import PackageInclude -from ..utils.tags import get_abbr_impl -from ..utils.tags import get_abi_tag -from ..utils.tags import get_impl_ver -from ..utils.tags import get_platform -from .builder import Builder - - -wheel_file_template = """\ -Wheel-Version: 1.0 -Generator: poetry {version} -Root-Is-Purelib: {pure_lib} -Tag: {tag} -""" - - -class WheelBuilder(Builder): - - format = "wheel" - - def __init__(self, poetry, env, io, target_dir=None, original=None): - super(WheelBuilder, self).__init__(poetry, env, io) - - self._records = [] - self._original_path = self._path - self._target_dir = target_dir or (self._poetry.file.parent / "dist") - if original: - self._original_path = original.file.parent - - @classmethod - def make_in(cls, poetry, env, io, directory=None, original=None): - wb = WheelBuilder(poetry, env, io, target_dir=directory, original=original) - wb.build() - - return wb.wheel_filename - - @classmethod - def make(cls, poetry, env, io): - """Build a wheel in the dist/ directory, and optionally upload it.""" - cls.make_in(poetry, env, io) - - def build(self): - self._io.write_line(" - Building wheel") - - dist_dir = self._target_dir - if not dist_dir.exists(): - dist_dir.mkdir() - - (fd, temp_path) = tempfile.mkstemp(suffix=".whl") - - st_mode = os.stat(temp_path).st_mode - new_mode = normalize_file_permissions(st_mode) - os.chmod(temp_path, new_mode) - - with zipfile.ZipFile( - os.fdopen(fd, "w+b"), mode="w", compression=zipfile.ZIP_DEFLATED - ) as zip_file: - self._copy_module(zip_file) - self._build(zip_file) - self._write_metadata(zip_file) - self._write_record(zip_file) - - wheel_path = dist_dir / self.wheel_filename - if wheel_path.exists(): - wheel_path.unlink() - shutil.move(temp_path, str(wheel_path)) - - self._io.write_line( - " - Built {}".format(self.wheel_filename) - ) - - def _build(self, wheel): - if self._package.build: - setup = self._path / "setup.py" - - # We need to place ourselves in the temporary - # directory in order to build the package - current_path = os.getcwd() - try: - os.chdir(str(self._path)) - self._env.run( - "python", str(setup), "build", "-b", str(self._path / "build") - ) - finally: - os.chdir(current_path) - - build_dir = self._path / "build" - lib = list(build_dir.glob("lib.*")) - if not lib: - # The result of building the extensions - # does not exist, this may due to conditional - # builds, so we assume that it's okay - return - - lib = lib[0] - excluded = self.find_excluded_files() - for pkg in lib.glob("**/*"): - if pkg.is_dir() or pkg in excluded: - continue - - rel_path = str(pkg.relative_to(lib)) - - if rel_path in wheel.namelist(): - continue - - self._io.write_line( - " - Adding: {}".format(rel_path), VERY_VERBOSE - ) - - self._add_file(wheel, pkg, rel_path) - - def _copy_module(self, wheel): - excluded = self.find_excluded_files() - to_add = [] - - for include in self._module.includes: - if include.formats and "wheel" not in include.formats: - continue - - include.refresh() - - for file in include.elements: - if "__pycache__" in str(file): - continue - - if file.is_dir(): - continue - - if isinstance(include, PackageInclude) and include.source: - rel_file = file.relative_to(include.base) - else: - rel_file = file.relative_to(self._path) - - if rel_file.as_posix() in excluded: - continue - - if file.suffix == ".pyc": - continue - - if (file, rel_file) in to_add: - # Skip duplicates - continue - - self._io.write_line( - " - Adding: {}".format(str(file)), VERY_VERBOSE - ) - to_add.append((file, rel_file)) - - # Walk the files and compress them, - # sorting everything so the order is stable. - for full_path, rel_path in sorted(to_add, key=lambda x: x[1]): - self._add_file(wheel, full_path, rel_path) - - def _write_metadata(self, wheel): - if ( - "scripts" in self._poetry.local_config - or "plugins" in self._poetry.local_config - ): - with self._write_to_zip(wheel, self.dist_info + "/entry_points.txt") as f: - self._write_entry_points(f) - - for base in ("COPYING", "LICENSE"): - for path in sorted(self._path.glob(base + "*")): - self._add_file(wheel, path, "%s/%s" % (self.dist_info, path.name)) - - with self._write_to_zip(wheel, self.dist_info + "/WHEEL") as f: - self._write_wheel_file(f) - - with self._write_to_zip(wheel, self.dist_info + "/METADATA") as f: - self._write_metadata_file(f) - - def _write_record(self, wheel): - # Write a record of the files in the wheel - with self._write_to_zip(wheel, self.dist_info + "/RECORD") as f: - for path, hash, size in self._records: - f.write("{},sha256={},{}\n".format(path, hash, size)) - # RECORD itself is recorded with no hash or size - f.write(self.dist_info + "/RECORD,,\n") - - @property - def dist_info(self): # type: () -> str - return self.dist_info_name(self._package.name, self._meta.version) - - @property - def wheel_filename(self): # type: () -> str - return "{}-{}-{}.whl".format( - re.sub(r"[^\w\d.]+", "_", self._package.pretty_name, flags=re.UNICODE), - re.sub(r"[^\w\d.\+]+", "_", self._meta.version, flags=re.UNICODE), - self.tag, - ) - - def supports_python2(self): - return self._package.python_constraint.allows_any( - parse_constraint(">=2.0.0 <3.0.0") - ) - - def dist_info_name(self, distribution, version): # type: (...) -> str - escaped_name = re.sub(r"[^\w\d.]+", "_", distribution, flags=re.UNICODE) - escaped_version = re.sub(r"[^\w\d.+]+", "_", version, flags=re.UNICODE) - - return "{}-{}.dist-info".format(escaped_name, escaped_version) - - @property - def tag(self): - if self._package.build: - platform = get_platform().replace(".", "_").replace("-", "_") - impl_name = get_abbr_impl(self._env) - impl_ver = get_impl_ver(self._env) - impl = impl_name + impl_ver - abi_tag = str(get_abi_tag(self._env)).lower() - tag = (impl, abi_tag, platform) - else: - platform = "any" - if self.supports_python2(): - impl = "py2.py3" - else: - impl = "py3" - - tag = (impl, "none", platform) - - return "-".join(tag) - - def _add_file(self, wheel, full_path, rel_path): - full_path, rel_path = str(full_path), str(rel_path) - if os.sep != "/": - # We always want to have /-separated paths in the zip file and in - # RECORD - rel_path = rel_path.replace(os.sep, "/") - - zinfo = zipfile.ZipInfo(rel_path) - - # Normalize permission bits to either 755 (executable) or 644 - st_mode = os.stat(full_path).st_mode - new_mode = normalize_file_permissions(st_mode) - zinfo.external_attr = (new_mode & 0xFFFF) << 16 # Unix attributes - - if stat.S_ISDIR(st_mode): - zinfo.external_attr |= 0x10 # MS-DOS directory flag - - hashsum = hashlib.sha256() - with open(full_path, "rb") as src: - while True: - buf = src.read(1024 * 8) - if not buf: - break - hashsum.update(buf) - - src.seek(0) - wheel.writestr(zinfo, src.read(), compress_type=zipfile.ZIP_DEFLATED) - - size = os.stat(full_path).st_size - hash_digest = urlsafe_b64encode(hashsum.digest()).decode("ascii").rstrip("=") - - self._records.append((rel_path, hash_digest, size)) - - @contextlib.contextmanager - def _write_to_zip(self, wheel, rel_path): - sio = StringIO() - yield sio - - # The default is a fixed timestamp rather than the current time, so - # that building a wheel twice on the same computer can automatically - # give you the exact same result. - date_time = (2016, 1, 1, 0, 0, 0) - zi = zipfile.ZipInfo(rel_path, date_time) - zi.external_attr = (0o644 & 0xFFFF) << 16 # Unix attributes - b = sio.getvalue().encode("utf-8") - hashsum = hashlib.sha256(b) - hash_digest = urlsafe_b64encode(hashsum.digest()).decode("ascii").rstrip("=") - - wheel.writestr(zi, b, compress_type=zipfile.ZIP_DEFLATED) - self._records.append((rel_path, hash_digest, len(b))) - - def _write_entry_points(self, fp): - """ - Write entry_points.txt. - """ - entry_points = self.convert_entry_points() - - for group_name in sorted(entry_points): - fp.write("[{}]\n".format(group_name)) - for ep in sorted(entry_points[group_name]): - fp.write(ep.replace(" ", "") + "\n") - - fp.write("\n") - - def _write_wheel_file(self, fp): - fp.write( - wheel_file_template.format( - version=__version__, - pure_lib="true" if self._package.build is None else "false", - tag=self.tag, - ) - ) - - def _write_metadata_file(self, fp): - """ - Write out metadata in the 2.x format (email like) - """ - fp.write(decode(self.get_metadata_content())) diff --git a/poetry/masonry/metadata.py b/poetry/masonry/metadata.py deleted file mode 100644 index 64e91bc397b..00000000000 --- a/poetry/masonry/metadata.py +++ /dev/null @@ -1,90 +0,0 @@ -from poetry.utils.helpers import canonicalize_name -from poetry.utils.helpers import normalize_version -from poetry.version.helpers import format_python_constraint - - -class Metadata: - - metadata_version = "2.1" - # version 1.0 - name = None - version = None - platforms = () - supported_platforms = () - summary = None - description = None - keywords = None - home_page = None - download_url = None - author = None - author_email = None - license = None - # version 1.1 - classifiers = () - requires = () - provides = () - obsoletes = () - # version 1.2 - maintainer = None - maintainer_email = None - requires_python = None - requires_external = () - requires_dist = [] - provides_dist = () - obsoletes_dist = () - project_urls = () - - # Version 2.1 - description_content_type = None - provides_extra = [] - - @classmethod - def from_package(cls, package): # type: (...) -> Metadata - meta = cls() - - meta.name = canonicalize_name(package.name) - meta.version = normalize_version(package.version.text) - meta.summary = package.description - if package.readme: - with package.readme.open(encoding="utf-8") as f: - meta.description = f.read() - - meta.keywords = ",".join(package.keywords) - meta.home_page = package.homepage or package.repository_url - meta.author = package.author_name - meta.author_email = package.author_email - - if package.license: - meta.license = package.license.id - - meta.classifiers = package.all_classifiers - - # Version 1.2 - meta.maintainer = package.maintainer_name - meta.maintainer_email = package.maintainer_email - - # Requires python - if package.python_versions != "*": - meta.requires_python = format_python_constraint(package.python_constraint) - - meta.requires_dist = [d.to_pep_508() for d in package.requires] - - # Version 2.1 - if package.readme: - if package.readme.suffix == ".rst": - meta.description_content_type = "text/x-rst" - elif package.readme.suffix in [".md", ".markdown"]: - meta.description_content_type = "text/markdown" - else: - meta.description_content_type = "text/plain" - - meta.provides_extra = [e for e in package.extras] - - if package.urls: - for name, url in package.urls.items(): - if name == "Homepage" and meta.home_page == url: - continue - - meta.project_urls += ("{}, {}".format(name, url),) - - return meta diff --git a/poetry/masonry/publishing/publisher.py b/poetry/masonry/publishing/publisher.py deleted file mode 100644 index 21086608959..00000000000 --- a/poetry/masonry/publishing/publisher.py +++ /dev/null @@ -1,88 +0,0 @@ -import logging - -from poetry.utils.helpers import get_http_basic_auth - -from .uploader import Uploader - - -logger = logging.getLogger(__name__) - - -class Publisher: - """ - Registers and publishes packages to remote repositories. - """ - - def __init__(self, poetry, io): - self._poetry = poetry - self._package = poetry.package - self._io = io - self._uploader = Uploader(poetry, io) - - @property - def files(self): - return self._uploader.files - - def publish(self, repository_name, username, password): - if repository_name: - self._io.write_line( - "Publishing {} ({}) " - "to {}".format( - self._package.pretty_name, - self._package.pretty_version, - repository_name, - ) - ) - else: - self._io.write_line( - "Publishing {} ({}) " - "to PyPI".format( - self._package.pretty_name, self._package.pretty_version - ) - ) - - if not repository_name: - url = "https://upload.pypi.org/legacy/" - repository_name = "pypi" - else: - # Retrieving config information - repository = self._poetry.config.get( - "repositories.{}".format(repository_name) - ) - if repository is None: - raise RuntimeError( - "Repository {} is not defined".format(repository_name) - ) - - url = repository["url"] - - if not (username and password): - # Check if we have a token first - token = self._poetry.config.get("pypi-token.{}".format(repository_name)) - if token: - logger.debug("Found an API token for {}.".format(repository_name)) - username = "__token__" - password = token - else: - auth = get_http_basic_auth(self._poetry.config, repository_name) - if auth: - logger.debug( - "Found authentication information for {}.".format( - repository_name - ) - ) - username = auth[0] - password = auth[1] - - # Requesting missing credentials - if not username: - username = self._io.ask("Username:") - - if password is None: - password = self._io.ask_hidden("Password:") - - # TODO: handle certificates - - self._uploader.auth(username, password) - - return self._uploader.upload(url) diff --git a/poetry/masonry/utils/helpers.py b/poetry/masonry/utils/helpers.py deleted file mode 100644 index 2455bb811ae..00000000000 --- a/poetry/masonry/utils/helpers.py +++ /dev/null @@ -1,14 +0,0 @@ -def normalize_file_permissions(st_mode): - """ - Normalizes the permission bits in the st_mode field from stat to 644/755 - - Popular VCSs only track whether a file is executable or not. The exact - permissions can vary on systems with different umasks. Normalising - to 644 (non executable) or 755 (executable) makes builds more reproducible. - """ - # Set 644 permissions, leaving higher bits of st_mode unchanged - new_mode = (st_mode | 0o644) & ~0o133 - if st_mode & 0o100: - new_mode |= 0o111 # Executable: 644 -> 755 - - return new_mode diff --git a/poetry/masonry/utils/include.py b/poetry/masonry/utils/include.py deleted file mode 100644 index 5b6938a0bd1..00000000000 --- a/poetry/masonry/utils/include.py +++ /dev/null @@ -1,48 +0,0 @@ -from typing import List -from typing import Optional - -from poetry.utils._compat import Path - - -class Include(object): - """ - Represents an "include" entry. - - It can be a glob string, a single file or a directory. - - This class will then detect the type of this include: - - - a package - - a module - - a file - - a directory - """ - - def __init__( - self, base, include, formats=None - ): # type: (Path, str, Optional[List[str]]) -> None - self._base = base - self._include = str(include) - self._formats = formats - - self._elements = sorted(list(self._base.glob(str(self._include)))) - - @property - def base(self): # type: () -> Path - return self._base - - @property - def elements(self): # type: () -> List[Path] - return self._elements - - @property - def formats(self): # type: () -> Optional[List[str]] - return self._formats - - def is_empty(self): # type: () -> bool - return len(self._elements) == 0 - - def refresh(self): # type: () -> Include - self._elements = sorted(list(self._base.glob(self._include))) - - return self diff --git a/poetry/masonry/utils/module.py b/poetry/masonry/utils/module.py deleted file mode 100644 index a77226f2057..00000000000 --- a/poetry/masonry/utils/module.py +++ /dev/null @@ -1,100 +0,0 @@ -from poetry.utils._compat import Path -from poetry.utils.helpers import module_name - -from .include import Include -from .package_include import PackageInclude - - -class ModuleOrPackageNotFound(ValueError): - - pass - - -class Module: - def __init__(self, name, directory=".", packages=None, includes=None): - self._name = module_name(name) - self._in_src = False - self._is_package = False - self._path = Path(directory) - self._includes = [] - packages = packages or [] - includes = includes or [] - - if not packages: - # It must exist either as a .py file or a directory, but not both - pkg_dir = Path(directory, self._name) - py_file = Path(directory, self._name + ".py") - if pkg_dir.is_dir() and py_file.is_file(): - raise ValueError("Both {} and {} exist".format(pkg_dir, py_file)) - elif pkg_dir.is_dir(): - packages = [{"include": str(pkg_dir.relative_to(self._path))}] - elif py_file.is_file(): - packages = [{"include": str(py_file.relative_to(self._path))}] - else: - # Searching for a src module - src = Path(directory, "src") - src_pkg_dir = src / self._name - src_py_file = src / (self._name + ".py") - - if src_pkg_dir.is_dir() and src_py_file.is_file(): - raise ValueError("Both {} and {} exist".format(pkg_dir, py_file)) - elif src_pkg_dir.is_dir(): - packages = [ - { - "include": str(src_pkg_dir.relative_to(src)), - "from": str(src.relative_to(self._path)), - } - ] - elif src_py_file.is_file(): - packages = [ - { - "include": str(src_py_file.relative_to(src)), - "from": str(src.relative_to(self._path)), - } - ] - else: - raise ModuleOrPackageNotFound( - "No file/folder found for package {}".format(name) - ) - - for package in packages: - formats = package.get("format") - if formats and not isinstance(formats, list): - formats = [formats] - - self._includes.append( - PackageInclude( - self._path, - package["include"], - formats=formats, - source=package.get("from"), - ) - ) - - for include in includes: - self._includes.append(Include(self._path, include)) - - @property - def name(self): # type: () -> str - return self._name - - @property - def path(self): # type: () -> Path - return self._path - - @property - def file(self): # type: () -> Path - if self._is_package: - return self._path / "__init__.py" - else: - return self._path - - @property - def includes(self): # type: () -> List - return self._includes - - def is_package(self): # type: () -> bool - return self._is_package - - def is_in_src(self): # type: () -> bool - return self._in_src diff --git a/poetry/masonry/utils/package_include.py b/poetry/masonry/utils/package_include.py deleted file mode 100644 index ee185497a61..00000000000 --- a/poetry/masonry/utils/package_include.py +++ /dev/null @@ -1,63 +0,0 @@ -from .include import Include - - -class PackageInclude(Include): - def __init__(self, base, include, formats=None, source=None): - self._package = None - self._is_package = False - self._is_module = False - self._source = source - - if source is not None: - base = base / source - - super(PackageInclude, self).__init__(base, include, formats=formats) - - self.check_elements() - - @property - def package(self): # type: () -> str - return self._package - - @property - def source(self): # type: () -> str - return self._source - - def is_package(self): # type: () -> bool - return self._is_package - - def is_module(self): # type: () -> bool - return self._is_module - - def refresh(self): # type: () -> PackageInclude - super(PackageInclude, self).refresh() - - return self.check_elements() - - def check_elements(self): # type: () -> PackageInclude - if not self._elements: - raise ValueError( - "{} does not contain any element".format(self._base / self._include) - ) - - if len(self._elements) > 1: - # Probably glob - self._is_package = True - - # The __init__.py file should be first - root = self._elements[0] - if root.name != "__init__.py": - raise ValueError("{} is not a package.".format(root)) - - self._package = root.parent.name - else: - if self._elements[0].is_dir(): - # If it's a directory, we include everything inside it - self._package = self._elements[0].name - self._elements = sorted(list(self._elements[0].glob("**/*"))) - self._is_package = True - else: - self._package = self._elements[0].stem - self._is_module = True - - return self diff --git a/poetry/masonry/utils/tags.py b/poetry/masonry/utils/tags.py deleted file mode 100644 index 175cdd8b73b..00000000000 --- a/poetry/masonry/utils/tags.py +++ /dev/null @@ -1,184 +0,0 @@ -""" -Generate and work with PEP 425 Compatibility Tags. - -Base implementation taken from -https://github.com/pypa/wheel/blob/master/wheel/pep425tags.py -and adapted to work with poetry's env util. -""" -from __future__ import unicode_literals - -import distutils.util -import sys -import warnings - - -def get_abbr_impl(env): - """Return abbreviated implementation name.""" - impl = env.python_implementation - - if impl == "PyPy": - return "pp" - elif impl == "Jython": - return "jy" - elif impl == "IronPython": - return "ip" - elif impl == "CPython": - return "cp" - - raise LookupError("Unknown Python implementation: " + impl) - - -def get_impl_ver(env): - """Return implementation version.""" - impl_ver = env.config_var("py_version_nodot") - if not impl_ver or get_abbr_impl(env) == "pp": - impl_ver = "".join(map(str, get_impl_version_info(env))) - - return impl_ver - - -def get_impl_version_info(env): - """Return sys.version_info-like tuple for use in decrementing the minor - version.""" - if get_abbr_impl(env) == "pp": - # as per https://github.com/pypa/pip/issues/2882 - return env.version_info[:3] - else: - return env.version_info[:2] - - -def get_flag(env, var, fallback, expected=True, warn=True): - """Use a fallback method for determining SOABI flags if the needed config - var is unset or unavailable.""" - val = env.config_var(var) - if val is None: - if warn: - warnings.warn( - "Config variable '{0}' is unset, Python ABI tag may " - "be incorrect".format(var), - RuntimeWarning, - 2, - ) - return fallback() - return val == expected - - -def get_abi_tag(env): - """Return the ABI tag based on SOABI (if available) or emulate SOABI - (CPython 2, PyPy).""" - soabi = env.config_var("SOABI") - impl = get_abbr_impl(env) - if not soabi and impl in ("cp", "pp") and hasattr(sys, "maxunicode"): - d = "" - m = "" - u = "" - if get_flag( - env, - "Py_DEBUG", - lambda: hasattr(sys, "gettotalrefcount"), - warn=(impl == "cp"), - ): - d = "d" - if get_flag(env, "WITH_PYMALLOC", lambda: impl == "cp", warn=(impl == "cp")): - m = "m" - if get_flag( - env, - "Py_UNICODE_SIZE", - lambda: sys.maxunicode == 0x10FFFF, - expected=4, - warn=(impl == "cp" and env.version_info < (3, 3)), - ) and env.version_info < (3, 3): - u = "u" - abi = "%s%s%s%s%s" % (impl, get_impl_ver(env), d, m, u) - elif soabi and soabi.startswith("cpython-"): - abi = "cp" + soabi.split("-")[1] - elif soabi: - abi = soabi.replace(".", "_").replace("-", "_") - else: - abi = None - return abi - - -def get_platform(): - """Return our platform name 'win32', 'linux_x86_64'""" - # XXX remove distutils dependency - result = distutils.util.get_platform().replace(".", "_").replace("-", "_") - if result == "linux_x86_64" and sys.maxsize == 2147483647: - # pip pull request #3497 - result = "linux_i686" - return result - - -def get_supported(env, versions=None, supplied_platform=None): - """Return a list of supported tags for each version specified in - `versions`. - :param versions: a list of string versions, of the form ["33", "32"], - or None. The first version will be assumed to support our ABI. - """ - supported = [] - - # Versions must be given with respect to the preference - if versions is None: - versions = [] - version_info = get_impl_version_info(env) - major = version_info[:-1] - # Support all previous minor Python versions. - for minor in range(version_info[-1], -1, -1): - versions.append("".join(map(str, major + (minor,)))) - - impl = get_abbr_impl(env) - - abis = [] - - abi = get_abi_tag(env) - if abi: - abis[0:0] = [abi] - - abi3s = set() - import imp - - for suffix in imp.get_suffixes(): - if suffix[0].startswith(".abi"): - abi3s.add(suffix[0].split(".", 2)[1]) - - abis.extend(sorted(list(abi3s))) - - abis.append("none") - - platforms = [] - if supplied_platform: - platforms.append(supplied_platform) - platforms.append(get_platform()) - - # Current version, current API (built specifically for our Python): - for abi in abis: - for arch in platforms: - supported.append(("%s%s" % (impl, versions[0]), abi, arch)) - - # abi3 modules compatible with older version of Python - for version in versions[1:]: - # abi3 was introduced in Python 3.2 - if version in ("31", "30"): - break - for abi in abi3s: # empty set if not Python 3 - for arch in platforms: - supported.append(("%s%s" % (impl, version), abi, arch)) - - # No abi / arch, but requires our implementation: - for i, version in enumerate(versions): - supported.append(("%s%s" % (impl, version), "none", "any")) - if i == 0: - # Tagged specifically as being cross-version compatible - # (with just the major version specified) - supported.append(("%s%s" % (impl, versions[0][0]), "none", "any")) - - # Major Python version + platform; e.g. binaries not using the Python API - supported.append(("py%s" % (versions[0][0]), "none", arch)) - - # No abi / arch, generic Python - for i, version in enumerate(versions): - supported.append(("py%s" % (version,), "none", "any")) - if i == 0: - supported.append(("py%s" % (version[0]), "none", "any")) - - return supported diff --git a/poetry/mixology/failure.py b/poetry/mixology/failure.py index 1a5bbfc8832..e6854335af3 100644 --- a/poetry/mixology/failure.py +++ b/poetry/mixology/failure.py @@ -31,18 +31,27 @@ def __init__(self, root): # type: (Incompatibility) -> None def write(self): buffer = [] - required_python_version = None + required_python_version_notification = False for incompatibility in self._root.external_incompatibilities: if isinstance(incompatibility.cause, PythonCause): - required_python_version = incompatibility.cause.root_python_version - break + if not required_python_version_notification: + buffer.append( + "The current project's Python requirement ({}) " + "is not compatible with some of the required " + "packages Python requirement:".format( + incompatibility.cause.root_python_version + ) + ) + required_python_version_notification = True - if required_python_version is not None: - buffer.append( - "The current project must support the following Python versions: {}".format( - required_python_version + buffer.append( + " - {} requires Python {}".format( + incompatibility.terms[0].dependency.name, + incompatibility.cause.python_version, + ) ) - ) + + if required_python_version_notification: buffer.append("") if isinstance(self._root.cause, ConflictCause): diff --git a/poetry/mixology/incompatibility.py b/poetry/mixology/incompatibility.py index d03d5713fed..e731b743cb4 100644 --- a/poetry/mixology/incompatibility.py +++ b/poetry/mixology/incompatibility.py @@ -1,4 +1,5 @@ from typing import Dict +from typing import Generator from typing import List from .incompatibility_cause import ConflictCause @@ -60,18 +61,18 @@ def __init__( else: by_ref[ref] = term - new_terms = [] - for by_ref in by_name.values(): - positive_terms = [ - term for term in by_ref.values() if term.is_positive() - ] - if positive_terms: - new_terms += positive_terms - continue + new_terms = [] + for by_ref in by_name.values(): + positive_terms = [ + term for term in by_ref.values() if term.is_positive() + ] + if positive_terms: + new_terms += positive_terms + continue - new_terms += list(by_ref.values()) + new_terms += list(by_ref.values()) - terms = new_terms + terms = new_terms self._terms = terms self._cause = cause diff --git a/poetry/mixology/partial_solution.py b/poetry/mixology/partial_solution.py index 8acc3dabb4e..34c3231e2bc 100644 --- a/poetry/mixology/partial_solution.py +++ b/poetry/mixology/partial_solution.py @@ -1,11 +1,9 @@ from collections import OrderedDict - -from typing import Any from typing import Dict from typing import List -from poetry.packages import Dependency -from poetry.packages import Package +from poetry.core.packages import Dependency +from poetry.core.packages import Package from .assignment import Assignment from .incompatibility import Incompatibility diff --git a/poetry/mixology/term.py b/poetry/mixology/term.py index 1204d1a3356..346c9431abb 100644 --- a/poetry/mixology/term.py +++ b/poetry/mixology/term.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from typing import Union -from poetry.packages import Dependency +from poetry.core.packages import Dependency from .set_relation import SetRelation diff --git a/poetry/mixology/version_solver.py b/poetry/mixology/version_solver.py index bb8fe6c234b..55ced7d9903 100644 --- a/poetry/mixology/version_solver.py +++ b/poetry/mixology/version_solver.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- import time +from typing import Any from typing import Dict from typing import List from typing import Union -from poetry.packages import Dependency -from poetry.packages import ProjectPackage -from poetry.packages import Package +from poetry.core.packages import Dependency +from poetry.core.packages import Package +from poetry.core.packages import ProjectPackage +from poetry.core.semver import Version +from poetry.core.semver import VersionRange from poetry.puzzle.provider import Provider -from poetry.semver import Version -from poetry.semver import VersionRange from .failure import SolveFailure from .incompatibility import Incompatibility @@ -338,6 +339,16 @@ def _get_min(dependency): if dependency.name in self._locked: return 1 + # VCS, URL, File or Directory dependencies + # represent a single version + if ( + dependency.is_vcs() + or dependency.is_url() + or dependency.is_file() + or dependency.is_directory() + ): + return 1 + try: return len(self._provider.search_for(dependency)) except ValueError: @@ -439,6 +450,13 @@ def _get_locked(self, dependency): # type: (Dependency) -> Union[Package, None] if dependency.extras: locked.requires_extras = dependency.extras + if not dependency.transitive_marker.without_extras().is_any(): + marker_intersection = dependency.transitive_marker.without_extras().intersect( + locked.dependency.marker.without_extras() + ) + if not marker_intersection.is_empty(): + locked.dependency.transitive_marker = marker_intersection + return locked def _log(self, text): diff --git a/poetry/packages/__init__.py b/poetry/packages/__init__.py index 27f78e48066..555a8317e04 100644 --- a/poetry/packages/__init__.py +++ b/poetry/packages/__init__.py @@ -1,157 +1,3 @@ -import os -import re - -from poetry.semver import Version -from poetry.version.requirements import Requirement - -from .dependency import Dependency from .dependency_package import DependencyPackage -from .directory_dependency import DirectoryDependency -from .file_dependency import FileDependency from .locker import Locker -from .package import Package from .package_collection import PackageCollection -from .project_package import ProjectPackage -from .utils.link import Link -from .utils.utils import convert_markers -from .utils.utils import group_markers -from .utils.utils import is_archive_file -from .utils.utils import is_installable_dir -from .utils.utils import is_url -from .utils.utils import path_to_url -from .utils.utils import strip_extras -from .url_dependency import URLDependency -from .vcs_dependency import VCSDependency - - -def dependency_from_pep_508(name): - # Removing comments - parts = name.split("#", 1) - name = parts[0].strip() - if len(parts) > 1: - rest = parts[1] - if ";" in rest: - name += ";" + rest.split(";", 1)[1] - - req = Requirement(name) - - if req.marker: - markers = convert_markers(req.marker) - else: - markers = {} - - name = req.name - path = os.path.normpath(os.path.abspath(name)) - link = None - - if is_url(name): - link = Link(name) - else: - p, extras = strip_extras(path) - if os.path.isdir(p) and (os.path.sep in name or name.startswith(".")): - - if not is_installable_dir(p): - raise ValueError( - "Directory {!r} is not installable. File 'setup.py' " - "not found.".format(name) - ) - link = Link(path_to_url(p)) - elif is_archive_file(p): - link = Link(path_to_url(p)) - - # it's a local file, dir, or url - if link: - # Handle relative file URLs - if link.scheme == "file" and re.search(r"\.\./", link.url): - link = Link(path_to_url(os.path.normpath(os.path.abspath(link.path)))) - # wheel file - if link.is_wheel: - m = re.match(r"^(?P(?P.+?)-(?P\d.*?))", link.filename) - if not m: - raise ValueError("Invalid wheel name: {}".format(link.filename)) - - name = m.group("name") - version = m.group("ver") - dep = Dependency(name, version) - else: - name = link.egg_fragment - - if link.scheme == "git": - dep = VCSDependency(name, "git", link.url_without_fragment) - else: - dep = Dependency(name, "*") - else: - if req.pretty_constraint: - constraint = req.constraint - else: - constraint = "*" - - dep = Dependency(name, constraint) - - if "extra" in markers: - # If we have extras, the dependency is optional - dep.deactivate() - - for or_ in markers["extra"]: - for _, extra in or_: - dep.in_extras.append(extra) - - if "python_version" in markers: - ors = [] - for or_ in markers["python_version"]: - ands = [] - for op, version in or_: - # Expand python version - if op == "==": - version = "~" + version - op = "" - elif op == "!=": - version += ".*" - elif op in ("<=", ">"): - parsed_version = Version.parse(version) - if parsed_version.precision == 1: - if op == "<=": - op = "<" - version = parsed_version.next_major.text - elif op == ">": - op = ">=" - version = parsed_version.next_major.text - elif parsed_version.precision == 2: - if op == "<=": - op = "<" - version = parsed_version.next_minor.text - elif op == ">": - op = ">=" - version = parsed_version.next_minor.text - elif op in ("in", "not in"): - versions = [] - for v in re.split("[ ,]+", version): - split = v.split(".") - if len(split) in [1, 2]: - split.append("*") - op_ = "" if op == "in" else "!=" - else: - op_ = "==" if op == "in" else "!=" - - versions.append(op_ + ".".join(split)) - - glue = " || " if op == "in" else ", " - if versions: - ands.append(glue.join(versions)) - - continue - - ands.append("{}{}".format(op, version)) - - ors.append(" ".join(ands)) - - dep.python_versions = " || ".join(ors) - - if req.marker: - dep.marker = req.marker - - # Extras - for extra in req.extras: - dep.extras.append(extra) - - return dep diff --git a/poetry/packages/constraints/__init__.py b/poetry/packages/constraints/__init__.py deleted file mode 100644 index 5225730f4e3..00000000000 --- a/poetry/packages/constraints/__init__.py +++ /dev/null @@ -1,56 +0,0 @@ -import re - -from .any_constraint import AnyConstraint -from .constraint import Constraint -from .union_constraint import UnionConstraint - - -BASIC_CONSTRAINT = re.compile(r"^(!?==?)?\s*([^\s]+?)\s*$") - - -def parse_constraint(constraints): - if constraints == "*": - return AnyConstraint() - - or_constraints = re.split(r"\s*\|\|?\s*", constraints.strip()) - or_groups = [] - for constraints in or_constraints: - and_constraints = re.split( - r"(?< ,]) *(? 1: - for constraint in and_constraints: - constraint_objects.append(parse_single_constraint(constraint)) - else: - constraint_objects.append(parse_single_constraint(and_constraints[0])) - - if len(constraint_objects) == 1: - constraint = constraint_objects[0] - else: - constraint = constraint_objects[0] - for next_constraint in constraint_objects[1:]: - constraint = constraint.intersect(next_constraint) - - or_groups.append(constraint) - - if len(or_groups) == 1: - return or_groups[0] - else: - return UnionConstraint(*or_groups) - - -def parse_single_constraint(constraint): # type: (str) -> BaseConstraint - # Basic comparator - m = BASIC_CONSTRAINT.match(constraint) - if m: - op = m.group(1) - if op is None: - op = "==" - - version = m.group(2).strip() - - return Constraint(version, op) - - raise ValueError("Could not parse version constraint: {}".format(constraint)) diff --git a/poetry/packages/constraints/any_constraint.py b/poetry/packages/constraints/any_constraint.py deleted file mode 100644 index c0003725e83..00000000000 --- a/poetry/packages/constraints/any_constraint.py +++ /dev/null @@ -1,37 +0,0 @@ -from .base_constraint import BaseConstraint -from .empty_constraint import EmptyConstraint - - -class AnyConstraint(BaseConstraint): - def allows(self, other): - return True - - def allows_all(self, other): - return True - - def allows_any(self, other): - return True - - def difference(self, other): - if other.is_any(): - return EmptyConstraint() - - return other - - def intersect(self, other): - return other - - def union(self, other): - return AnyConstraint() - - def is_any(self): - return True - - def is_empty(self): - return False - - def __str__(self): - return "*" - - def __eq__(self, other): - return other.is_any() diff --git a/poetry/packages/constraints/base_constraint.py b/poetry/packages/constraints/base_constraint.py deleted file mode 100644 index c8076fe7b41..00000000000 --- a/poetry/packages/constraints/base_constraint.py +++ /dev/null @@ -1,27 +0,0 @@ -class BaseConstraint(object): - def allows_all(self, other): - raise NotImplementedError() - - def allows_any(self, other): - raise NotImplementedError() - - def difference(self, other): - raise NotImplementedError() - - def intersect(self, other): - raise NotImplementedError() - - def union(self, other): - raise NotImplementedError() - - def is_any(self): - return False - - def is_empty(self): - return False - - def __repr__(self): - return "<{} {}>".format(self.__class__.__name__, str(self)) - - def __eq__(self, other): - raise NotImplementedError() diff --git a/poetry/packages/constraints/constraint.py b/poetry/packages/constraints/constraint.py deleted file mode 100644 index f05bf54d5a1..00000000000 --- a/poetry/packages/constraints/constraint.py +++ /dev/null @@ -1,121 +0,0 @@ -import operator - -from .base_constraint import BaseConstraint -from .empty_constraint import EmptyConstraint - - -class Constraint(BaseConstraint): - - OP_EQ = operator.eq - OP_NE = operator.ne - - _trans_op_str = {"=": OP_EQ, "==": OP_EQ, "!=": OP_NE} - - _trans_op_int = {OP_EQ: "==", OP_NE: "!="} - - def __init__(self, version, operator="=="): - if operator == "=": - operator = "==" - - self._version = version - self._operator = operator - self._op = self._trans_op_str[operator] - - @property - def version(self): - return self._version - - @property - def operator(self): - return self._operator - - def allows(self, other): - is_equal_op = self._operator == "==" - is_non_equal_op = self._operator == "!=" - is_other_equal_op = other.operator == "==" - is_other_non_equal_op = other.operator == "!=" - - if is_equal_op and is_other_equal_op: - return self._version == other.version - - if ( - is_equal_op - and is_other_non_equal_op - or is_non_equal_op - and is_other_equal_op - or is_non_equal_op - and is_other_non_equal_op - ): - return self._version != other.version - - return False - - def allows_all(self, other): - if not isinstance(other, Constraint): - return other.is_empty() - - return other == self - - def allows_any(self, other): - if isinstance(other, Constraint): - is_non_equal_op = self._operator == "!=" - is_other_non_equal_op = other.operator == "!=" - - if is_non_equal_op and is_other_non_equal_op: - return self._version != other.version - - return other.allows(self) - - def difference(self, other): - if other.allows(self): - return EmptyConstraint() - - return self - - def intersect(self, other): - from .multi_constraint import MultiConstraint - - if isinstance(other, Constraint): - if other == self: - return self - - if self.operator == "!=" and other.operator == "==" and self.allows(other): - return other - - if other.operator == "!=" and self.operator == "==" and other.allows(self): - return self - - if other.operator == "!=" and self.operator == "!=": - return MultiConstraint(self, other) - - return EmptyConstraint() - - return other.intersect(self) - - def union(self, other): - if isinstance(other, Constraint): - from .union_constraint import UnionConstraint - - return UnionConstraint(self, other) - - return other.union(self) - - def is_any(self): - return False - - def is_empty(self): - return False - - def __eq__(self, other): - if not isinstance(other, Constraint): - return NotImplemented - - return (self.version, self.operator) == (other.version, other.operator) - - def __hash__(self): - return hash((self._operator, self._version)) - - def __str__(self): - return "{}{}".format( - self._operator if self._operator != "==" else "", self._version - ) diff --git a/poetry/packages/constraints/empty_constraint.py b/poetry/packages/constraints/empty_constraint.py deleted file mode 100644 index 0a1c45ecc27..00000000000 --- a/poetry/packages/constraints/empty_constraint.py +++ /dev/null @@ -1,30 +0,0 @@ -from .base_constraint import BaseConstraint - - -class EmptyConstraint(BaseConstraint): - - pretty_string = None - - def matches(self, _): - return True - - def is_empty(self): - return True - - def allows_all(self, other): - return True - - def allows_any(self, other): - return True - - def intersect(self, other): - return other - - def difference(self, other): - return - - def __eq__(self, other): - return other.is_empty() - - def __str__(self): - return "" diff --git a/poetry/packages/constraints/multi_constraint.py b/poetry/packages/constraints/multi_constraint.py deleted file mode 100644 index 74f1f14bbfb..00000000000 --- a/poetry/packages/constraints/multi_constraint.py +++ /dev/null @@ -1,88 +0,0 @@ -from .base_constraint import BaseConstraint -from .constraint import Constraint - - -class MultiConstraint(BaseConstraint): - def __init__(self, *constraints): - if any(c.operator == "==" for c in constraints): - raise ValueError( - "A multi-constraint can only be comprised of negative constraints" - ) - - self._constraints = constraints - - @property - def constraints(self): - return self._constraints - - def allows(self, other): - for constraint in self._constraints: - if not constraint.allows(other): - return False - - return True - - def allows_all(self, other): - if other.is_any(): - return False - - if other.is_empty(): - return True - - if isinstance(other, Constraint): - return self.allows(other) - - our_constraints = iter(self._constraints) - their_constraints = iter(other.constraints) - our_constraint = next(our_constraints, None) - their_constraint = next(their_constraints, None) - - while our_constraint and their_constraint: - if our_constraint.allows_all(their_constraint): - their_constraint = next(their_constraints, None) - else: - our_constraint = next(our_constraints, None) - - return their_constraint is None - - def allows_any(self, other): - if other.is_any(): - return True - - if other.is_empty(): - return True - - if isinstance(other, Constraint): - return self.allows(other) - - if isinstance(other, MultiConstraint): - for c1 in self.constraints: - for c2 in other.constraints: - if c1.allows(c2): - return True - - return False - - def intersect(self, other): - if isinstance(other, Constraint): - constraints = [c for c in self._constraints if c == other] - - if len(constraints) == 1: - return constraints[0] - - return MultiConstraint(*constraints) - - def __eq__(self, other): - if not isinstance(other, MultiConstraint): - return False - - return sorted( - self._constraints, key=lambda c: (c.operator, c.version) - ) == sorted(other.constraints, key=lambda c: (c.operator, c.version)) - - def __str__(self): - constraints = [] - for constraint in self._constraints: - constraints.append(str(constraint)) - - return "{}".format(", ").join(constraints) diff --git a/poetry/packages/constraints/union_constraint.py b/poetry/packages/constraints/union_constraint.py deleted file mode 100644 index 4a90501d4fb..00000000000 --- a/poetry/packages/constraints/union_constraint.py +++ /dev/null @@ -1,113 +0,0 @@ -from .base_constraint import BaseConstraint -from .constraint import Constraint -from .empty_constraint import EmptyConstraint -from .multi_constraint import MultiConstraint - - -class UnionConstraint(BaseConstraint): - def __init__(self, *constraints): - self._constraints = constraints - - @property - def constraints(self): - return self._constraints - - def allows(self, other): - for constraint in self._constraints: - if constraint.allows(other): - return True - - return False - - def allows_any(self, other): - if other.is_empty(): - return False - - if other.is_any(): - return True - - if isinstance(other, Constraint): - constraints = [other] - else: - constraints = other.constraints - - for our_constraint in self._constraints: - for their_constraint in constraints: - if our_constraint.allows_any(their_constraint): - return True - - return False - - def allows_all(self, other): - if other.is_any(): - return False - - if other.is_empty(): - return True - - if isinstance(other, Constraint): - constraints = [other] - else: - constraints = other.constraints - - our_constraints = iter(self._constraints) - their_constraints = iter(constraints) - our_constraint = next(our_constraints, None) - their_constraint = next(their_constraints, None) - - while our_constraint and their_constraint: - if our_constraint.allows_all(their_constraint): - their_constraint = next(their_constraints, None) - else: - our_constraint = next(our_constraints, None) - - return their_constraint is None - - def intersect(self, other): - if other.is_any(): - return self - - if other.is_empty(): - return other - - if isinstance(other, Constraint): - if self.allows(other): - return other - - return EmptyConstraint() - - new_constraints = [] - for our_constraint in self._constraints: - for their_constraint in other.constraints: - intersection = our_constraint.intersect(their_constraint) - - if not intersection.is_empty() and intersection not in new_constraints: - new_constraints.append(intersection) - - if not new_constraints: - return EmptyConstraint() - - return UnionConstraint(*new_constraints) - - def union(self, other): - if isinstance(other, Constraint): - constraints = self._constraints - if other not in self._constraints: - constraints += (other,) - - return UnionConstraint(*constraints) - - def __eq__(self, other): - if not isinstance(other, UnionConstraint): - return False - - return sorted( - self._constraints, key=lambda c: (c.operator, c.version) - ) == sorted(other.constraints, key=lambda c: (c.operator, c.version)) - - def __str__(self): - constraints = [] - for constraint in self._constraints: - constraints.append(str(constraint)) - - return "{}".format(" || ").join(constraints) diff --git a/poetry/packages/constraints/wildcard_constraint.py b/poetry/packages/constraints/wildcard_constraint.py deleted file mode 100644 index ede8ffb647a..00000000000 --- a/poetry/packages/constraints/wildcard_constraint.py +++ /dev/null @@ -1,71 +0,0 @@ -import re - -from .constraint import Constraint - - -class WilcardConstraint(Constraint): - def __init__(self, constraint): # type: (str) -> None - m = re.match( - r"^(!= ?|==)?v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$", constraint - ) - if not m: - raise ValueError("Invalid value for wildcard constraint") - - if not m.group(1): - operator = "==" - else: - operator = m.group(1).strip() - - super(WilcardConstraint, self).__init__( - operator, ".".join([g if g else "*" for g in m.groups()[1:]]) - ) - - if m.group(4): - position = 2 - elif m.group(3): - position = 1 - else: - position = 0 - - from ..version_parser import VersionParser - - parser = VersionParser() - groups = m.groups()[1:] - low_version = parser._manipulate_version_string(groups, position) - high_version = parser._manipulate_version_string(groups, position, 1) - - if operator == "!=": - if low_version == "0.0.0.0": - self._constraint = Constraint(">=", high_version) - else: - self._constraint = parser.parse_constraints( - "<{} || >={}".format(low_version, high_version) - ) - else: - if low_version == "0.0.0.0": - self._constraint = Constraint("<", high_version) - else: - self._constraint = parser.parse_constraints( - ">={},<{}".format(low_version, high_version) - ) - - @property - def supported_operators(self): - return ["!=", "=="] - - @property - def constraint(self): - return self._constraint - - def matches(self, provider): # type: (Constraint) -> bool - if isinstance(provider, self.__class__): - return self._constraint.matches(provider.constraint) - - return provider.matches(self._constraint) - - def __str__(self): - op = "" - if self.string_operator == "!=": - op = "!= " - - return "{}{}".format(op, self._version) diff --git a/poetry/packages/dependency.py b/poetry/packages/dependency.py deleted file mode 100644 index b98b6fb35b8..00000000000 --- a/poetry/packages/dependency.py +++ /dev/null @@ -1,348 +0,0 @@ -from typing import Optional - -import poetry.packages - -from poetry.semver import parse_constraint -from poetry.semver import Version -from poetry.semver import VersionConstraint -from poetry.semver import VersionRange -from poetry.semver import VersionUnion -from poetry.utils.helpers import canonicalize_name -from poetry.version.markers import AnyMarker -from poetry.version.markers import parse_marker - -from .constraints import parse_constraint as parse_generic_constraint -from .constraints.constraint import Constraint -from .constraints.multi_constraint import MultiConstraint -from .constraints.union_constraint import UnionConstraint -from .utils.utils import convert_markers - - -class Dependency(object): - def __init__( - self, - name, # type: str - constraint, # type: str - optional=False, # type: bool - category="main", # type: str - allows_prereleases=False, # type: bool - source_name=None, # type: Optional[str] - ): - self._name = canonicalize_name(name) - self._pretty_name = name - - try: - if not isinstance(constraint, VersionConstraint): - self._constraint = parse_constraint(constraint) - else: - self._constraint = constraint - except ValueError: - self._constraint = parse_constraint("*") - - self._pretty_constraint = str(constraint) - self._optional = optional - self._category = category - - if isinstance(self._constraint, VersionRange) and self._constraint.min: - allows_prereleases = ( - allows_prereleases or self._constraint.min.is_prerelease() - ) - - self._allows_prereleases = allows_prereleases - self._source_name = source_name - - self._python_versions = "*" - self._python_constraint = parse_constraint("*") - self._transitive_python_versions = None - self._transitive_python_constraint = None - - self._extras = [] - self._in_extras = [] - - self._activated = not self._optional - - self.is_root = False - self.marker = AnyMarker() - - @property - def name(self): - return self._name - - @property - def constraint(self): - return self._constraint - - @property - def pretty_constraint(self): - return self._pretty_constraint - - @property - def pretty_name(self): - return self._pretty_name - - @property - def category(self): - return self._category - - @property - def source_name(self): - return self._source_name - - @property - def python_versions(self): - return self._python_versions - - @python_versions.setter - def python_versions(self, value): - self._python_versions = value - self._python_constraint = parse_constraint(value) - if not self._python_constraint.is_any(): - self.marker = self.marker.intersect( - parse_marker( - self._create_nested_marker( - "python_version", self._python_constraint - ) - ) - ) - - @property - def transitive_python_versions(self): - if self._transitive_python_versions is None: - return self._python_versions - - return self._transitive_python_versions - - @transitive_python_versions.setter - def transitive_python_versions(self, value): - self._transitive_python_versions = value - self._transitive_python_constraint = parse_constraint(value) - - @property - def python_constraint(self): - return self._python_constraint - - @property - def transitive_python_constraint(self): - if self._transitive_python_constraint is None: - return self._python_constraint - - return self._transitive_python_constraint - - @property - def extras(self): # type: () -> list - return self._extras - - @property - def in_extras(self): # type: () -> list - return self._in_extras - - @property - def base_pep_508_name(self): # type: () -> str - requirement = self.pretty_name - - if self.extras: - requirement += "[{}]".format(",".join(self.extras)) - - if isinstance(self.constraint, VersionUnion): - requirement += " ({})".format( - ",".join([str(c).replace(" ", "") for c in self.constraint.ranges]) - ) - elif isinstance(self.constraint, Version): - requirement += " (=={})".format(self.constraint.text) - elif not self.constraint.is_any(): - requirement += " ({})".format(str(self.constraint).replace(" ", "")) - - return requirement - - def allows_prereleases(self): - return self._allows_prereleases - - def is_optional(self): - return self._optional - - def is_activated(self): - return self._activated - - def is_vcs(self): - return False - - def is_file(self): - return False - - def is_directory(self): - return False - - def is_url(self): - return False - - def accepts(self, package): # type: (poetry.packages.Package) -> bool - """ - Determines if the given package matches this dependency. - """ - return ( - self._name == package.name - and self._constraint.allows(package.version) - and (not package.is_prerelease() or self.allows_prereleases()) - ) - - def to_pep_508(self, with_extras=True): # type: (bool) -> str - requirement = self.base_pep_508_name - - markers = [] - has_extras = False - if not self.marker.is_any(): - marker = self.marker - if not with_extras: - marker = marker.without_extras() - - if not marker.is_empty(): - markers.append(str(marker)) - - has_extras = "extra" in convert_markers(marker) - else: - # Python marker - if self.python_versions != "*": - python_constraint = self.python_constraint - - markers.append( - self._create_nested_marker("python_version", python_constraint) - ) - - in_extras = " || ".join(self._in_extras) - if in_extras and with_extras and not has_extras: - markers.append( - self._create_nested_marker("extra", parse_generic_constraint(in_extras)) - ) - - if markers: - if self.is_vcs(): - requirement += " " - - if len(markers) > 1: - markers = ["({})".format(m) for m in markers] - requirement += "; {}".format(" and ".join(markers)) - else: - requirement += "; {}".format(markers[0]) - - return requirement - - def _create_nested_marker(self, name, constraint): - if isinstance(constraint, (MultiConstraint, UnionConstraint)): - parts = [] - for c in constraint.constraints: - multi = False - if isinstance(c, (MultiConstraint, UnionConstraint)): - multi = True - - parts.append((multi, self._create_nested_marker(name, c))) - - glue = " and " - if isinstance(constraint, UnionConstraint): - parts = [ - "({})".format(part[1]) if part[0] else part[1] for part in parts - ] - glue = " or " - else: - parts = [part[1] for part in parts] - - marker = glue.join(parts) - elif isinstance(constraint, Constraint): - marker = '{} {} "{}"'.format(name, constraint.operator, constraint.version) - elif isinstance(constraint, VersionUnion): - parts = [] - for c in constraint.ranges: - parts.append(self._create_nested_marker(name, c)) - - glue = " or " - parts = ["({})".format(part) for part in parts] - - marker = glue.join(parts) - elif isinstance(constraint, Version): - marker = '{} == "{}"'.format(name, constraint.text) - else: - if constraint.min is not None: - op = ">=" - if not constraint.include_min: - op = ">" - - version = constraint.min.text - if constraint.max is not None: - text = '{} {} "{}"'.format(name, op, version) - - op = "<=" - if not constraint.include_max: - op = "<" - - version = constraint.max - - text += ' and {} {} "{}"'.format(name, op, version) - - return text - elif constraint.max is not None: - op = "<=" - if not constraint.include_max: - op = "<" - - version = constraint.max - else: - return "" - - marker = '{} {} "{}"'.format(name, op, version) - - return marker - - def activate(self): - """ - Set the dependency as mandatory. - """ - self._activated = True - - def deactivate(self): - """ - Set the dependency as optional. - """ - if not self._optional: - self._optional = True - - self._activated = False - - def with_constraint(self, constraint): - new = Dependency( - self.pretty_name, - constraint, - optional=self.is_optional(), - category=self.category, - allows_prereleases=self.allows_prereleases(), - ) - - new.is_root = self.is_root - new.python_versions = self.python_versions - - for extra in self.extras: - new.extras.append(extra) - - for in_extra in self.in_extras: - new.in_extras.append(in_extra) - - return new - - def __eq__(self, other): - if not isinstance(other, Dependency): - return NotImplemented - - return self._name == other.name and self._constraint == other.constraint - - def __ne__(self, other): - return not self == other - - def __hash__(self): - return hash((self._name, self._pretty_constraint)) - - def __str__(self): - if self.is_root: - return self._pretty_name - - return "{} ({})".format(self._pretty_name, self._pretty_constraint) - - def __repr__(self): - return "<{} {}>".format(self.__class__.__name__, str(self)) diff --git a/poetry/packages/directory_dependency.py b/poetry/packages/directory_dependency.py deleted file mode 100644 index 4fed9deeb45..00000000000 --- a/poetry/packages/directory_dependency.py +++ /dev/null @@ -1,80 +0,0 @@ -from pkginfo.distribution import HEADER_ATTRS -from pkginfo.distribution import HEADER_ATTRS_2_0 - -from poetry.utils._compat import Path -from poetry.utils.toml_file import TomlFile - -from .dependency import Dependency - -# Patching pkginfo to support Metadata version 2.1 (PEP 566) -HEADER_ATTRS.update( - {"2.1": HEADER_ATTRS_2_0 + (("Provides-Extra", "provides_extra", True),)} -) - - -class DirectoryDependency(Dependency): - def __init__( - self, - name, - path, # type: Path - category="main", # type: str - optional=False, # type: bool - base=None, # type: Path - develop=True, # type: bool - ): - self._path = path - self._base = base - self._full_path = path - self._develop = develop - self._supports_poetry = False - - if self._base and not self._path.is_absolute(): - self._full_path = self._base / self._path - - if not self._full_path.exists(): - raise ValueError("Directory {} does not exist".format(self._path)) - - if self._full_path.is_file(): - raise ValueError("{} is a file, expected a directory".format(self._path)) - - # Checking content to determine actions - setup = self._full_path / "setup.py" - pyproject = TomlFile(self._full_path / "pyproject.toml") - if pyproject.exists(): - pyproject_content = pyproject.read() - self._supports_poetry = ( - "tool" in pyproject_content and "poetry" in pyproject_content["tool"] - ) - - if not setup.exists() and not self._supports_poetry: - raise ValueError( - "Directory {} does not seem to be a Python package".format( - self._full_path - ) - ) - - super(DirectoryDependency, self).__init__( - name, "*", category=category, optional=optional, allows_prereleases=True - ) - - @property - def path(self): - return self._path - - @property - def full_path(self): - return self._full_path.resolve() - - @property - def base(self): - return self._base - - @property - def develop(self): - return self._develop - - def supports_poetry(self): - return self._supports_poetry - - def is_directory(self): - return True diff --git a/poetry/packages/file_dependency.py b/poetry/packages/file_dependency.py deleted file mode 100644 index 5d98a584507..00000000000 --- a/poetry/packages/file_dependency.py +++ /dev/null @@ -1,60 +0,0 @@ -import hashlib -import io - -from pkginfo.distribution import HEADER_ATTRS -from pkginfo.distribution import HEADER_ATTRS_2_0 - -from poetry.utils._compat import Path - -from .dependency import Dependency - -# Patching pkginfo to support Metadata version 2.1 (PEP 566) -HEADER_ATTRS.update( - {"2.1": HEADER_ATTRS_2_0 + (("Provides-Extra", "provides_extra", True),)} -) - - -class FileDependency(Dependency): - def __init__( - self, - name, - path, # type: Path - category="main", # type: str - optional=False, # type: bool - base=None, # type: Path - ): - self._path = path - self._base = base - self._full_path = path - - if self._base and not self._path.is_absolute(): - self._full_path = self._base / self._path - - if not self._full_path.exists(): - raise ValueError("File {} does not exist".format(self._path)) - - if self._full_path.is_dir(): - raise ValueError("{} is a directory, expected a file".format(self._path)) - - super(FileDependency, self).__init__( - name, "*", category=category, optional=optional, allows_prereleases=True - ) - - @property - def path(self): - return self._path - - @property - def full_path(self): - return self._full_path.resolve() - - def is_file(self): - return True - - def hash(self): - h = hashlib.sha256() - with self._full_path.open("rb") as fp: - for content in iter(lambda: fp.read(io.DEFAULT_BUFFER_SIZE), b""): - h.update(content) - - return h.hexdigest() diff --git a/poetry/packages/locker.py b/poetry/packages/locker.py index d15cf8d8a42..7fcca247587 100644 --- a/poetry/packages/locker.py +++ b/poetry/packages/locker.py @@ -1,16 +1,22 @@ import json import re -import poetry.packages -import poetry.repositories - from hashlib import sha256 -from tomlkit import document from typing import List +from tomlkit import document +from tomlkit import inline_table +from tomlkit import item +from tomlkit import table +from tomlkit.exceptions import TOMLKitError + +import poetry.repositories + +from poetry.core.packages.package import Dependency +from poetry.core.packages.package import Package +from poetry.core.version.markers import parse_marker from poetry.utils._compat import Path from poetry.utils.toml_file import TomlFile -from poetry.version.markers import parse_marker class Locker(object): @@ -78,13 +84,19 @@ def locked_repository( return packages for info in locked_packages: - package = poetry.packages.Package( - info["name"], info["version"], info["version"] - ) + package = Package(info["name"], info["version"], info["version"]) package.description = info.get("description", "") package.category = info["category"] package.optional = info["optional"] - package.hashes = lock_data["metadata"]["hashes"][info["name"]] + if "hashes" in lock_data["metadata"]: + # Old lock so we create dummy files from the hashes + package.files = [ + {"name": h, "hash": h} + for h in lock_data["metadata"]["hashes"][info["name"]] + ] + else: + package.files = lock_data["metadata"]["files"][info["name"]] + package.python_versions = info["python-versions"] extras = info.get("extras", {}) if extras: @@ -96,16 +108,14 @@ def locked_repository( dep_name = m.group(1) constraint = m.group(2) or "*" - package.extras[name].append( - poetry.packages.Dependency(dep_name, constraint) - ) + package.extras[name].append(Dependency(dep_name, constraint)) if "marker" in info: package.marker = parse_marker(info["marker"]) else: # Compatibility for old locks if "requirements" in info: - dep = poetry.packages.Dependency("foo", "0.0.0") + dep = Dependency("foo", "0.0.0") for name, value in info["requirements"].items(): if name == "python": dep.python_versions = value @@ -125,8 +135,11 @@ def locked_repository( package.add_dependency(dep_name, constraint) + if "develop" in info: + package.develop = info["develop"] + if "source" in info: - package.source_type = info["source"]["type"] + package.source_type = info["source"].get("type", "") package.source_url = info["source"]["url"] package.source_reference = info["source"]["reference"] @@ -135,15 +148,24 @@ def locked_repository( return packages def set_lock_data(self, root, packages): # type: (...) -> bool - hashes = {} + files = table() packages = self._lock_packages(packages) # Retrieving hashes for package in packages: - if package["name"] not in hashes: - hashes[package["name"]] = [] + if package["name"] not in files: + files[package["name"]] = [] + + for f in package["files"]: + file_metadata = inline_table() + for k, v in sorted(f.items()): + file_metadata[k] = v + + files[package["name"]].append(file_metadata) - hashes[package["name"]] += package["hashes"] - del package["hashes"] + if files[package["name"]]: + files[package["name"]] = item(files[package["name"]]).multiline(True) + + del package["files"] lock = document() lock["package"] = packages @@ -157,7 +179,7 @@ def set_lock_data(self, root, packages): # type: (...) -> bool lock["metadata"] = { "python-versions": root.python_versions, "content-hash": self._content_hash, - "hashes": hashes, + "files": files, } if not self.is_locked() or lock != self.lock_data: @@ -196,7 +218,10 @@ def _get_lock_data(self): # type: () -> dict if not self._lock.exists(): raise RuntimeError("No lockfile found. Unable to read locked packages") - return self._lock.read() + try: + return self._lock.read() + except TOMLKitError as e: + raise RuntimeError("Unable to read the lock file ({}).".format(e)) def _lock_packages( self, packages @@ -210,7 +235,7 @@ def _lock_packages( return locked - def _dump_package(self, package): # type: (poetry.packages.Package) -> dict + def _dump_package(self, package): # type: (Package) -> dict dependencies = {} for dependency in sorted(package.requires, key=lambda d: d.name): if dependency.is_optional() and not dependency.is_activated(): @@ -219,21 +244,27 @@ def _dump_package(self, package): # type: (poetry.packages.Package) -> dict if dependency.pretty_name not in dependencies: dependencies[dependency.pretty_name] = [] - constraint = {"version": str(dependency.pretty_constraint)} + constraint = inline_table() + constraint["version"] = str(dependency.pretty_constraint) if dependency.extras: - constraint["extras"] = dependency.extras + constraint["extras"] = sorted(dependency.extras) if dependency.is_optional(): constraint["optional"] = True - if not dependency.python_constraint.is_any(): - constraint["python"] = str(dependency.python_constraint) + if not dependency.marker.is_any(): + constraint["markers"] = str(dependency.marker) - if len(constraint) == 1: - dependencies[dependency.pretty_name].append(constraint["version"]) - else: - dependencies[dependency.pretty_name].append(constraint) + dependencies[dependency.pretty_name].append(constraint) + + # All the constraints should have the same type, + # but we want to simplify them if it's possible + for dependency, constraints in tuple(dependencies.items()): + if all(len(constraint) == 1 for constraint in constraints): + dependencies[dependency] = [ + constraint["version"] for constraint in constraints + ] data = { "name": package.pretty_name, @@ -242,10 +273,8 @@ def _dump_package(self, package): # type: (poetry.packages.Package) -> dict "category": package.category, "optional": package.optional, "python-versions": package.python_versions, - "hashes": sorted(package.hashes), + "files": sorted(package.files, key=lambda x: x["file"]), } - if not package.marker.is_any(): - data["marker"] = str(package.marker) if package.extras: extras = {} @@ -264,11 +293,14 @@ def _dump_package(self, package): # type: (poetry.packages.Package) -> dict data["dependencies"] = dependencies - if package.source_type: + if package.source_url: data["source"] = { - "type": package.source_type, "url": package.source_url, "reference": package.source_reference, } + if package.source_type: + data["source"]["type"] = package.source_type + if package.source_type == "directory": + data["develop"] = package.develop return data diff --git a/poetry/packages/package.py b/poetry/packages/package.py deleted file mode 100644 index 648a476cfd4..00000000000 --- a/poetry/packages/package.py +++ /dev/null @@ -1,422 +0,0 @@ -# -*- coding: utf-8 -*- -import copy -import re - -from contextlib import contextmanager -from typing import Union - -from poetry.semver import Version -from poetry.semver import parse_constraint -from poetry.spdx import license_by_id -from poetry.spdx import License -from poetry.utils._compat import Path -from poetry.utils.helpers import canonicalize_name -from poetry.version.markers import AnyMarker -from poetry.version.markers import parse_marker - -from .constraints import parse_constraint as parse_generic_constraint -from .dependency import Dependency -from .directory_dependency import DirectoryDependency -from .file_dependency import FileDependency -from .url_dependency import URLDependency -from .vcs_dependency import VCSDependency -from .utils.utils import create_nested_marker - -AUTHOR_REGEX = re.compile(r"(?u)^(?P[- .,\w\d'’\"()]+)(?: <(?P.+?)>)?$") - - -class Package(object): - - AVAILABLE_PYTHONS = {"2", "2.7", "3", "3.4", "3.5", "3.6", "3.7"} - - def __init__(self, name, version, pretty_version=None): - """ - Creates a new in memory package. - """ - self._pretty_name = name - self._name = canonicalize_name(name) - - if not isinstance(version, Version): - self._version = Version.parse(version) - self._pretty_version = pretty_version or version - else: - self._version = version - self._pretty_version = pretty_version or self._version.text - - self.description = "" - - self._authors = [] - self._maintainers = [] - - self.homepage = None - self.repository_url = None - self.documentation_url = None - self.keywords = [] - self._license = None - self.readme = None - - self.source_name = "" - self.source_type = "" - self.source_reference = "" - self.source_url = "" - - self.requires = [] - self.dev_requires = [] - self.extras = {} - self.requires_extras = [] - - self.category = "main" - self.hashes = [] - self.optional = False - - self.classifiers = [] - - self._python_versions = "*" - self._python_constraint = parse_constraint("*") - self._python_marker = AnyMarker() - - self.platform = None - self.marker = AnyMarker() - - self.root_dir = None - - self.develop = True - - @property - def name(self): - return self._name - - @property - def pretty_name(self): - return self._pretty_name - - @property - def version(self): - return self._version - - @property - def pretty_version(self): - return self._pretty_version - - @property - def unique_name(self): - if self.is_root(): - return self._name - - return self.name + "-" + self._version.text - - @property - def pretty_string(self): - return self.pretty_name + " " + self.pretty_version - - @property - def full_pretty_version(self): - if self.source_type in ["file", "directory", "url"]: - return "{} {}".format(self._pretty_version, self.source_url) - - if self.source_type not in ["hg", "git"]: - return self._pretty_version - - # if source reference is a sha1 hash -- truncate - if len(self.source_reference) == 40: - return "{} {}".format(self._pretty_version, self.source_reference[0:7]) - - return "{} {}".format(self._pretty_version, self.source_reference) - - @property - def authors(self): # type: () -> list - return self._authors - - @property - def author_name(self): # type: () -> str - return self._get_author()["name"] - - @property - def author_email(self): # type: () -> str - return self._get_author()["email"] - - @property - def maintainers(self): # type: () -> list - return self._maintainers - - @property - def maintainer_name(self): # type: () -> str - return self._get_maintainer()["name"] - - @property - def maintainer_email(self): # type: () -> str - return self._get_maintainer()["email"] - - @property - def all_requires(self): - return self.requires + self.dev_requires - - def _get_author(self): # type: () -> dict - if not self._authors: - return {"name": None, "email": None} - - m = AUTHOR_REGEX.match(self._authors[0]) - - name = m.group("name") - email = m.group("email") - - return {"name": name, "email": email} - - def _get_maintainer(self): # type: () -> dict - if not self._maintainers: - return {"name": None, "email": None} - - m = AUTHOR_REGEX.match(self._maintainers[0]) - - name = m.group("name") - email = m.group("email") - - return {"name": name, "email": email} - - @property - def python_versions(self): - return self._python_versions - - @python_versions.setter - def python_versions(self, value): - self._python_versions = value - self._python_constraint = parse_constraint(value) - self._python_marker = parse_marker( - create_nested_marker("python_version", self._python_constraint) - ) - - @property - def python_constraint(self): - return self._python_constraint - - @property - def python_marker(self): - return self._python_marker - - @property - def license(self): - return self._license - - @license.setter - def license(self, value): - if value is None: - self._license = value - elif isinstance(value, License): - self._license = value - else: - self._license = license_by_id(value) - - @property - def all_classifiers(self): - classifiers = copy.copy(self.classifiers) - - # Automatically set python classifiers - if self.python_versions == "*": - python_constraint = parse_constraint("~2.7 || ^3.4") - else: - python_constraint = self.python_constraint - - for version in sorted(self.AVAILABLE_PYTHONS): - if len(version) == 1: - constraint = parse_constraint(version + ".*") - else: - constraint = Version.parse(version) - - if python_constraint.allows_any(constraint): - classifiers.append( - "Programming Language :: Python :: {}".format(version) - ) - - # Automatically set license classifiers - if self.license: - classifiers.append(self.license.classifier) - - classifiers = set(classifiers) - - return sorted(classifiers) - - @property - def urls(self): - urls = {} - - if self.homepage: - urls["Homepage"] = self.homepage - - if self.repository_url: - urls["Repository"] = self.repository_url - - if self.documentation_url: - urls["Documentation"] = self.documentation_url - - return urls - - def is_prerelease(self): - return self._version.is_prerelease() - - def is_root(self): - return False - - def add_dependency( - self, - name, # type: str - constraint=None, # type: Union[str, dict, None] - category="main", # type: str - ): # type: (...) -> Dependency - if constraint is None: - constraint = "*" - - if isinstance(constraint, dict): - optional = constraint.get("optional", False) - python_versions = constraint.get("python") - platform = constraint.get("platform") - markers = constraint.get("markers") - allows_prereleases = constraint.get("allows-prereleases", False) - - if "git" in constraint: - # VCS dependency - dependency = VCSDependency( - name, - "git", - constraint["git"], - branch=constraint.get("branch", None), - tag=constraint.get("tag", None), - rev=constraint.get("rev", None), - optional=optional, - ) - elif "file" in constraint: - file_path = Path(constraint["file"]) - - dependency = FileDependency( - name, file_path, category=category, base=self.root_dir - ) - elif "path" in constraint: - path = Path(constraint["path"]) - - if self.root_dir: - is_file = (self.root_dir / path).is_file() - else: - is_file = path.is_file() - - if is_file: - dependency = FileDependency( - name, - path, - category=category, - optional=optional, - base=self.root_dir, - ) - else: - dependency = DirectoryDependency( - name, - path, - category=category, - optional=optional, - base=self.root_dir, - develop=constraint.get("develop", True), - ) - elif "url" in constraint: - dependency = URLDependency(name, constraint["url"], category=category) - else: - version = constraint["version"] - - dependency = Dependency( - name, - version, - optional=optional, - category=category, - allows_prereleases=allows_prereleases, - source_name=constraint.get("source"), - ) - - if not markers: - marker = AnyMarker() - if python_versions: - dependency.python_versions = python_versions - marker = marker.intersect( - parse_marker( - create_nested_marker( - "python_version", dependency.python_constraint - ) - ) - ) - - if platform: - marker = marker.intersect( - parse_marker( - create_nested_marker( - "sys_platform", parse_generic_constraint(platform) - ) - ) - ) - else: - marker = parse_marker(markers) - - if not marker.is_any(): - dependency.marker = marker - - if "extras" in constraint: - for extra in constraint["extras"]: - dependency.extras.append(extra) - else: - dependency = Dependency(name, constraint, category=category) - - if category == "dev": - self.dev_requires.append(dependency) - else: - self.requires.append(dependency) - - return dependency - - def to_dependency(self): - from . import dependency_from_pep_508 - - name = "{} (=={})".format(self._name, self._version) - - if not self.marker.is_any(): - name += " ; {}".format(str(self.marker)) - - return dependency_from_pep_508(name) - - @contextmanager - def with_python_versions(self, python_versions): - original_python_versions = self.python_versions - - self.python_versions = python_versions - - yield - - self.python_versions = original_python_versions - - def clone(self): # type: () -> Package - clone = self.__class__(self.pretty_name, self.version) - clone.category = self.category - clone.optional = self.optional - clone.python_versions = self.python_versions - clone.marker = self.marker - clone.extras = self.extras - clone.source_type = self.source_type - clone.source_url = self.source_url - clone.source_reference = self.source_reference - - for dep in self.requires: - clone.requires.append(dep) - - for dep in self.dev_requires: - clone.dev_requires.append(dep) - - return clone - - def __hash__(self): - return hash((self._name, self._version)) - - def __eq__(self, other): - if not isinstance(other, Package): - return NotImplemented - - return self._name == other.name and self._version == other.version - - def __str__(self): - return self.unique_name - - def __repr__(self): - return "".format(self.unique_name) diff --git a/poetry/packages/project_package.py b/poetry/packages/project_package.py deleted file mode 100644 index 584da3a8ed4..00000000000 --- a/poetry/packages/project_package.py +++ /dev/null @@ -1,64 +0,0 @@ -from poetry.semver import VersionRange -from poetry.semver import parse_constraint -from poetry.version.markers import parse_marker - -from .package import Package -from .utils.utils import create_nested_marker - - -class ProjectPackage(Package): - def __init__(self, name, version, pretty_version=None): - super(ProjectPackage, self).__init__(name, version, pretty_version) - - self.build = None - self.packages = [] - self.include = [] - self.exclude = [] - self.custom_urls = {} - - if self._python_versions == "*": - self._python_constraint = parse_constraint("~2.7 || >=3.4") - - def is_root(self): - return True - - def to_dependency(self): - dependency = super(ProjectPackage, self).to_dependency() - - dependency.is_root = True - - return dependency - - @property - def python_versions(self): - return self._python_versions - - @python_versions.setter - def python_versions(self, value): - self._python_versions = value - - if value == "*" or value == VersionRange(): - value = "~2.7 || >=3.4" - - self._python_constraint = parse_constraint(value) - self._python_marker = parse_marker( - create_nested_marker("python_version", self._python_constraint) - ) - - @property - def urls(self): - urls = super(ProjectPackage, self).urls - - urls.update(self.custom_urls) - - return urls - - def clone(self): # type: () -> ProjectPackage - package = super(ProjectPackage, self).clone() - - package.build = self.build - package.packages = self.packages[:] - package.include = self.include[:] - package.exclude = self.exclude[:] - - return package diff --git a/poetry/packages/url_dependency.py b/poetry/packages/url_dependency.py deleted file mode 100644 index f128dc49366..00000000000 --- a/poetry/packages/url_dependency.py +++ /dev/null @@ -1,40 +0,0 @@ -from poetry.utils._compat import urlparse - -from .dependency import Dependency - - -class URLDependency(Dependency): - def __init__( - self, - name, - url, # type: str - category="main", # type: str - optional=False, # type: bool - ): - self._url = url - - parsed = urlparse.urlparse(url) - if not parsed.scheme or not parsed.netloc: - raise ValueError("{} does not seem like a valid url".format(url)) - - super(URLDependency, self).__init__( - name, "*", category=category, optional=optional, allows_prereleases=True - ) - - @property - def url(self): - return self._url - - @property - def base_pep_508_name(self): # type: () -> str - requirement = self.pretty_name - - if self.extras: - requirement += "[{}]".format(",".join(self.extras)) - - requirement += " @ {}".format(self._url) - - return requirement - - def is_url(self): # type: () -> bool - return True diff --git a/poetry/packages/utils/link.py b/poetry/packages/utils/link.py deleted file mode 100644 index c131f428dd5..00000000000 --- a/poetry/packages/utils/link.py +++ /dev/null @@ -1,166 +0,0 @@ -import posixpath - -try: - import urllib.parse as urlparse -except ImportError: - import urlparse - -import re - -from .utils import path_to_url -from .utils import splitext - - -class Link: - def __init__(self, url, comes_from=None, requires_python=None): - """ - Object representing a parsed link from https://pypi.python.org/simple/* - - url: - url of the resource pointed to (href of the link) - comes_from: - instance of HTMLPage where the link was found, or string. - requires_python: - String containing the `Requires-Python` metadata field, specified - in PEP 345. This may be specified by a data-requires-python - attribute in the HTML link tag, as described in PEP 503. - """ - - # url can be a UNC windows share - if url.startswith("\\\\"): - url = path_to_url(url) - - self.url = url - self.comes_from = comes_from - self.requires_python = requires_python if requires_python else None - - def __str__(self): - if self.requires_python: - rp = " (requires-python:%s)" % self.requires_python - else: - rp = "" - if self.comes_from: - return "%s (from %s)%s" % (self.url, self.comes_from, rp) - else: - return str(self.url) - - def __repr__(self): - return "" % self - - def __eq__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url == other.url - - def __ne__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url != other.url - - def __lt__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url < other.url - - def __le__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url <= other.url - - def __gt__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url > other.url - - def __ge__(self, other): - if not isinstance(other, Link): - return NotImplemented - return self.url >= other.url - - def __hash__(self): - return hash(self.url) - - @property - def filename(self): - _, netloc, path, _, _ = urlparse.urlsplit(self.url) - name = posixpath.basename(path.rstrip("/")) or netloc - name = urlparse.unquote(name) - assert name, "URL %r produced no filename" % self.url - return name - - @property - def scheme(self): - return urlparse.urlsplit(self.url)[0] - - @property - def netloc(self): - return urlparse.urlsplit(self.url)[1] - - @property - def path(self): - return urlparse.unquote(urlparse.urlsplit(self.url)[2]) - - def splitext(self): - return splitext(posixpath.basename(self.path.rstrip("/"))) - - @property - def ext(self): - return self.splitext()[1] - - @property - def url_without_fragment(self): - scheme, netloc, path, query, fragment = urlparse.urlsplit(self.url) - return urlparse.urlunsplit((scheme, netloc, path, query, None)) - - _egg_fragment_re = re.compile(r"[#&]egg=([^&]*)") - - @property - def egg_fragment(self): - match = self._egg_fragment_re.search(self.url) - if not match: - return None - return match.group(1) - - _subdirectory_fragment_re = re.compile(r"[#&]subdirectory=([^&]*)") - - @property - def subdirectory_fragment(self): - match = self._subdirectory_fragment_re.search(self.url) - if not match: - return None - return match.group(1) - - _hash_re = re.compile(r"(sha1|sha224|sha384|sha256|sha512|md5)=([a-f0-9]+)") - - @property - def hash(self): - match = self._hash_re.search(self.url) - if match: - return match.group(2) - return None - - @property - def hash_name(self): - match = self._hash_re.search(self.url) - if match: - return match.group(1) - return None - - @property - def show_url(self): - return posixpath.basename(self.url.split("#", 1)[0].split("?", 1)[0]) - - @property - def is_wheel(self): - return self.ext == ".whl" - - @property - def is_artifact(self): - """ - Determines if this points to an actual artifact (e.g. a tarball) or if - it points to an "abstract" thing like a path or a VCS location. - """ - if self.scheme in ["ssh", "git", "hg", "bzr", "sftp", "svn"]: - return False - - return True diff --git a/poetry/packages/utils/utils.py b/poetry/packages/utils/utils.py deleted file mode 100644 index 9e23cc7e328..00000000000 --- a/poetry/packages/utils/utils.py +++ /dev/null @@ -1,237 +0,0 @@ -import os -import posixpath -import re - -from poetry.packages.constraints.constraint import Constraint -from poetry.packages.constraints.multi_constraint import MultiConstraint -from poetry.packages.constraints.union_constraint import UnionConstraint -from poetry.semver import Version -from poetry.semver import VersionUnion -from poetry.version.markers import MarkerUnion -from poetry.version.markers import MultiMarker -from poetry.version.markers import SingleMarker - -try: - import urllib.parse as urlparse -except ImportError: - import urlparse - - -try: - import urllib.request as urllib2 -except ImportError: - import urllib2 - - -BZ2_EXTENSIONS = (".tar.bz2", ".tbz") -XZ_EXTENSIONS = (".tar.xz", ".txz", ".tlz", ".tar.lz", ".tar.lzma") -ZIP_EXTENSIONS = (".zip", ".whl") -TAR_EXTENSIONS = (".tar.gz", ".tgz", ".tar") -ARCHIVE_EXTENSIONS = ZIP_EXTENSIONS + BZ2_EXTENSIONS + TAR_EXTENSIONS + XZ_EXTENSIONS -SUPPORTED_EXTENSIONS = ZIP_EXTENSIONS + TAR_EXTENSIONS - -try: - import bz2 # noqa - - SUPPORTED_EXTENSIONS += BZ2_EXTENSIONS -except ImportError: - pass - -try: - # Only for Python 3.3+ - import lzma # noqa - - SUPPORTED_EXTENSIONS += XZ_EXTENSIONS -except ImportError: - pass - - -def path_to_url(path): - """ - Convert a path to a file: URL. The path will be made absolute and have - quoted path parts. - """ - path = os.path.normpath(os.path.abspath(path)) - url = urlparse.urljoin("file:", urllib2.pathname2url(path)) - return url - - -def is_url(name): - if ":" not in name: - return False - scheme = name.split(":", 1)[0].lower() - - return scheme in [ - "http", - "https", - "file", - "ftp", - "ssh", - "git", - "hg", - "bzr", - "sftp", - "svn" "ssh", - ] - - -def strip_extras(path): - m = re.match(r"^(.+)(\[[^\]]+\])$", path) - extras = None - if m: - path_no_extras = m.group(1) - extras = m.group(2) - else: - path_no_extras = path - - return path_no_extras, extras - - -def is_installable_dir(path): - """Return True if `path` is a directory containing a setup.py file.""" - if not os.path.isdir(path): - return False - setup_py = os.path.join(path, "setup.py") - if os.path.isfile(setup_py): - return True - return False - - -def is_archive_file(name): - """Return True if `name` is a considered as an archive file.""" - ext = splitext(name)[1].lower() - if ext in ARCHIVE_EXTENSIONS: - return True - return False - - -def splitext(path): - """Like os.path.splitext, but take off .tar too""" - base, ext = posixpath.splitext(path) - if base.lower().endswith(".tar"): - ext = base[-4:] + ext - base = base[:-4] - return base, ext - - -def group_markers(markers, or_=False): - groups = [[]] - - for marker in markers: - if or_: - groups.append([]) - - if isinstance(marker, (MultiMarker, MarkerUnion)): - groups[-1].append( - group_markers(marker.markers, isinstance(marker, MarkerUnion)) - ) - elif isinstance(marker, SingleMarker): - lhs, op, rhs = marker.name, marker.operator, marker.value - - groups[-1].append((lhs, op, rhs)) - - return groups - - -def convert_markers(marker): - groups = group_markers([marker]) - - requirements = {} - - def _group(_groups, or_=False): - ors = {} - for group in _groups: - if isinstance(group, list): - _group(group, or_=True) - else: - variable, op, value = group - group_name = str(variable) - - # python_full_version is equivalent to python_version - # for Poetry so we merge them - if group_name == "python_full_version": - group_name = "python_version" - - if group_name not in requirements: - requirements[group_name] = [] - - if group_name not in ors: - ors[group_name] = or_ - - if ors[group_name] or not requirements[group_name]: - requirements[group_name].append([]) - - requirements[group_name][-1].append((str(op), str(value))) - - ors[group_name] = False - - _group(groups, or_=True) - - return requirements - - -def create_nested_marker(name, constraint): - if constraint.is_any(): - return "" - - if isinstance(constraint, (MultiConstraint, UnionConstraint)): - parts = [] - for c in constraint.constraints: - multi = False - if isinstance(c, (MultiConstraint, UnionConstraint)): - multi = True - - parts.append((multi, create_nested_marker(name, c))) - - glue = " and " - if isinstance(constraint, UnionConstraint): - parts = ["({})".format(part[1]) if part[0] else part[1] for part in parts] - glue = " or " - else: - parts = [part[1] for part in parts] - - marker = glue.join(parts) - elif isinstance(constraint, Constraint): - marker = '{} {} "{}"'.format(name, constraint.operator, constraint.version) - elif isinstance(constraint, VersionUnion): - parts = [] - for c in constraint.ranges: - parts.append(create_nested_marker(name, c)) - - glue = " or " - parts = ["({})".format(part) for part in parts] - - marker = glue.join(parts) - elif isinstance(constraint, Version): - marker = '{} == "{}"'.format(name, constraint.text) - else: - if constraint.min is not None: - op = ">=" - if not constraint.include_min: - op = ">" - - version = constraint.min.text - if constraint.max is not None: - text = '{} {} "{}"'.format(name, op, version) - - op = "<=" - if not constraint.include_max: - op = "<" - - version = constraint.max - - text += ' and {} {} "{}"'.format(name, op, version) - - return text - elif constraint.max is not None: - op = "<=" - if not constraint.include_max: - op = "<" - - version = constraint.max - else: - return "" - - marker = '{} {} "{}"'.format(name, op, version) - - return marker diff --git a/poetry/packages/vcs_dependency.py b/poetry/packages/vcs_dependency.py deleted file mode 100644 index e02b33107d2..00000000000 --- a/poetry/packages/vcs_dependency.py +++ /dev/null @@ -1,80 +0,0 @@ -from .dependency import Dependency - - -class VCSDependency(Dependency): - """ - Represents a VCS dependency - """ - - def __init__( - self, name, vcs, source, branch=None, tag=None, rev=None, optional=False - ): - self._vcs = vcs - self._source = source - - if not any([branch, tag, rev]): - # If nothing has been specified, we assume master - branch = "master" - - self._branch = branch - self._tag = tag - self._rev = rev - - super(VCSDependency, self).__init__( - name, "*", optional=optional, allows_prereleases=True - ) - - @property - def vcs(self): - return self._vcs - - @property - def source(self): - return self._source - - @property - def branch(self): - return self._branch - - @property - def tag(self): - return self._tag - - @property - def rev(self): - return self._rev - - @property - def reference(self): # type: () -> str - return self._branch or self._tag or self._rev - - @property - def pretty_constraint(self): # type: () -> str - if self._branch: - what = "branch" - version = self._branch - elif self._tag: - what = "tag" - version = self._tag - else: - what = "rev" - version = self._rev - - return "{} {}".format(what, version) - - @property - def base_pep_508_name(self): # type: () -> str - requirement = self.pretty_name - - if self.extras: - requirement += "[{}]".format(",".join(self.extras)) - - requirement += " @ {}+{}@{}".format(self._vcs, self._source, self.reference) - - return requirement - - def is_vcs(self): # type: () -> bool - return True - - def accepts_prereleases(self): # type: () -> bool - return True diff --git a/poetry/poetry.py b/poetry/poetry.py index 4b28a5478ae..4878f0a22aa 100644 --- a/poetry/poetry.py +++ b/poetry/poetry.py @@ -1,18 +1,17 @@ from __future__ import absolute_import from __future__ import unicode_literals -from typing import Optional +from poetry.core.packages import ProjectPackage +from poetry.core.poetry import Poetry as BasePoetry from .__version__ import __version__ from .config.config import Config from .packages import Locker -from .packages import ProjectPackage from .repositories.pool import Pool from .utils._compat import Path -from .utils.toml_file import TomlFile -class Poetry: +class Poetry(BasePoetry): VERSION = __version__ @@ -24,25 +23,12 @@ def __init__( locker, # type: Locker config, # type: Config ): - self._file = TomlFile(file) - self._package = package - self._local_config = local_config + super(Poetry, self).__init__(file, local_config, package) + self._locker = locker self._config = config self._pool = Pool() - @property - def file(self): - return self._file - - @property - def package(self): # type: () -> ProjectPackage - return self._package - - @property - def local_config(self): # type: () -> dict - return self._local_config - @property def locker(self): # type: () -> Locker return self._locker diff --git a/poetry/masonry/publishing/__init__.py b/poetry/publishing/__init__.py similarity index 100% rename from poetry/masonry/publishing/__init__.py rename to poetry/publishing/__init__.py diff --git a/poetry/publishing/publisher.py b/poetry/publishing/publisher.py new file mode 100644 index 00000000000..d30a9a47119 --- /dev/null +++ b/poetry/publishing/publisher.py @@ -0,0 +1,98 @@ +import logging + +from typing import Optional + +from poetry.utils._compat import Path +from poetry.utils.helpers import get_cert +from poetry.utils.helpers import get_client_cert +from poetry.utils.password_manager import PasswordManager + +from .uploader import Uploader + + +logger = logging.getLogger(__name__) + + +class Publisher: + """ + Registers and publishes packages to remote repositories. + """ + + def __init__(self, poetry, io): + self._poetry = poetry + self._package = poetry.package + self._io = io + self._uploader = Uploader(poetry, io) + self._password_manager = PasswordManager(poetry.config) + + @property + def files(self): + return self._uploader.files + + def publish( + self, + repository_name, + username, + password, + cert=None, + client_cert=None, + dry_run=False, + ): # type: (Optional[str], Optional[str], Optional[str], Optional[Path], Optional[Path], Optional[bool]) -> None + if not repository_name: + url = "https://upload.pypi.org/legacy/" + repository_name = "pypi" + else: + # Retrieving config information + url = self._poetry.config.get("repositories.{}.url".format(repository_name)) + if url is None: + raise RuntimeError( + "Repository {} is not defined".format(repository_name) + ) + + if not (username and password): + # Check if we have a token first + token = self._password_manager.get_pypi_token(repository_name) + if token: + logger.debug("Found an API token for {}.".format(repository_name)) + username = "__token__" + password = token + else: + auth = self._password_manager.get_http_auth(repository_name) + if auth: + logger.debug( + "Found authentication information for {}.".format( + repository_name + ) + ) + username = auth["username"] + password = auth["password"] + + resolved_client_cert = client_cert or get_client_cert( + self._poetry.config, repository_name + ) + # Requesting missing credentials but only if there is not a client cert defined. + if not resolved_client_cert: + if username is None: + username = self._io.ask("Username:") + + # skip password input if no username is provided, assume unauthenticated + if username and password is None: + password = self._io.ask_hidden("Password:") + + self._uploader.auth(username, password) + + self._io.write_line( + "Publishing {} ({}) " + "to {}".format( + self._package.pretty_name, + self._package.pretty_version, + {"pypi": "PyPI"}.get(repository_name, "PyPI"), + ) + ) + + self._uploader.upload( + url, + cert=cert or get_cert(self._poetry.config, repository_name), + client_cert=resolved_client_cert, + dry_run=dry_run, + ) diff --git a/poetry/masonry/publishing/uploader.py b/poetry/publishing/uploader.py similarity index 70% rename from poetry/masonry/publishing/uploader.py rename to poetry/publishing/uploader.py index fd84b26959c..b817676f956 100644 --- a/poetry/masonry/publishing/uploader.py +++ b/poetry/publishing/uploader.py @@ -1,35 +1,48 @@ import hashlib import io -import math -import re +from typing import Any +from typing import Dict from typing import List +from typing import Optional +from typing import Union import requests from requests import adapters +from requests.exceptions import ConnectionError from requests.exceptions import HTTPError from requests.packages.urllib3 import util from requests_toolbelt import user_agent -from requests_toolbelt.multipart import MultipartEncoder, MultipartEncoderMonitor +from requests_toolbelt.multipart import MultipartEncoder +from requests_toolbelt.multipart import MultipartEncoderMonitor from poetry.__version__ import __version__ +from poetry.core.masonry.metadata import Metadata +from poetry.core.masonry.utils.helpers import escape_name +from poetry.core.masonry.utils.helpers import escape_version +from poetry.utils._compat import Path from poetry.utils.helpers import normalize_version from poetry.utils.patterns import wheel_file_re -from ..metadata import Metadata - _has_blake2 = hasattr(hashlib, "blake2b") class UploadError(Exception): - def __init__(self, error): # type: (HTTPError) -> None - super(UploadError, self).__init__( - "HTTP Error {}: {}".format( + def __init__(self, error): # type: (Union[ConnectionError, HTTPError]) -> None + if isinstance(error, HTTPError): + message = "HTTP Error {}: {}".format( error.response.status_code, error.response.reason ) - ) + elif isinstance(error, ConnectionError): + message = ( + "Connection Error: We were unable to connect to the repository, " + "ensure the url is correct and can be reached." + ) + else: + message = str(error) + super(UploadError, self).__init__(message) class Uploader: @@ -56,17 +69,14 @@ def adapter(self): return adapters.HTTPAdapter(max_retries=retry) @property - def files(self): # type: () -> List[str] + def files(self): # type: () -> List[Path] dist = self._poetry.file.parent / "dist" version = normalize_version(self._package.version.text) wheels = list( dist.glob( "{}-{}-*.whl".format( - re.sub( - r"[^\w\d.]+", "_", self._package.pretty_name, flags=re.UNICODE - ), - re.sub(r"[^\w\d.]+", "_", version, flags=re.UNICODE), + escape_name(self._package.pretty_name), escape_version(version) ) ) ) @@ -80,7 +90,7 @@ def auth(self, username, password): self._username = username self._password = password - def make_session(self): + def make_session(self): # type: () -> requests.Session session = requests.session() if self.is_authenticated(): session.auth = (self._username, self._password) @@ -94,15 +104,23 @@ def make_session(self): def is_authenticated(self): return self._username is not None and self._password is not None - def upload(self, url): + def upload( + self, url, cert=None, client_cert=None, dry_run=False + ): # type: (str, Optional[Path], Optional[Path], bool) -> None session = self.make_session() + if cert: + session.verify = str(cert) + + if client_cert: + session.cert = str(client_cert) + try: - self._upload(session, url) + self._upload(session, url, dry_run) finally: session.close() - def post_data(self, file): + def post_data(self, file): # type: (Path) -> Dict[str, Any] meta = Metadata.from_package(self._package) file_type = self._get_type(file) @@ -180,9 +198,11 @@ def post_data(self, file): return data - def _upload(self, session, url): + def _upload( + self, session, url, dry_run=False + ): # type: (requests.Session, str, Optional[bool]) -> None try: - self._do_upload(session, url) + self._do_upload(session, url, dry_run) except HTTPError as e: if ( e.response.status_code == 400 @@ -195,15 +215,20 @@ def _upload(self, session, url): raise UploadError(e) - def _do_upload(self, session, url): + def _do_upload( + self, session, url, dry_run=False + ): # type: (requests.Session, str, Optional[bool]) -> None for file in self.files: # TODO: Check existence - resp = self._upload_file(session, url, file) + resp = self._upload_file(session, url, file, dry_run) - resp.raise_for_status() + if not dry_run: + resp.raise_for_status() - def _upload_file(self, session, url, file): + def _upload_file( + self, session, url, file, dry_run=False + ): # type: (requests.Session, str, Path, Optional[bool]) -> requests.Response data = self.post_data(file) data.update( { @@ -222,7 +247,7 @@ def _upload_file(self, session, url, file): encoder = MultipartEncoder(data_to_send) bar = self._io.progress_bar(encoder.len) bar.set_format( - " - Uploading {0} %percent%%".format(file.name) + " - Uploading {0} %percent%%".format(file.name) ) monitor = MultipartEncoderMonitor( encoder, lambda monitor: bar.set_progress(monitor.bytes_read) @@ -230,30 +255,39 @@ def _upload_file(self, session, url, file): bar.start() - resp = session.post( - url, - data=monitor, - allow_redirects=False, - headers={"Content-Type": monitor.content_type}, - ) - - if resp.ok: - bar.finish() + resp = None - self._io.write_line("") - else: + try: + if not dry_run: + resp = session.post( + url, + data=monitor, + allow_redirects=False, + headers={"Content-Type": monitor.content_type}, + ) + if dry_run or resp.ok: + bar.set_format( + " - Uploading {0} %percent%%".format( + file.name + ) + ) + bar.finish() + except (requests.ConnectionError, requests.HTTPError) as e: if self._io.output.supports_ansi(): self._io.overwrite( - " - Uploading {0} {1}%".format( - file.name, int(math.floor(bar._percent * 100)) + " - Uploading {0} {1}".format( + file.name, "FAILED" ) ) - + raise UploadError(e) + finally: self._io.write_line("") return resp - def _register(self, session, url): + def _register( + self, session, url + ): # type: (requests.Session, str) -> requests.Response """ Register a package to a repository. """ diff --git a/poetry/puzzle/dependencies.py b/poetry/puzzle/dependencies.py deleted file mode 100644 index 18292549a91..00000000000 --- a/poetry/puzzle/dependencies.py +++ /dev/null @@ -1,36 +0,0 @@ -class Dependencies: - """ - Proxy to package dependencies to only require them when needed. - """ - - def __init__(self, package, provider): - self._package = package - self._provider = provider - self._dependencies = None - - @property - def dependencies(self): - if self._dependencies is None: - self._dependencies = self._get_dependencies() - - return self._dependencies - - def _get_dependencies(self): - self._provider.debug("Getting dependencies for {}".format(self._package), 0) - dependencies = self._provider._dependencies_for(self._package) - - if dependencies is None: - dependencies = [] - - return dependencies - - def __len__(self): - return len(self.dependencies) - - def __iter__(self): - return self.dependencies.__iter__() - - def __add__(self, other): - return self.dependencies + other - - __radd__ = __add__ diff --git a/poetry/puzzle/exceptions.py b/poetry/puzzle/exceptions.py index 5fd8960c665..e2e0b0dcce7 100644 --- a/poetry/puzzle/exceptions.py +++ b/poetry/puzzle/exceptions.py @@ -1,12 +1,3 @@ -class CompatibilityError(Exception): - def __init__(self, *constraints): - self._constraints = list(constraints) - - @property - def constraints(self): - return self._constraints - - class SolverProblemError(Exception): def __init__(self, error): self._error = error @@ -16,3 +7,12 @@ def __init__(self, error): @property def error(self): return self._error + + +class OverrideNeeded(Exception): + def __init__(self, *overrides): + self._overrides = overrides + + @property + def overrides(self): + return self._overrides diff --git a/poetry/puzzle/provider.py b/poetry/puzzle/provider.py index 5714d9c804b..00c70689221 100644 --- a/poetry/puzzle/provider.py +++ b/poetry/puzzle/provider.py @@ -1,51 +1,42 @@ -import glob import logging import os -import pkginfo import re import time -from clikit.ui.components import ProgressIndicator from contextlib import contextmanager from tempfile import mkdtemp +from typing import Any from typing import List from typing import Optional -from poetry.factory import Factory -from poetry.packages import Dependency -from poetry.packages import DependencyPackage -from poetry.packages import DirectoryDependency -from poetry.packages import FileDependency -from poetry.packages import Package -from poetry.packages import PackageCollection -from poetry.packages import URLDependency -from poetry.packages import VCSDependency -from poetry.packages import dependency_from_pep_508 +from clikit.ui.components import ProgressIndicator +from poetry.core.packages import Dependency +from poetry.core.packages import DirectoryDependency +from poetry.core.packages import FileDependency +from poetry.core.packages import Package +from poetry.core.packages import URLDependency +from poetry.core.packages import VCSDependency +from poetry.core.packages.utils.utils import get_python_constraint_from_marker +from poetry.core.vcs.git import Git +from poetry.core.version.markers import MarkerUnion +from poetry.inspection.info import PackageInfo +from poetry.inspection.info import PackageInfoError from poetry.mixology.incompatibility import Incompatibility from poetry.mixology.incompatibility_cause import DependencyCause from poetry.mixology.incompatibility_cause import PythonCause from poetry.mixology.term import Term - +from poetry.packages import DependencyPackage +from poetry.packages.package_collection import PackageCollection +from poetry.puzzle.exceptions import OverrideNeeded from poetry.repositories import Pool - -from poetry.utils._compat import PY35 -from poetry.utils._compat import Path from poetry.utils._compat import OrderedDict +from poetry.utils._compat import Path from poetry.utils._compat import urlparse -from poetry.utils.helpers import parse_requires +from poetry.utils.env import Env +from poetry.utils.helpers import download_file from poetry.utils.helpers import safe_rmtree from poetry.utils.helpers import temporary_directory -from poetry.utils.env import EnvManager -from poetry.utils.env import EnvCommandError -from poetry.utils.inspector import Inspector -from poetry.utils.setup_reader import SetupReader -from poetry.utils.toml_file import TomlFile - -from poetry.version.markers import MarkerUnion -from poetry.vcs.git import Git - -from .exceptions import CompatibilityError logger = logging.getLogger(__name__) @@ -63,37 +54,38 @@ class Provider: UNSAFE_PACKAGES = {"setuptools", "distribute", "pip"} def __init__( - self, package, pool, io # type: Package # type: Pool - ): # type: (...) -> None + self, package, pool, io, env=None + ): # type: (Package, Pool, Any, Optional[Env]) -> None self._package = package self._pool = pool self._io = io - self._inspector = Inspector() + self._env = env self._python_constraint = package.python_constraint self._search_for = {} self._is_debugging = self._io.is_debug() or self._io.is_very_verbose() self._in_progress = False + self._overrides = {} + self._deferred_cache = {} @property def pool(self): # type: () -> Pool return self._pool - @property - def name_for_explicit_dependency_source(self): # type: () -> str - return "pyproject.toml" - - @property - def name_for_locking_dependency_source(self): # type: () -> str - return "poetry.lock" - def is_debugging(self): return self._is_debugging - def name_for(self, dependency): # type: (Dependency) -> str - """ - Returns the name for the given dependency. - """ - return dependency.name + def set_overrides(self, overrides): + self._overrides = overrides + + @contextmanager + def use_environment(self, env): # type: (Env) -> Provider + original_env = self._env + + self._env = env + + yield self + + self._env = original_env def search_for(self, dependency): # type: (Dependency) -> List[Package] """ @@ -165,6 +157,9 @@ def search_for_vcs(self, dependency): # type: (VCSDependency) -> List[Package] Basically, we clone the repository in a temporary directory and get the information we need by checking out the specified reference. """ + if dependency in self._deferred_cache: + return [self._deferred_cache[dependency]] + package = self.get_package_from_vcs( dependency.vcs, dependency.source, @@ -172,9 +167,6 @@ def search_for_vcs(self, dependency): # type: (VCSDependency) -> List[Package] name=dependency.name, ) - if dependency.tag or dependency.rev: - package.source_reference = dependency.reference - for extra in dependency.extras: if extra in package.extras: for dep in package.extras[extra]: @@ -182,6 +174,11 @@ def search_for_vcs(self, dependency): # type: (VCSDependency) -> List[Package] package.requires += package.extras[extra] + dependency._constraint = package.version + dependency._pretty_constraint = package.version.text + + self._deferred_cache[dependency] = package + return [package] @classmethod @@ -218,7 +215,17 @@ def get_package_from_vcs( return package def search_for_file(self, dependency): # type: (FileDependency) -> List[Package] - package = self.get_package_from_file(dependency.full_path) + if dependency in self._deferred_cache: + dependency, _package = self._deferred_cache[dependency] + + package = _package.clone() + else: + package = self.get_package_from_file(dependency.full_path) + + dependency._constraint = package.version + dependency._pretty_constraint = package.version.text + + self._deferred_cache[dependency] = (dependency, package) if dependency.name != package.name: # For now, the dependency's name must match the actual package's name @@ -228,8 +235,13 @@ def search_for_file(self, dependency): # type: (FileDependency) -> List[Package ) ) + if dependency.base is not None: + package.root_dir = dependency.base + package.source_url = dependency.path.as_posix() - package.hashes = [dependency.hash()] + package.files = [ + {"file": dependency.path.name, "hash": "sha256:" + dependency.hash()} + ] for extra in dependency.extras: if extra in package.extras: @@ -242,41 +254,42 @@ def search_for_file(self, dependency): # type: (FileDependency) -> List[Package @classmethod def get_package_from_file(cls, file_path): # type: (Path) -> Package - info = Inspector().inspect(file_path) - if not info["name"]: + try: + package = PackageInfo.from_path(path=file_path).to_package( + root_dir=file_path + ) + except PackageInfoError: raise RuntimeError( - "Unable to determine the package name of {}".format(file_path) + "Unable to determine package info from path: {}".format(file_path) ) - package = Package(info["name"], info["version"]) package.source_type = "file" package.source_url = file_path.as_posix() - package.description = info["summary"] - for req in info["requires_dist"]: - dep = dependency_from_pep_508(req) - for extra in dep.in_extras: - if extra not in package.extras: - package.extras[extra] = [] - - package.extras[extra].append(dep) - - if not dep.is_optional(): - package.requires.append(dep) - - if info["requires_python"]: - package.python_versions = info["requires_python"] - return package def search_for_directory( self, dependency ): # type: (DirectoryDependency) -> List[Package] - package = self.get_package_from_directory( - dependency.full_path, name=dependency.name - ) + if dependency in self._deferred_cache: + dependency, _package = self._deferred_cache[dependency] + + package = _package.clone() + else: + package = self.get_package_from_directory( + dependency.full_path, name=dependency.name + ) + + dependency._constraint = package.version + dependency._pretty_constraint = package.version.text + + self._deferred_cache[dependency] = (dependency, package) package.source_url = dependency.path.as_posix() + package.develop = dependency.develop + + if dependency.base is not None: + package.root_dir = dependency.base for extra in dependency.extras: if extra in package.extras: @@ -291,134 +304,9 @@ def search_for_directory( def get_package_from_directory( cls, directory, name=None ): # type: (Path, Optional[str]) -> Package - supports_poetry = False - pyproject = directory.joinpath("pyproject.toml") - if pyproject.exists(): - pyproject = TomlFile(pyproject) - pyproject_content = pyproject.read() - supports_poetry = ( - "tool" in pyproject_content and "poetry" in pyproject_content["tool"] - ) - - if supports_poetry: - poetry = Factory().create_poetry(directory) - - pkg = poetry.package - package = Package(pkg.name, pkg.version) - - for dep in pkg.requires: - if not dep.is_optional(): - package.requires.append(dep) - - for extra, deps in pkg.extras.items(): - if extra not in package.extras: - package.extras[extra] = [] - - for dep in deps: - package.extras[extra].append(dep) - - package.python_versions = pkg.python_versions - else: - # Execute egg_info - current_dir = os.getcwd() - os.chdir(str(directory)) - - try: - cwd = directory - venv = EnvManager().get(cwd) - venv.run("python", "setup.py", "egg_info") - except EnvCommandError: - result = SetupReader.read_from_directory(directory) - if not result["name"]: - # The name could not be determined - # We use the dependency name - result["name"] = name - - if not result["version"]: - # The version could not be determined - # so we raise an error since it is mandatory - raise RuntimeError( - "Unable to retrieve the package version for {}".format( - directory - ) - ) - - package_name = result["name"] - package_version = result["version"] - python_requires = result["python_requires"] - if python_requires is None: - python_requires = "*" - - package_summary = "" - - requires = "" - for dep in result["install_requires"]: - requires += dep + "\n" - - if result["extras_require"]: - requires += "\n" - - for extra_name, deps in result["extras_require"].items(): - requires += "[{}]\n".format(extra_name) - - for dep in deps: - requires += dep + "\n" - - requires += "\n" - - reqs = parse_requires(requires) - else: - os.chdir(current_dir) - # Sometimes pathlib will fail on recursive - # symbolic links, so we need to workaround it - # and use the glob module instead. - # Note that this does not happen with pathlib2 - # so it's safe to use it for Python < 3.4. - if PY35: - egg_info = next( - Path(p) - for p in glob.glob( - os.path.join(str(directory), "**", "*.egg-info"), - recursive=True, - ) - ) - else: - egg_info = next(directory.glob("**/*.egg-info")) - - meta = pkginfo.UnpackedSDist(str(egg_info)) - package_name = meta.name - package_version = meta.version - package_summary = meta.summary - python_requires = meta.requires_python - - if meta.requires_dist: - reqs = list(meta.requires_dist) - else: - reqs = [] - requires = egg_info / "requires.txt" - if requires.exists(): - with requires.open(encoding="utf-8") as f: - reqs = parse_requires(f.read()) - finally: - os.chdir(current_dir) - - package = Package(package_name, package_version) - package.description = package_summary - - for req in reqs: - dep = dependency_from_pep_508(req) - if dep.in_extras: - for extra in dep.in_extras: - if extra not in package.extras: - package.extras[extra] = [] - - package.extras[extra].append(dep) - - if not dep.is_optional(): - package.requires.append(dep) - - if python_requires: - package.python_versions = python_requires + package = PackageInfo.from_directory( + path=directory, allow_build=True + ).to_package(root_dir=directory) if name and name != package.name: # For now, the dependency's name must match the actual package's name @@ -434,6 +322,9 @@ def get_package_from_directory( return package def search_for_url(self, dependency): # type: (URLDependency) -> List[Package] + if dependency in self._deferred_cache: + return [self._deferred_cache[dependency]] + package = self.get_package_from_url(dependency.url) if dependency.name != package.name: @@ -451,6 +342,11 @@ def search_for_url(self, dependency): # type: (URLDependency) -> List[Package] package.requires += package.extras[extra] + dependency._constraint = package.version + dependency._pretty_constraint = package.version.text + + self._deferred_cache[dependency] = package + return [package] @classmethod @@ -458,7 +354,7 @@ def get_package_from_url(cls, url): # type: (str) -> Package with temporary_directory() as temp_dir: temp_dir = Path(temp_dir) file_name = os.path.basename(urlparse.urlparse(url).path) - Inspector().download(url, temp_dir / file_name) + download_file(url, temp_dir / file_name) package = cls.get_package_from_file(temp_dir / file_name) @@ -487,14 +383,15 @@ def incompatibilities_for( if not package.python_constraint.allows_all( self._package.python_constraint ): - intersection = package.python_constraint.intersect( - package.dependency.transitive_python_constraint + transitive_python_constraint = get_python_constraint_from_marker( + package.dependency.transitive_marker ) - difference = package.dependency.transitive_python_constraint.difference( - intersection + intersection = package.python_constraint.intersect( + transitive_python_constraint ) + difference = transitive_python_constraint.difference(intersection) if ( - package.dependency.transitive_python_constraint.is_any() + transitive_python_constraint.is_any() or self._package.python_constraint.intersect( package.dependency.python_constraint ).is_empty() @@ -510,13 +407,29 @@ def incompatibilities_for( ) ] - dependencies = [ + _dependencies = [ dep for dep in dependencies if dep.name not in self.UNSAFE_PACKAGES and self._package.python_constraint.allows_any(dep.python_constraint) + and (not self._env or dep.marker.validate(self._env.marker_env)) ] + overrides = self._overrides.get(package, {}) + dependencies = [] + overridden = [] + for dep in _dependencies: + if dep.name in overrides: + if dep.name in overridden: + continue + + dependencies.append(overrides[dep.name]) + overridden.append(dep.name) + + continue + + dependencies.append(dep) + return [ Incompatibility( [Term(package.to_dependency(), True), Term(dep, False)], @@ -530,8 +443,8 @@ def complete_package( ): # type: (DependencyPackage) -> DependencyPackage if package.is_root(): package = package.clone() - - if not package.is_root() and package.source_type not in { + requires = package.all_requires + elif not package.is_root() and package.source_type not in { "directory", "file", "url", @@ -546,13 +459,44 @@ def complete_package( repository=package.dependency.source_name, ), ) - - dependencies = [ + requires = package.requires + else: + requires = package.requires + + # Retrieving constraints for deferred dependencies + for r in requires: + if r.is_directory(): + self.search_for_directory(r) + elif r.is_file(): + self.search_for_file(r) + elif r.is_vcs(): + self.search_for_vcs(r) + elif r.is_url(): + self.search_for_url(r) + + _dependencies = [ r - for r in package.requires + for r in requires if self._package.python_constraint.allows_any(r.python_constraint) + and r.name not in self.UNSAFE_PACKAGES + and (not self._env or r.marker.validate(self._env.marker_env)) ] + overrides = self._overrides.get(package, {}) + dependencies = [] + overridden = [] + for dep in _dependencies: + if dep.name in overrides: + if dep.name in overridden: + continue + + dependencies.append(overrides[dep.name]) + overridden.append(dep.name) + + continue + + dependencies.append(dep) + # Searching for duplicate dependencies # # If the duplicate dependencies have the same constraint, @@ -599,7 +543,7 @@ def complete_package( new_markers = [] for dep in _deps: marker = dep.marker.without_extras() - if marker.is_empty(): + if marker.is_any(): # No marker or only extras continue @@ -644,50 +588,110 @@ def complete_package( continue # At this point, we raise an exception that will - # tell the solver to enter compatibility mode - # which means it will resolve for subsets - # Python constraints + # tell the solver to make new resolutions with specific overrides. # - # For instance, if our root package requires Python ~2.7 || ^3.6 - # And we have one dependency that requires Python <3.6 - # and the other Python >=3.6 than the solver will solve - # dependencies for Python >=2.7,<2.8 || >=3.4,<3.6 - # and Python >=3.6,<4.0 - python_constraints = [] + # For instance, if the foo (1.2.3) package has the following dependencies: + # - bar (>=2.0) ; python_version >= "3.6" + # - bar (<2.0) ; python_version < "3.6" + # + # then the solver will need to make two new resolutions + # with the following overrides: + # - {=2.0)>} + # - {} + markers = [] for constraint, _deps in by_constraint.items(): - python_constraints.append(_deps[0].python_versions) + markers.append(_deps[0].marker) - _deps = [str(_dep[0]) for _dep in by_constraint.values()] + _deps = [_dep[0] for _dep in by_constraint.values()] self.debug( "Different requirements found for {}.".format( - ", ".join(_deps[:-1]) + " and " + _deps[-1] + ", ".join( + "{} ({}) with markers {}".format( + d.name, + d.pretty_constraint, + d.marker if not d.marker.is_any() else "*", + ) + for d in _deps[:-1] + ) + + " and " + + "{} ({}) with markers {}".format( + _deps[-1].name, + _deps[-1].pretty_constraint, + _deps[-1].marker if not _deps[-1].marker.is_any() else "*", + ) ) ) - raise CompatibilityError(*python_constraints) + + # We need to check if one of the duplicate dependencies + # has no markers. If there is one, we need to change its + # environment markers to the inverse of the union of the + # other dependencies markers. + # For instance, if we have the following dependencies: + # - ipython + # - ipython (1.2.4) ; implementation_name == "pypy" + # + # the marker for `ipython` will become `implementation_name != "pypy"`. + any_markers_dependencies = [d for d in _deps if d.marker.is_any()] + other_markers_dependencies = [d for d in _deps if not d.marker.is_any()] + + if any_markers_dependencies: + marker = other_markers_dependencies[0].marker + for other_dep in other_markers_dependencies[1:]: + marker = marker.union(other_dep.marker) + + for i, d in enumerate(_deps): + if d.marker.is_any(): + _deps[i].marker = marker.invert() + + overrides = [] + for _dep in _deps: + current_overrides = self._overrides.copy() + package_overrides = current_overrides.get(package, {}) + package_overrides.update({_dep.name: _dep}) + current_overrides.update({package: package_overrides}) + overrides.append(current_overrides) + + raise OverrideNeeded(*overrides) # Modifying dependencies as needed + clean_dependencies = [] for dep in dependencies: + if not package.dependency.transitive_marker.without_extras().is_any(): + marker_intersection = package.dependency.transitive_marker.without_extras().intersect( + dep.marker.without_extras() + ) + if marker_intersection.is_empty(): + # The dependency is not needed, since the markers specified + # for the current package selection are not compatible with + # the markers for the current dependency, so we skip it + continue + + dep.transitive_marker = marker_intersection + if not package.dependency.python_constraint.is_any(): - dep.transitive_python_versions = str( - dep.python_constraint.intersect( - package.dependency.python_constraint - ) + python_constraint_intersection = dep.python_constraint.intersect( + package.dependency.python_constraint ) + if python_constraint_intersection.is_empty(): + # This dependency is not needed under current python constraint. + continue + dep.transitive_python_versions = str(python_constraint_intersection) if (package.dependency.is_directory() or package.dependency.is_file()) and ( dep.is_directory() or dep.is_file() ): - if dep.path.as_posix().startswith(package.source_url): - relative = (Path(package.source_url) / dep.path).relative_to( - package.source_url + relative_path = Path( + os.path.relpath( + dep.full_path.as_posix(), package.root_dir.as_posix() ) - else: - relative = Path(package.source_url) / dep.path + ) # TODO: Improve the way we set the correct relative path for dependencies - dep._path = relative + dep._path = relative_path - package.requires = dependencies + clean_dependencies.append(dep) + + package.requires = clean_dependencies return package @@ -701,44 +705,42 @@ def debug(self, message, depth=0): m2 = re.match(r"(.+?) \((.+?)\)", m.group(1)) if m2: name = m2.group(1) - version = " ({})".format(m2.group(2)) + version = " ({})".format(m2.group(2)) else: name = m.group(1) version = "" message = ( - "fact: {}{} " - "depends on {} ({})".format( + "fact: {}{} " + "depends on {} ({})".format( name, version, m.group(2), m.group(3) ) ) elif " is " in message: message = re.sub( "fact: (.+) is (.+)", - "fact: \\1 is \\2", + "fact: \\1 is \\2", message, ) else: message = re.sub( - r"(?<=: )(.+?) \((.+?)\)", - "\\1 (\\2)", - message, + r"(?<=: )(.+?) \((.+?)\)", "\\1 (\\2)", message ) message = "fact: {}".format(message.split("fact: ")[1]) elif message.startswith("selecting "): message = re.sub( r"selecting (.+?) \((.+?)\)", - "selecting \\1 (\\2)", + "selecting \\1 (\\2)", message, ) elif message.startswith("derived:"): m = re.match(r"derived: (.+?) \((.+?)\)$", message) if m: - message = "derived: {} ({})".format( + message = "derived: {} ({})".format( m.group(1), m.group(2) ) else: - message = "derived: {}".format( + message = "derived: {}".format( message.split("derived: ")[1] ) elif message.startswith("conflict:"): @@ -747,14 +749,14 @@ def debug(self, message, depth=0): m2 = re.match(r"(.+?) \((.+?)\)", m.group(1)) if m2: name = m2.group(1) - version = " ({})".format(m2.group(2)) + version = " ({})".format(m2.group(2)) else: name = m.group(1) version = "" message = ( - "conflict: {}{} " - "depends on {} ({})".format( + "conflict: {}{} " + "depends on {} ({})".format( name, version, m.group(2), m.group(3) ) ) @@ -770,7 +772,7 @@ def debug(self, message, depth=0): debug_info = ( "\n".join( [ - "{}: {}".format(str(depth).rjust(4), s) + "{}: {}".format(str(depth).rjust(4), s) for s in debug_info.split("\n") ] ) @@ -785,9 +787,7 @@ def progress(self): self._io.write_line("Resolving dependencies...") yield else: - indicator = Indicator( - self._io, "{message} ({elapsed:2s})" - ) + indicator = Indicator(self._io, "{message} ({elapsed:2s})") with indicator.auto( "Resolving dependencies...", diff --git a/poetry/puzzle/solver.py b/poetry/puzzle/solver.py index ef9fe67b37e..a404971f0fe 100644 --- a/poetry/puzzle/solver.py +++ b/poetry/puzzle/solver.py @@ -1,36 +1,57 @@ import time +from contextlib import contextmanager from typing import Any from typing import Dict from typing import List +from clikit.io import ConsoleIO + +from poetry.core.packages import Package +from poetry.core.packages.project_package import ProjectPackage from poetry.mixology import resolve_version from poetry.mixology.failure import SolveFailure from poetry.packages import DependencyPackage -from poetry.packages import Package -from poetry.semver import parse_constraint -from poetry.version.markers import AnyMarker +from poetry.repositories import Pool +from poetry.repositories import Repository +from poetry.utils.env import Env -from .exceptions import CompatibilityError +from .exceptions import OverrideNeeded from .exceptions import SolverProblemError - from .operations import Install from .operations import Uninstall from .operations import Update from .operations.operation import Operation - from .provider import Provider class Solver: - def __init__(self, package, pool, installed, locked, io): + def __init__( + self, + package, # type: ProjectPackage + pool, # type: Pool + installed, # type: Repository + locked, # type: Repository + io, # type: ConsoleIO + remove_untracked=False, # type: bool + ): self._package = package self._pool = pool self._installed = installed self._locked = locked self._io = io self._provider = Provider(self._package, self._pool, self._io) - self._branches = [] + self._overrides = [] + self._remove_untracked = remove_untracked + + @property + def provider(self): # type: () -> Provider + return self._provider + + @contextmanager + def use_environment(self, env): # type: (Env) -> None + with self.provider.use_environment(env): + yield def solve(self, use_latest=None): # type: (...) -> List[Operation] with self._provider.progress(): @@ -38,15 +59,15 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] packages, depths = self._solve(use_latest=use_latest) end = time.time() - if len(self._branches) > 1: + if len(self._overrides) > 1: self._provider.debug( - "Complete version solving took {:.3f} seconds for {} branches".format( - end - start, len(self._branches[1:]) + "Complete version solving took {:.3f} seconds with {} overrides".format( + end - start, len(self._overrides) ) ) self._provider.debug( - "Resolved for branches: {}".format( - ", ".join("({})".format(b) for b in self._branches[1:]) + "Resolved with overrides: {}".format( + ", ".join("({})".format(b) for b in self._overrides) ) ) @@ -58,12 +79,20 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] installed = True if pkg.source_type == "git" and package.source_type == "git": + from poetry.core.vcs.git import Git + # Trying to find the currently installed version + pkg_source_url = Git.normalize_url(pkg.source_url) + package_source_url = Git.normalize_url(package.source_url) for locked in self._locked.packages: + if locked.name != pkg.name or locked.source_type != "git": + continue + + locked_source_url = Git.normalize_url(locked.source_url) if ( locked.name == pkg.name and locked.source_type == pkg.source_type - and locked.source_url == pkg.source_url + and locked_source_url == pkg_source_url and locked.source_reference == pkg.source_reference ): pkg = Package(pkg.name, locked.version) @@ -72,7 +101,7 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] pkg.source_reference = locked.source_reference break - if pkg.source_url != package.source_url or ( + if pkg_source_url != package_source_url or ( pkg.source_reference != package.source_reference and not pkg.source_reference.startswith( package.source_reference @@ -86,6 +115,8 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] elif package.version != pkg.version: # Checking version operations.append(Update(pkg, package)) + elif pkg.source_type and package.source_type != pkg.source_type: + operations.append(Update(pkg, package)) else: operations.append(Install(package).skip("Already installed")) @@ -115,6 +146,18 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] operations.append(op) + if self._remove_untracked: + locked_names = {locked.name for locked in self._locked.packages} + + for installed in self._installed.packages: + if installed.name == self._package.name: + continue + if installed.name in Provider.UNSAFE_PACKAGES: + # Never remove pip, setuptools etc. + continue + if installed.name not in locked_names: + operations.append(Uninstall(installed)) + return sorted( operations, key=lambda o: ( @@ -127,42 +170,39 @@ def solve(self, use_latest=None): # type: (...) -> List[Operation] ), ) - def solve_in_compatibility_mode(self, constraints, use_latest=None): + def solve_in_compatibility_mode(self, overrides, use_latest=None): locked = {} for package in self._locked.packages: locked[package.name] = DependencyPackage(package.to_dependency(), package) packages = [] depths = [] - for constraint in constraints: - constraint = parse_constraint(constraint) - intersection = constraint.intersect(self._package.python_constraint) - + for override in overrides: self._provider.debug( "Retrying dependency resolution " - "for Python ({}).".format(intersection) + "with the following overrides ({}).".format(override) ) - with self._package.with_python_versions(str(intersection)): - _packages, _depths = self._solve(use_latest=use_latest) - for index, package in enumerate(_packages): - if package not in packages: - packages.append(package) - depths.append(_depths[index]) - continue - else: - idx = packages.index(package) - pkg = packages[idx] - depths[idx] = max(depths[idx], _depths[index]) - pkg.marker = pkg.marker.union(package.marker) + self._provider.set_overrides(override) + _packages, _depths = self._solve(use_latest=use_latest) + for index, package in enumerate(_packages): + if package not in packages: + packages.append(package) + depths.append(_depths[index]) + continue + else: + idx = packages.index(package) + pkg = packages[idx] + depths[idx] = max(depths[idx], _depths[index]) - for dep in package.requires: - if dep not in pkg.requires: - pkg.requires.append(dep) + for dep in package.requires: + if dep not in pkg.requires: + pkg.requires.append(dep) return packages, depths def _solve(self, use_latest=None): - self._branches.append(self._package.python_versions) + if self._provider._overrides: + self._overrides.append(self._provider._overrides) locked = {} for package in self._locked.packages: @@ -174,10 +214,8 @@ def _solve(self, use_latest=None): ) packages = result.packages - except CompatibilityError as e: - return self.solve_in_compatibility_mode( - e.constraints, use_latest=use_latest - ) + except OverrideNeeded as e: + return self.solve_in_compatibility_mode(e.overrides, use_latest=use_latest) except SolveFailure as e: raise SolverProblemError(e) @@ -186,18 +224,10 @@ def _solve(self, use_latest=None): depths = [] final_packages = [] for package in packages: - category, optional, marker, depth = self._get_tags_for_package( - package, graph - ) - - if marker is None: - marker = AnyMarker() - if marker.is_empty(): - continue + category, optional, depth = self._get_tags_for_package(package, graph) package.category = category package.optional = optional - package.marker = marker depths.append(depth) final_packages.append(package) @@ -210,21 +240,15 @@ def _build_graph( if not previous: category = "dev" optional = True - marker = package.marker else: category = dep.category optional = dep.is_optional() and not dep.is_activated() - intersection = previous["marker"].intersect(previous_dep.marker) - intersection = intersection.intersect(package.marker) - - marker = intersection childrens = [] # type: List[Dict[str, Any]] graph = { "name": package.name, "category": category, "optional": optional, - "marker": marker, "children": childrens, } @@ -283,9 +307,6 @@ def _build_graph( child_graph["optional"] = True if existing: - existing["marker"] = existing["marker"].union( - child_graph["marker"] - ) continue childrens.append(child_graph) @@ -295,7 +316,6 @@ def _build_graph( def _get_tags_for_package(self, package, graph, depth=0): categories = ["dev"] optionals = [True] - markers = [] _depths = [0] children = graph["children"] @@ -303,10 +323,9 @@ def _get_tags_for_package(self, package, graph, depth=0): if child["name"] == package.name: category = child["category"] optional = child["optional"] - marker = child["marker"] _depths.append(depth) else: - (category, optional, marker, _depth) = self._get_tags_for_package( + (category, optional, _depth) = self._get_tags_for_package( package, child, depth=depth + 1 ) @@ -314,8 +333,6 @@ def _get_tags_for_package(self, package, graph, depth=0): categories.append(category) optionals.append(optional) - if marker is not None: - markers.append(marker) if "main" in categories: category = "main" @@ -326,11 +343,4 @@ def _get_tags_for_package(self, package, graph, depth=0): depth = max(*(_depths + [0])) - if not markers: - marker = None - else: - marker = markers[0] - for m in markers[1:]: - marker = marker.union(m) - - return category, optional, marker, depth + return category, optional, depth diff --git a/poetry/repositories/base_repository.py b/poetry/repositories/base_repository.py index f051abef3b3..049494766b4 100644 --- a/poetry/repositories/base_repository.py +++ b/poetry/repositories/base_repository.py @@ -1,8 +1,4 @@ class BaseRepository(object): - - SEARCH_FULLTEXT = 0 - SEARCH_NAME = 1 - def __init__(self): self._packages = [] @@ -21,5 +17,5 @@ def find_packages( ): raise NotImplementedError() - def search(self, query, mode=SEARCH_FULLTEXT): + def search(self, query): raise NotImplementedError() diff --git a/poetry/repositories/installed_repository.py b/poetry/repositories/installed_repository.py index c9ebf10b4e0..d25034e1602 100644 --- a/poetry/repositories/installed_repository.py +++ b/poetry/repositories/installed_repository.py @@ -1,44 +1,87 @@ -import re - -from poetry.packages import Package +from poetry.core.packages import Package +from poetry.utils._compat import Path +from poetry.utils._compat import metadata from poetry.utils.env import Env from .repository import Repository +_VENDORS = Path(__file__).parent.parent.joinpath("_vendor") + + class InstalledRepository(Repository): @classmethod def load(cls, env): # type: (Env) -> InstalledRepository """ Load installed packages. - - For now, it uses the pip "freeze" command. """ repo = cls() + seen = set() + + for entry in reversed(env.sys_path): + for distribution in sorted( + metadata.distributions(path=[entry]), key=lambda d: str(d._path), + ): + name = distribution.metadata["name"] + path = Path(str(distribution._path)) + version = distribution.metadata["version"] + package = Package(name, version, version) + package.description = distribution.metadata.get("summary", "") + + if package.name in seen: + continue + + try: + path.relative_to(_VENDORS) + except ValueError: + pass + else: + continue + + seen.add(package.name) + + repo.add_package(package) + + is_standard_package = True + try: + path.relative_to(env.site_packages) + except ValueError: + is_standard_package = False + + if is_standard_package: + if ( + path.name.endswith(".dist-info") + and env.site_packages.joinpath( + "{}.pth".format(package.pretty_name) + ).exists() + ): + with env.site_packages.joinpath( + "{}.pth".format(package.pretty_name) + ).open() as f: + directory = Path(f.readline().strip()) + package.source_type = "directory" + package.source_url = directory.as_posix() + + continue + + src_path = env.path / "src" + + # A VCS dependency should have been installed + # in the src directory. If not, it's a path dependency + try: + path.relative_to(src_path) + + from poetry.core.vcs.git import Git + + git = Git() + revision = git.rev_parse("HEAD", src_path / package.name).strip() + url = git.remote_url(src_path / package.name) - freeze_output = env.run("python", "-m", "pip", "freeze") - for line in freeze_output.split("\n"): - if "==" in line: - name, version = re.split("={2,3}", line) - repo.add_package(Package(name, version, version)) - elif line.startswith("-e "): - line = line[3:].strip() - if line.startswith("git+"): - url = line.lstrip("git+") - if "@" in url: - url, rev = url.rsplit("@", 1) - else: - rev = "master" - - name = url.split("/")[-1].rstrip(".git") - if "#egg=" in rev: - rev, name = rev.split("#egg=") - - package = Package(name, "0.0.0") package.source_type = "git" package.source_url = url - package.source_reference = rev - - repo.add_package(package) + package.source_reference = revision + except ValueError: + package.source_type = "directory" + package.source_url = str(path.parent) return repo diff --git a/poetry/repositories/legacy_repository.py b/poetry/repositories/legacy_repository.py index dea6f5bd640..9c5553be66b 100644 --- a/poetry/repositories/legacy_repository.py +++ b/poetry/repositories/legacy_repository.py @@ -1,20 +1,6 @@ import cgi import re - -try: - import urllib.parse as urlparse -except ImportError: - import urlparse - -try: - from html import unescape -except ImportError: - try: - from html.parser import HTMLParser - except ImportError: - from HTMLParser import HTMLParser - - unescape = HTMLParser().unescape +import warnings from collections import defaultdict from typing import Generator @@ -27,27 +13,44 @@ from cachecontrol.caches.file_cache import FileCache from cachy import CacheManager -import poetry.packages - -from poetry.locations import CACHE_DIR -from poetry.packages import Package -from poetry.packages import dependency_from_pep_508 -from poetry.packages.utils.link import Link -from poetry.semver import parse_constraint -from poetry.semver import Version -from poetry.semver import VersionConstraint -from poetry.semver import VersionRange +from poetry.core.packages import Package +from poetry.core.packages.utils.link import Link +from poetry.core.semver import Version +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint +from poetry.locations import REPOSITORY_CACHE_DIR from poetry.utils._compat import Path from poetry.utils.helpers import canonicalize_name -from poetry.utils.inspector import Inspector from poetry.utils.patterns import wheel_file_re -from poetry.version.markers import InvalidMarker +from ..inspection.info import PackageInfo from .auth import Auth from .exceptions import PackageNotFound from .pypi_repository import PyPiRepository -import warnings + +try: + import urllib.parse as urlparse +except ImportError: + import urlparse + +try: + from html import unescape +except ImportError: + try: + from html.parser import HTMLParser + except ImportError: + from HTMLParser import HTMLParser + + unescape = HTMLParser().unescape + + +try: + from urllib.parse import quote +except ImportError: + from urllib import quote + with warnings.catch_warnings(): warnings.simplefilter("ignore") @@ -155,8 +158,8 @@ def clean_link(self, url): class LegacyRepository(PyPiRepository): def __init__( - self, name, url, auth=None, disable_cache=False - ): # type: (str, str, Optional[Auth], bool) -> None + self, name, url, auth=None, disable_cache=False, cert=None, client_cert=None + ): # type: (str, str, Optional[Auth], bool, Optional[Path], Optional[Path]) -> None if name == "pypi": raise ValueError("The name [pypi] is reserved for repositories") @@ -164,8 +167,9 @@ def __init__( self._name = name self._url = url.rstrip("/") self._auth = auth - self._inspector = Inspector() - self._cache_dir = Path(CACHE_DIR) / "cache" / "repositories" / name + self._client_cert = client_cert + self._cert = cert + self._cache_dir = REPOSITORY_CACHE_DIR / name self._cache = CacheManager( { "default": "releases", @@ -186,8 +190,22 @@ def __init__( if not url_parts.username and self._auth: self._session.auth = self._auth + if self._cert: + self._session.verify = str(self._cert) + + if self._client_cert: + self._session.cert = str(self._client_cert) + self._disable_cache = disable_cache + @property + def cert(self): # type: () -> Optional[Path] + return self._cert + + @property + def client_cert(self): # type: () -> Optional[Path] + return self._client_cert + @property def authenticated_url(self): # type: () -> str if not self._auth: @@ -197,8 +215,8 @@ def authenticated_url(self): # type: () -> str return "{scheme}://{username}:{password}@{netloc}{path}".format( scheme=parsed.scheme, - username=self._auth.auth.username, - password=self._auth.auth.password, + username=quote(self._auth.auth.username, safe=""), + password=quote(self._auth.auth.password, safe=""), netloc=parsed.netloc, path=parsed.path, ) @@ -247,6 +265,7 @@ def find_packages( for version in versions: package = Package(name, version) package.source_type = "legacy" + package.source_reference = self.name package.source_url = self._url if extras is not None: @@ -261,9 +280,7 @@ def find_packages( return packages - def package( - self, name, version, extras=None - ): # type: (...) -> poetry.packages.Package + def package(self, name, version, extras=None): # type: (...) -> Package """ Retrieve the release information. @@ -276,70 +293,15 @@ def package( should be much faster. """ try: - index = self._packages.index( - poetry.packages.Package(name, version, version) - ) + index = self._packages.index(Package(name, version, version)) return self._packages[index] except ValueError: - if extras is None: - extras = [] - - release_info = self.get_release_info(name, version) - - package = poetry.packages.Package(name, version, version) - if release_info["requires_python"]: - package.python_versions = release_info["requires_python"] - + package = super(LegacyRepository, self).package(name, version, extras) package.source_type = "legacy" package.source_url = self._url package.source_reference = self.name - requires_dist = release_info["requires_dist"] or [] - for req in requires_dist: - try: - dependency = dependency_from_pep_508(req) - except InvalidMarker: - # Invalid marker - # We strip the markers hoping for the best - req = req.split(";")[0] - - dependency = dependency_from_pep_508(req) - except ValueError: - # Likely unable to parse constraint so we skip it - self._log( - "Invalid constraint ({}) found in {}-{} dependencies, " - "skipping".format(req, package.name, package.version), - level="debug", - ) - continue - - if dependency.in_extras: - for extra in dependency.in_extras: - if extra not in package.extras: - package.extras[extra] = [] - - package.extras[extra].append(dependency) - - if not dependency.is_optional(): - package.requires.append(dependency) - - # Adding description - package.description = release_info.get("summary", "") - - # Adding hashes information - package.hashes = release_info["digests"] - - # Activate extra dependencies - for extra in extras: - if extra in package.extras: - for dep in package.extras[extra]: - dep.activate() - - package.requires += package.extras[extra] - - self._packages.append(package) - return package def _get_release_info(self, name, version): # type: (str, str) -> dict @@ -347,15 +309,16 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict if page is None: raise PackageNotFound('No package named "{}"'.format(name)) - data = { - "name": name, - "version": version, - "summary": "", - "requires_dist": [], - "requires_python": None, - "digests": [], - "_cache_version": str(self.CACHE_VERSION), - } + data = PackageInfo( + name=name, + version=version, + summary="", + platform=None, + requires_dist=[], + requires_python=None, + files=[], + cache_version=str(self.CACHE_VERSION), + ) links = list(page.links_for_version(Version.parse(version))) if not links: @@ -365,7 +328,7 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict ) ) urls = defaultdict(list) - hashes = [] + files = [] for link in links: if link.is_wheel: urls["bdist_wheel"].append(link.url) @@ -374,32 +337,24 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict ): urls["sdist"].append(link.url) - hash = link.hash - if link.hash_name == "sha256": - hashes.append(hash) - elif hash: - hashes.append(link.hash_name + ":" + hash) + h = link.hash + if h: + h = link.hash_name + ":" + link.hash + files.append({"file": link.filename, "hash": h}) - data["digests"] = hashes + data.files = files info = self._get_info_from_urls(urls) - data["summary"] = info["summary"] - data["requires_dist"] = info["requires_dist"] - data["requires_python"] = info["requires_python"] - - return data + data.summary = info.summary + data.requires_dist = info.requires_dist + data.requires_python = info.requires_python - def _download(self, url, dest): # type: (str, str) -> None - r = self._session.get(url, stream=True) - with open(dest, "wb") as f: - for chunk in r.iter_content(chunk_size=1024): - if chunk: - f.write(chunk) + return data.asdict() def _get(self, endpoint): # type: (str) -> Union[Page, None] url = self._url + endpoint - response = self._session.get(url) + response = self.session.get(url) if response.status_code == 404: return diff --git a/poetry/repositories/pool.py b/poetry/repositories/pool.py index 0f65d05a7e9..35904a27b8a 100644 --- a/poetry/repositories/pool.py +++ b/poetry/repositories/pool.py @@ -94,7 +94,7 @@ def has_package(self, package): def package( self, name, version, extras=None, repository=None - ): # type: (str, str, List[str], str) -> Package + ): # type: (str, str, List[str], str) -> "Package" if ( repository is not None and repository not in self._lookup @@ -151,7 +151,7 @@ def find_packages( return packages - def search(self, query, mode=BaseRepository.SEARCH_FULLTEXT): + def search(self, query): from .legacy_repository import LegacyRepository results = [] @@ -159,6 +159,6 @@ def search(self, query, mode=BaseRepository.SEARCH_FULLTEXT): if isinstance(repository, LegacyRepository): continue - results += repository.search(query, mode=mode) + results += repository.search(query) return results diff --git a/poetry/repositories/pypi_repository.py b/poetry/repositories/pypi_repository.py index fe08e380ebc..e53a2af555e 100644 --- a/poetry/repositories/pypi_repository.py +++ b/poetry/repositories/pypi_repository.py @@ -1,63 +1,62 @@ import logging import os - from collections import defaultdict from typing import Dict from typing import List from typing import Union -try: - import urllib.parse as urlparse -except ImportError: - import urlparse - -try: - from xmlrpc.client import ServerProxy -except ImportError: - from xmlrpclib import ServerProxy +import requests from cachecontrol import CacheControl from cachecontrol.caches.file_cache import FileCache +from cachecontrol.controller import logger as cache_control_logger from cachy import CacheManager -from requests import get -from requests import session - -from poetry.locations import CACHE_DIR -from poetry.packages import dependency_from_pep_508 -from poetry.packages import Package -from poetry.packages.utils.link import Link -from poetry.semver import parse_constraint -from poetry.semver import VersionConstraint -from poetry.semver import VersionRange -from poetry.semver.exceptions import ParseVersionError +from html5lib.html5parser import parse + +from poetry.core.packages import Package +from poetry.core.packages import dependency_from_pep_508 +from poetry.core.packages.utils.link import Link +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint +from poetry.core.semver.exceptions import ParseVersionError +from poetry.core.version.markers import parse_marker +from poetry.locations import REPOSITORY_CACHE_DIR from poetry.utils._compat import Path from poetry.utils._compat import to_str -from poetry.utils.helpers import parse_requires +from poetry.utils.helpers import download_file from poetry.utils.helpers import temporary_directory -from poetry.utils.inspector import Inspector from poetry.utils.patterns import wheel_file_re -from poetry.utils.setup_reader import SetupReader -from poetry.version.markers import InvalidMarker -from poetry.version.markers import parse_marker +from ..inspection.info import PackageInfo from .exceptions import PackageNotFound -from .repository import Repository +from .remote_repository import RemoteRepository + + +try: + import urllib.parse as urlparse +except ImportError: + import urlparse +cache_control_logger.setLevel(logging.ERROR) + logger = logging.getLogger(__name__) -class PyPiRepository(Repository): +class PyPiRepository(RemoteRepository): - CACHE_VERSION = parse_constraint("0.12.0") + CACHE_VERSION = parse_constraint("1.0.0") def __init__(self, url="https://pypi.org/", disable_cache=False, fallback=True): - self._url = url + super(PyPiRepository, self).__init__(url.rstrip("/") + "/simple/") + + self._base_url = url self._disable_cache = disable_cache self._fallback = fallback - release_cache_dir = Path(CACHE_DIR) / "cache" / "repositories" / "pypi" + release_cache_dir = REPOSITORY_CACHE_DIR / "pypi" self._cache = CacheManager( { "default": "releases", @@ -69,22 +68,16 @@ def __init__(self, url="https://pypi.org/", disable_cache=False, fallback=True): } ) + self._cache_control_cache = FileCache(str(release_cache_dir / "_http")) self._session = CacheControl( - session(), cache=FileCache(str(release_cache_dir / "_http")) + requests.session(), cache=self._cache_control_cache ) - self._inspector = Inspector() - - super(PyPiRepository, self).__init__() self._name = "PyPI" @property - def url(self): # type: () -> str - return self._url - - @property - def authenticated_url(self): # type: () -> str - return self._url + def session(self): + return self._session def find_packages( self, @@ -165,83 +158,35 @@ def package( name, # type: str version, # type: str extras=None, # type: (Union[list, None]) - ): # type: (...) -> Union[Package, None] - if extras is None: - extras = [] - - release_info = self.get_release_info(name, version) - package = Package(name, version, version) - requires_dist = release_info["requires_dist"] or [] - for req in requires_dist: - try: - dependency = dependency_from_pep_508(req) - except InvalidMarker: - # Invalid marker - # We strip the markers hoping for the best - req = req.split(";")[0] - - dependency = dependency_from_pep_508(req) - except ValueError: - # Likely unable to parse constraint so we skip it - self._log( - "Invalid constraint ({}) found in {}-{} dependencies, " - "skipping".format(req, package.name, package.version), - level="debug", - ) - continue - - if dependency.in_extras: - for extra in dependency.in_extras: - if extra not in package.extras: - package.extras[extra] = [] - - package.extras[extra].append(dependency) - - if not dependency.is_optional(): - package.requires.append(dependency) - - # Adding description - package.description = release_info.get("summary", "") - - if release_info["requires_python"]: - package.python_versions = release_info["requires_python"] - - if release_info["platform"]: - package.platform = release_info["platform"] - - # Adding hashes information - package.hashes = release_info["digests"] - - # Activate extra dependencies - for extra in extras: - if extra in package.extras: - for dep in package.extras[extra]: - dep.activate() - - package.requires += package.extras[extra] + ): # type: (...) -> Package + return self.get_release_info(name, version).to_package(name=name, extras=extras) - return package - - def search(self, query, mode=0): + def search(self, query): results = [] - search = {"name": query} + search = {"q": query} + + response = requests.session().get(self._base_url + "search", params=search) + content = parse(response.content, namespaceHTMLElements=False) + for result in content.findall(".//*[@class='package-snippet']"): + name = result.find("h3/*[@class='package-snippet__name']").text + version = result.find("h3/*[@class='package-snippet__version']").text - if mode == self.SEARCH_FULLTEXT: - search["summary"] = query + if not name or not version: + continue - client = ServerProxy("https://pypi.python.org/pypi") - hits = client.search(search, "or") + description = result.find("p[@class='package-snippet__description']").text + if not description: + description = "" - for hit in hits: try: - result = Package(hit["name"], hit["version"], hit["version"]) - result.description = to_str(hit["summary"]) + result = Package(name, version, description) + result.description = to_str(description.strip()) results.append(result) except ParseVersionError: self._log( 'Unable to parse version "{}" for the {} package, skipping'.format( - hit["version"], hit["name"] + version, name ), level="debug", ) @@ -269,7 +214,7 @@ def _get_package_info(self, name): # type: (str) -> dict return data - def get_release_info(self, name, version): # type: (str, str) -> dict + def get_release_info(self, name, version): # type: (str, str) -> PackageInfo """ Return the release information given a package name and a version. @@ -277,7 +222,7 @@ def get_release_info(self, name, version): # type: (str, str) -> dict or retrieved from the remote server. """ if self._disable_cache: - return self._get_release_info(name, version) + return PackageInfo.load(self._get_release_info(name, version)) cached = self._cache.remember_forever( "{}:{}".format(name, version), lambda: self._get_release_info(name, version) @@ -294,7 +239,7 @@ def get_release_info(self, name, version): # type: (str, str) -> dict self._cache.forever("{}:{}".format(name, version), cached) - return cached + return PackageInfo.load(cached) def _get_release_info(self, name, version): # type: (str, str) -> dict self._log("Getting info for {} ({}) from PyPI".format(name, version), "debug") @@ -304,16 +249,17 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict raise PackageNotFound("Package [{}] not found.".format(name)) info = json_data["info"] - data = { - "name": info["name"], - "version": info["version"], - "summary": info["summary"], - "platform": info["platform"], - "requires_dist": info["requires_dist"], - "requires_python": info["requires_python"], - "digests": [], - "_cache_version": str(self.CACHE_VERSION), - } + + data = PackageInfo( + name=info["name"], + version=info["version"], + summary=info["summary"], + platform=info["platform"], + requires_dist=info["requires_dist"], + requires_python=info["requires_python"], + files=info.get("files", []), + cache_version=str(self.CACHE_VERSION), + ) try: version_info = json_data["releases"][version] @@ -321,9 +267,14 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict version_info = [] for file_info in version_info: - data["digests"].append(file_info["digests"]["sha256"]) + data.files.append( + { + "file": file_info["filename"], + "hash": "sha256:" + file_info["digests"]["sha256"], + } + ) - if self._fallback and data["requires_dist"] is None: + if self._fallback and data.requires_dist is None: self._log("No dependencies found, downloading archives", level="debug") # No dependencies set (along with other information) # This might be due to actually no dependencies @@ -340,19 +291,26 @@ def _get_release_info(self, name, version): # type: (str, str) -> dict urls[dist_type].append(url["url"]) if not urls: - return data + return data.asdict() info = self._get_info_from_urls(urls) - data["requires_dist"] = info["requires_dist"] + data.requires_dist = info.requires_dist - if not data["requires_python"]: - data["requires_python"] = info["requires_python"] + if not data.requires_python: + data.requires_python = info.requires_python - return data + return data.asdict() def _get(self, endpoint): # type: (str) -> Union[dict, None] - json_response = self._session.get(self._url + endpoint) + try: + json_response = self.session.get(self._base_url + endpoint) + except requests.exceptions.TooManyRedirects: + # Cache control redirect loop. + # We try to remove the cache and try again + self._cache_control_cache.delete(self._base_url + endpoint) + json_response = self.session.get(self._base_url + endpoint) + if json_response.status_code == 404: return None @@ -360,9 +318,7 @@ def _get(self, endpoint): # type: (str) -> Union[dict, None] return json_data - def _get_info_from_urls( - self, urls - ): # type: (Dict[str, List[str]]) -> Dict[str, Union[str, List, None]] + def _get_info_from_urls(self, urls): # type: (Dict[str, List[str]]) -> PackageInfo # Checking wheels first as they are more likely to hold # the necessary information if "bdist_wheel" in urls: @@ -397,24 +353,24 @@ def _get_info_from_urls( if universal_wheel is not None: return self._get_info_from_wheel(universal_wheel) - info = {} + info = None if universal_python2_wheel and universal_python3_wheel: info = self._get_info_from_wheel(universal_python2_wheel) py3_info = self._get_info_from_wheel(universal_python3_wheel) - if py3_info["requires_dist"]: - if not info["requires_dist"]: - info["requires_dist"] = py3_info["requires_dist"] + if py3_info.requires_dist: + if not info.requires_dist: + info.requires_dist = py3_info.requires_dist return info py2_requires_dist = set( dependency_from_pep_508(r).to_pep_508() - for r in info["requires_dist"] + for r in info.requires_dist ) py3_requires_dist = set( dependency_from_pep_508(r).to_pep_508() - for r in py3_info["requires_dist"] + for r in py3_info.requires_dist ) base_requires_dist = py2_requires_dist & py3_requires_dist py2_only_requires_dist = py2_requires_dist - py3_requires_dist @@ -436,7 +392,7 @@ def _get_info_from_urls( ) requires_dist.append(dep.to_pep_508()) - info["requires_dist"] = sorted(list(set(requires_dist))) + info.requires_dist = sorted(list(set(requires_dist))) if info: return info @@ -454,9 +410,7 @@ def _get_info_from_urls( return self._get_info_from_sdist(urls["sdist"][0]) - def _get_info_from_wheel( - self, url - ): # type: (str) -> Dict[str, Union[str, List, None]] + def _get_info_from_wheel(self, url): # type: (str) -> PackageInfo self._log( "Downloading wheel: {}".format(urlparse.urlparse(url).path.rsplit("/")[-1]), level="debug", @@ -468,11 +422,9 @@ def _get_info_from_wheel( filepath = Path(temp_dir) / filename self._download(url, str(filepath)) - return self._inspector.inspect_wheel(filepath) + return PackageInfo.from_wheel(filepath) - def _get_info_from_sdist( - self, url - ): # type: (str) -> Dict[str, Union[str, List, None]] + def _get_info_from_sdist(self, url): # type: (str) -> PackageInfo self._log( "Downloading sdist: {}".format(urlparse.urlparse(url).path.rsplit("/")[-1]), level="debug", @@ -484,16 +436,10 @@ def _get_info_from_sdist( filepath = Path(temp_dir) / filename self._download(url, str(filepath)) - return self._inspector.inspect_sdist(filepath) + return PackageInfo.from_sdist(filepath) def _download(self, url, dest): # type: (str, str) -> None - r = get(url, stream=True) - r.raise_for_status() - - with open(dest, "wb") as f: - for chunk in r.iter_content(chunk_size=1024): - if chunk: - f.write(chunk) + return download_file(url, dest, session=self.session) def _log(self, msg, level="info"): - getattr(logger, level)("{}: {}".format(self._name, msg)) + getattr(logger, level)("{}: {}".format(self._name, msg)) diff --git a/poetry/repositories/remote_repository.py b/poetry/repositories/remote_repository.py new file mode 100644 index 00000000000..7717740d87c --- /dev/null +++ b/poetry/repositories/remote_repository.py @@ -0,0 +1,16 @@ +from .repository import Repository + + +class RemoteRepository(Repository): + def __init__(self, url): # type: (str) -> None + self._url = url + + super(RemoteRepository, self).__init__() + + @property + def url(self): # type: () -> str + return self._url + + @property + def authenticated_url(self): # type: () -> str + return self._url diff --git a/poetry/repositories/repository.py b/poetry/repositories/repository.py index 73f1528db71..00b43207d62 100644 --- a/poetry/repositories/repository.py +++ b/poetry/repositories/repository.py @@ -1,6 +1,6 @@ -from poetry.semver import parse_constraint -from poetry.semver import VersionConstraint -from poetry.semver import VersionRange +from poetry.core.semver import VersionConstraint +from poetry.core.semver import VersionRange +from poetry.core.semver import parse_constraint from .base_repository import BaseRepository @@ -64,7 +64,13 @@ def find_packages( for package in self.packages: if name == package.name: - if package.is_prerelease() and not allow_prereleases: + if ( + package.is_prerelease() + and not allow_prereleases + and not package.source_type + ): + # If prereleases are not allowed and the package is a prerelease + # and is a standard package then we skip it continue if constraint.allows(package.version): @@ -109,7 +115,7 @@ def remove_package(self, package): if index is not None: del self._packages[index] - def search(self, query, mode=0): + def search(self, query): results = [] for package in self.packages: diff --git a/poetry/semver/__init__.py b/poetry/semver/__init__.py deleted file mode 100644 index 40b3cd4ec0c..00000000000 --- a/poetry/semver/__init__.py +++ /dev/null @@ -1,164 +0,0 @@ -import re - -from .empty_constraint import EmptyConstraint -from .patterns import BASIC_CONSTRAINT -from .patterns import CARET_CONSTRAINT -from .patterns import TILDE_CONSTRAINT -from .patterns import TILDE_PEP440_CONSTRAINT -from .patterns import X_CONSTRAINT -from .version import Version -from .version_constraint import VersionConstraint -from .version_range import VersionRange -from .version_union import VersionUnion - - -def parse_constraint(constraints): # type: (str) -> VersionConstraint - if constraints == "*": - return VersionRange() - - or_constraints = re.split(r"\s*\|\|?\s*", constraints.strip()) - or_groups = [] - for constraints in or_constraints: - and_constraints = re.split( - "(?< ,]) *(? 1: - for constraint in and_constraints: - constraint_objects.append(parse_single_constraint(constraint)) - else: - constraint_objects.append(parse_single_constraint(and_constraints[0])) - - if len(constraint_objects) == 1: - constraint = constraint_objects[0] - else: - constraint = constraint_objects[0] - for next_constraint in constraint_objects[1:]: - constraint = constraint.intersect(next_constraint) - - or_groups.append(constraint) - - if len(or_groups) == 1: - return or_groups[0] - else: - return VersionUnion.of(*or_groups) - - -def parse_single_constraint(constraint): # type: (str) -> VersionConstraint - m = re.match(r"(?i)^v?[xX*](\.[xX*])*$", constraint) - if m: - return VersionRange() - - # Tilde range - m = TILDE_CONSTRAINT.match(constraint) - if m: - version = Version.parse(m.group(1)) - - high = version.stable.next_minor - if len(m.group(1).split(".")) == 1: - high = version.stable.next_major - - return VersionRange( - version, high, include_min=True, always_include_max_prerelease=True - ) - - # PEP 440 Tilde range (~=) - m = TILDE_PEP440_CONSTRAINT.match(constraint) - if m: - precision = 1 - if m.group(3): - precision += 1 - - if m.group(4): - precision += 1 - - version = Version.parse(m.group(1)) - - if precision == 2: - low = version - high = version.stable.next_major - else: - low = Version(version.major, version.minor, 0) - high = version.stable.next_minor - - return VersionRange( - low, high, include_min=True, always_include_max_prerelease=True - ) - - # Caret range - m = CARET_CONSTRAINT.match(constraint) - if m: - version = Version.parse(m.group(1)) - - return VersionRange( - version, - version.next_breaking, - include_min=True, - always_include_max_prerelease=True, - ) - - # X Range - m = X_CONSTRAINT.match(constraint) - if m: - op = m.group(1) - major = int(m.group(2)) - minor = m.group(3) - - if minor is not None: - version = Version(major, int(minor), 0) - - result = VersionRange( - version, - version.next_minor, - include_min=True, - always_include_max_prerelease=True, - ) - else: - if major == 0: - result = VersionRange(max=Version(1, 0, 0)) - else: - version = Version(major, 0, 0) - - result = VersionRange( - version, - version.next_major, - include_min=True, - always_include_max_prerelease=True, - ) - - if op == "!=": - result = VersionRange().difference(result) - - return result - - # Basic comparator - m = BASIC_CONSTRAINT.match(constraint) - if m: - op = m.group(1) - version = m.group(2) - - if version == "dev": - version = "0.0-dev" - - try: - version = Version.parse(version) - except ValueError: - raise ValueError( - "Could not parse version constraint: {}".format(constraint) - ) - - if op == "<": - return VersionRange(max=version) - elif op == "<=": - return VersionRange(max=version, include_max=True) - elif op == ">": - return VersionRange(min=version) - elif op == ">=": - return VersionRange(min=version, include_min=True) - elif op == "!=": - return VersionUnion(VersionRange(max=version), VersionRange(min=version)) - else: - return version - - raise ValueError("Could not parse version constraint: {}".format(constraint)) diff --git a/poetry/semver/empty_constraint.py b/poetry/semver/empty_constraint.py deleted file mode 100644 index 3c5e27e1027..00000000000 --- a/poetry/semver/empty_constraint.py +++ /dev/null @@ -1,30 +0,0 @@ -from .version_constraint import VersionConstraint - - -class EmptyConstraint(VersionConstraint): - def is_empty(self): - return True - - def is_any(self): - return False - - def allows(self, version): - return False - - def allows_all(self, other): - return other.is_empty() - - def allows_any(self, other): - return False - - def intersect(self, other): - return self - - def union(self, other): - return other - - def difference(self, other): - return self - - def __str__(self): - return "" diff --git a/poetry/semver/exceptions.py b/poetry/semver/exceptions.py deleted file mode 100644 index f0eab0db7ea..00000000000 --- a/poetry/semver/exceptions.py +++ /dev/null @@ -1,2 +0,0 @@ -class ParseVersionError(ValueError): - pass diff --git a/poetry/semver/patterns.py b/poetry/semver/patterns.py deleted file mode 100644 index 7fee2c51c84..00000000000 --- a/poetry/semver/patterns.py +++ /dev/null @@ -1,21 +0,0 @@ -import re - -MODIFIERS = ( - "[._-]?" - r"((?!post)(?:beta|b|c|pre|RC|alpha|a|patch|pl|p|dev)(?:(?:[.-]?\d+)*)?)?" - r"([+-]?([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?" -) - -_COMPLETE_VERSION = r"v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?{}(?:\+[^\s]+)?".format( - MODIFIERS -) - -COMPLETE_VERSION = re.compile("(?i)" + _COMPLETE_VERSION) - -CARET_CONSTRAINT = re.compile(r"(?i)^\^({})$".format(_COMPLETE_VERSION)) -TILDE_CONSTRAINT = re.compile("(?i)^~(?!=)({})$".format(_COMPLETE_VERSION)) -TILDE_PEP440_CONSTRAINT = re.compile("(?i)^~=({})$".format(_COMPLETE_VERSION)) -X_CONSTRAINT = re.compile(r"^(!=|==)?\s*v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$") -BASIC_CONSTRAINT = re.compile( - r"(?i)^(<>|!=|>=?|<=?|==?)?\s*({}|dev)".format(_COMPLETE_VERSION) -) diff --git a/poetry/semver/version.py b/poetry/semver/version.py deleted file mode 100644 index 1ce123364a6..00000000000 --- a/poetry/semver/version.py +++ /dev/null @@ -1,466 +0,0 @@ -import re - -from typing import List -from typing import Optional - -from .empty_constraint import EmptyConstraint -from .exceptions import ParseVersionError -from .patterns import COMPLETE_VERSION -from .version_constraint import VersionConstraint -from .version_range import VersionRange -from .version_union import VersionUnion - - -class Version(VersionRange): - """ - A parsed semantic version number. - """ - - def __init__( - self, - major, # type: int - minor=None, # type: Optional[int] - patch=None, # type: Optional[int] - rest=None, # type: Optional[int] - pre=None, # type: Optional[str] - build=None, # type: Optional[str] - text=None, # type: Optional[str] - precision=None, # type: Optional[int] - ): # type: (...) -> None - self._major = int(major) - self._precision = None - if precision is None: - self._precision = 1 - - if minor is None: - minor = 0 - else: - if self._precision is not None: - self._precision += 1 - - self._minor = int(minor) - - if patch is None: - patch = 0 - else: - if self._precision is not None: - self._precision += 1 - - if rest is None: - rest = 0 - else: - if self._precision is not None: - self._precision += 1 - - if precision is not None: - self._precision = precision - - self._patch = int(patch) - self._rest = int(rest) - - if text is None: - parts = [str(major)] - if self._precision >= 2 or minor != 0: - parts.append(str(minor)) - - if self._precision >= 3 or patch != 0: - parts.append(str(patch)) - - if self._precision >= 4 or rest != 0: - parts.append(str(rest)) - - text = ".".join(parts) - if pre: - text += "-{}".format(pre) - - if build: - text += "+{}".format(build) - - self._text = text - - pre = self._normalize_prerelease(pre) - - self._prerelease = [] - if pre is not None: - self._prerelease = self._split_parts(pre) - - build = self._normalize_build(build) - - self._build = [] - if build is not None: - if build.startswith(("-", "+")): - build = build[1:] - - self._build = self._split_parts(build) - - @property - def major(self): # type: () -> int - return self._major - - @property - def minor(self): # type: () -> int - return self._minor - - @property - def patch(self): # type: () -> int - return self._patch - - @property - def rest(self): # type: () -> int - return self._rest - - @property - def prerelease(self): # type: () -> List[str] - return self._prerelease - - @property - def build(self): # type: () -> List[str] - return self._build - - @property - def text(self): - return self._text - - @property - def precision(self): # type: () -> int - return self._precision - - @property - def stable(self): - if not self.is_prerelease(): - return self - - return self.next_patch - - @property - def next_major(self): # type: () -> Version - if self.is_prerelease() and self.minor == 0 and self.patch == 0: - return Version(self.major, self.minor, self.patch) - - return self._increment_major() - - @property - def next_minor(self): # type: () -> Version - if self.is_prerelease() and self.patch == 0: - return Version(self.major, self.minor, self.patch) - - return self._increment_minor() - - @property - def next_patch(self): # type: () -> Version - if self.is_prerelease(): - return Version(self.major, self.minor, self.patch) - - return self._increment_patch() - - @property - def next_breaking(self): # type: () -> Version - if self.major == 0: - if self.minor != 0: - return self._increment_minor() - - if self._precision == 1: - return self._increment_major() - elif self._precision == 2: - return self._increment_minor() - - return self._increment_patch() - - return self._increment_major() - - @property - def first_prerelease(self): # type: () -> Version - return Version.parse( - "{}.{}.{}-alpha.0".format(self.major, self.minor, self.patch) - ) - - @property - def min(self): - return self - - @property - def max(self): - return self - - @property - def full_max(self): - return self - - @property - def include_min(self): - return True - - @property - def include_max(self): - return True - - @classmethod - def parse(cls, text): # type: (str) -> Version - try: - match = COMPLETE_VERSION.match(text) - except TypeError: - match = None - - if match is None: - raise ParseVersionError('Unable to parse "{}".'.format(text)) - - text = text.rstrip(".") - - major = int(match.group(1)) - minor = int(match.group(2)) if match.group(2) else None - patch = int(match.group(3)) if match.group(3) else None - rest = int(match.group(4)) if match.group(4) else None - - pre = match.group(5) - build = match.group(6) - - if build: - build = build.lstrip("+") - - return Version(major, minor, patch, rest, pre, build, text) - - def is_any(self): - return False - - def is_empty(self): - return False - - def is_prerelease(self): # type: () -> bool - return len(self._prerelease) > 0 - - def allows(self, version): # type: (Version) -> bool - return self == version - - def allows_all(self, other): # type: (VersionConstraint) -> bool - return other.is_empty() or other == self - - def allows_any(self, other): # type: (VersionConstraint) -> bool - return other.allows(self) - - def intersect(self, other): # type: (VersionConstraint) -> VersionConstraint - if other.allows(self): - return self - - return EmptyConstraint() - - def union(self, other): # type: (VersionConstraint) -> VersionConstraint - from .version_range import VersionRange - - if other.allows(self): - return other - - if isinstance(other, VersionRange): - if other.min == self: - return VersionRange( - other.min, - other.max, - include_min=True, - include_max=other.include_max, - ) - - if other.max == self: - return VersionRange( - other.min, - other.max, - include_min=other.include_min, - include_max=True, - ) - - return VersionUnion.of(self, other) - - def difference(self, other): # type: (VersionConstraint) -> VersionConstraint - if other.allows(self): - return EmptyConstraint() - - return self - - def equals_without_prerelease(self, other): # type: (Version) -> bool - return ( - self.major == other.major - and self.minor == other.minor - and self.patch == other.patch - ) - - def _increment_major(self): # type: () -> Version - return Version(self.major + 1, 0, 0, precision=self._precision) - - def _increment_minor(self): # type: () -> Version - return Version(self.major, self.minor + 1, 0, precision=self._precision) - - def _increment_patch(self): # type: () -> Version - return Version( - self.major, self.minor, self.patch + 1, precision=self._precision - ) - - def _normalize_prerelease(self, pre): # type: (str) -> str - if not pre: - return - - m = re.match(r"(?i)^(a|alpha|b|beta|c|pre|rc|dev)[-.]?(\d+)?$", pre) - if not m: - return - - modifier = m.group(1) - number = m.group(2) - - if number is None: - number = 0 - - if modifier == "a": - modifier = "alpha" - elif modifier == "b": - modifier = "beta" - elif modifier in {"c", "pre"}: - modifier = "rc" - elif modifier == "dev": - modifier = "alpha" - - return "{}.{}".format(modifier, number) - - def _normalize_build(self, build): # type: (str) -> str - if not build: - return - - if build.startswith("post"): - build = build.lstrip("post") - - if not build: - return - - return build - - def _split_parts(self, text): # type: (str) -> List[Union[str, int]] - parts = text.split(".") - - for i, part in enumerate(parts): - try: - parts[i] = int(part) - except (TypeError, ValueError): - continue - - return parts - - def __lt__(self, other): - return self._cmp(other) < 0 - - def __le__(self, other): - return self._cmp(other) <= 0 - - def __gt__(self, other): - return self._cmp(other) > 0 - - def __ge__(self, other): - return self._cmp(other) >= 0 - - def _cmp(self, other): - if not isinstance(other, VersionConstraint): - return NotImplemented - - if not isinstance(other, Version): - return -other._cmp(self) - - if self.major != other.major: - return self._cmp_parts(self.major, other.major) - - if self.minor != other.minor: - return self._cmp_parts(self.minor, other.minor) - - if self.patch != other.patch: - return self._cmp_parts(self.patch, other.patch) - - if self.rest != other.rest: - return self._cmp_parts(self.rest, other.rest) - - # Pre-releases always come before no pre-release string. - if not self.is_prerelease() and other.is_prerelease(): - return 1 - - if not other.is_prerelease() and self.is_prerelease(): - return -1 - - comparison = self._cmp_lists(self.prerelease, other.prerelease) - if comparison != 0: - return comparison - - # Builds always come after no build string. - if not self.build and other.build: - return -1 - - if not other.build and self.build: - return 1 - - return self._cmp_lists(self.build, other.build) - - def _cmp_parts(self, a, b): - if a < b: - return -1 - elif a > b: - return 1 - - return 0 - - def _cmp_lists(self, a, b): # type: (List, List) -> int - for i in range(max(len(a), len(b))): - a_part = None - if i < len(a): - a_part = a[i] - - b_part = None - if i < len(b): - b_part = b[i] - - if a_part == b_part: - continue - - # Missing parts come after present ones. - if a_part is None: - return -1 - - if b_part is None: - return 1 - - if isinstance(a_part, int): - if isinstance(b_part, int): - return self._cmp_parts(a_part, b_part) - - return -1 - else: - if isinstance(b_part, int): - return 1 - - return self._cmp_parts(a_part, b_part) - - return 0 - - def __eq__(self, other): # type: (Version) -> bool - if not isinstance(other, Version): - return NotImplemented - - return ( - self._major == other.major - and self._minor == other.minor - and self._patch == other.patch - and self._rest == other.rest - and self._prerelease == other.prerelease - and self._build == other.build - ) - - def __ne__(self, other): - return not self == other - - def __str__(self): - return self._text - - def __repr__(self): - return "".format(str(self)) - - def __hash__(self): - return hash( - ( - self.major, - self.minor, - self.patch, - ".".join(str(p) for p in self.prerelease), - ".".join(str(p) for p in self.build), - ) - ) diff --git a/poetry/semver/version_constraint.py b/poetry/semver/version_constraint.py deleted file mode 100644 index 267a4ea0c13..00000000000 --- a/poetry/semver/version_constraint.py +++ /dev/null @@ -1,24 +0,0 @@ -class VersionConstraint: - def is_empty(self): # type: () -> bool - raise NotImplementedError() - - def is_any(self): # type: () -> bool - raise NotImplementedError() - - def allows(self, version): # type: (Version) -> bool - raise NotImplementedError() - - def allows_all(self, other): # type: (VersionConstraint) -> bool - raise NotImplementedError() - - def allows_any(self, other): # type: (VersionConstraint) -> bool - raise NotImplementedError() - - def intersect(self, other): # type: (VersionConstraint) -> VersionConstraint - raise NotImplementedError() - - def union(self, other): # type: (VersionConstraint) -> VersionConstraint - raise NotImplementedError() - - def difference(self, other): # type: (VersionConstraint) -> VersionConstraint - raise NotImplementedError() diff --git a/poetry/semver/version_range.py b/poetry/semver/version_range.py deleted file mode 100644 index 3579473dcb3..00000000000 --- a/poetry/semver/version_range.py +++ /dev/null @@ -1,448 +0,0 @@ -from .empty_constraint import EmptyConstraint -from .version_constraint import VersionConstraint -from .version_union import VersionUnion - - -class VersionRange(VersionConstraint): - def __init__( - self, - min=None, - max=None, - include_min=False, - include_max=False, - always_include_max_prerelease=False, - ): - full_max = max - if ( - always_include_max_prerelease - and not include_max - and not full_max.is_prerelease() - and not full_max.build - and ( - min is None - or not min.is_prerelease() - or not min.equals_without_prerelease(full_max) - ) - ): - full_max = full_max.first_prerelease - - self._min = min - self._max = max - self._full_max = full_max - self._include_min = include_min - self._include_max = include_max - - @property - def min(self): - return self._min - - @property - def max(self): - return self._max - - @property - def full_max(self): - return self._full_max - - @property - def include_min(self): - return self._include_min - - @property - def include_max(self): - return self._include_max - - def is_empty(self): - return False - - def is_any(self): - return self._min is None and self._max is None - - def allows(self, other): # type: (Version) -> bool - if self._min is not None: - if other < self._min: - return False - - if not self._include_min and other == self._min: - return False - - if self._max is not None: - if other > self._max: - return False - - if not self._include_max and other == self._max: - return False - - return True - - def allows_all(self, other): # type: (VersionConstraint) -> bool - from .version import Version - - if other.is_empty(): - return True - - if isinstance(other, Version): - return self.allows(other) - - if isinstance(other, VersionUnion): - return all([self.allows_all(constraint) for constraint in other.ranges]) - - if isinstance(other, VersionRange): - return not other.allows_lower(self) and not other.allows_higher(self) - - raise ValueError("Unknown VersionConstraint type {}.".format(other)) - - def allows_any(self, other): # type: (VersionConstraint) -> bool - from .version import Version - - if other.is_empty(): - return False - - if isinstance(other, Version): - return self.allows(other) - - if isinstance(other, VersionUnion): - return any([self.allows_any(constraint) for constraint in other.ranges]) - - if isinstance(other, VersionRange): - return not other.is_strictly_lower(self) and not other.is_strictly_higher( - self - ) - - raise ValueError("Unknown VersionConstraint type {}.".format(other)) - - def intersect(self, other): # type: (VersionConstraint) -> VersionConstraint - from .version import Version - - if other.is_empty(): - return other - - if isinstance(other, VersionUnion): - return other.intersect(self) - - # A range and a Version just yields the version if it's in the range. - if isinstance(other, Version): - if self.allows(other): - return other - - return EmptyConstraint() - - if not isinstance(other, VersionRange): - raise ValueError("Unknown VersionConstraint type {}.".format(other)) - - if self.allows_lower(other): - if self.is_strictly_lower(other): - return EmptyConstraint() - - intersect_min = other.min - intersect_include_min = other.include_min - else: - if other.is_strictly_lower(self): - return EmptyConstraint() - - intersect_min = self._min - intersect_include_min = self._include_min - - if self.allows_higher(other): - intersect_max = other.max - intersect_include_max = other.include_max - else: - intersect_max = self._max - intersect_include_max = self._include_max - - if intersect_min is None and intersect_max is None: - return VersionRange() - - # If the range is just a single version. - if intersect_min == intersect_max: - # Because we already verified that the lower range isn't strictly - # lower, there must be some overlap. - assert intersect_include_min and intersect_include_max - - return intersect_min - - # If we got here, there is an actual range. - return VersionRange( - intersect_min, intersect_max, intersect_include_min, intersect_include_max - ) - - def union(self, other): # type: (VersionConstraint) -> VersionConstraint - from .version import Version - - if isinstance(other, Version): - if self.allows(other): - return self - - if other == self.min: - return VersionRange( - self.min, self.max, include_min=True, include_max=self.include_max - ) - - if other == self.max: - return VersionRange( - self.min, self.max, include_min=self.include_min, include_max=True - ) - - return VersionUnion.of(self, other) - - if isinstance(other, VersionRange): - # If the two ranges don't overlap, we won't be able to create a single - # VersionRange for both of them. - edges_touch = ( - self.max == other.min and (self.include_max or other.include_min) - ) or (self.min == other.max and (self.include_min or other.include_max)) - - if not edges_touch and not self.allows_any(other): - return VersionUnion.of(self, other) - - if self.allows_lower(other): - union_min = self.min - union_include_min = self.include_min - else: - union_min = other.min - union_include_min = other.include_min - - if self.allows_higher(other): - union_max = self.max - union_include_max = self.include_max - else: - union_max = other.max - union_include_max = other.include_max - - return VersionRange( - union_min, - union_max, - include_min=union_include_min, - include_max=union_include_max, - ) - - return VersionUnion.of(self, other) - - def difference(self, other): # type: (VersionConstraint) -> VersionConstraint - from .version import Version - - if other.is_empty(): - return self - - if isinstance(other, Version): - if not self.allows(other): - return self - - if other == self.min: - if not self.include_min: - return self - - return VersionRange(self.min, self.max, False, self.include_max) - - if other == self.max: - if not self.include_max: - return self - - return VersionRange(self.min, self.max, self.include_min, False) - - return VersionUnion.of( - VersionRange(self.min, other, self.include_min, False), - VersionRange(other, self.max, False, self.include_max), - ) - elif isinstance(other, VersionRange): - if not self.allows_any(other): - return self - - if not self.allows_lower(other): - before = None - elif self.min == other.min: - before = self.min - else: - before = VersionRange( - self.min, other.min, self.include_min, not other.include_min - ) - - if not self.allows_higher(other): - after = None - elif self.max == other.max: - after = self.max - else: - after = VersionRange( - other.max, self.max, not other.include_max, self.include_max - ) - - if before is None and after is None: - return EmptyConstraint() - - if before is None: - return after - - if after is None: - return before - - return VersionUnion.of(before, after) - elif isinstance(other, VersionUnion): - ranges = [] # type: List[VersionRange] - current = self - - for range in other.ranges: - # Skip any ranges that are strictly lower than [current]. - if range.is_strictly_lower(current): - continue - - # If we reach a range strictly higher than [current], no more ranges - # will be relevant so we can bail early. - if range.is_strictly_higher(current): - break - - difference = current.difference(range) - if difference.is_empty(): - return EmptyConstraint() - elif isinstance(difference, VersionUnion): - # If [range] split [current] in half, we only need to continue - # checking future ranges against the latter half. - ranges.append(difference.ranges[0]) - current = difference.ranges[-1] - else: - current = difference - - if not ranges: - return current - - return VersionUnion.of(*(ranges + [current])) - - raise ValueError("Unknown VersionConstraint type {}.".format(other)) - - def allows_lower(self, other): # type: (VersionRange) -> bool - if self.min is None: - return other.min is not None - - if other.min is None: - return False - - if self.min < other.min: - return True - - if self.min > other.min: - return False - - return self.include_min and not other.include_min - - def allows_higher(self, other): # type: (VersionRange) -> bool - if self.max is None: - return other.max is not None - - if other.max is None: - return False - - if self.max < other.max: - return False - - if self.max > other.max: - return True - - return self.include_max and not other.include_max - - def is_strictly_lower(self, other): # type: (VersionRange) -> bool - if self.max is None or other.min is None: - return False - - if self.full_max < other.min: - return True - - if self.full_max > other.min: - return False - - return not self.include_max or not other.include_min - - def is_strictly_higher(self, other): # type: (VersionRange) -> bool - return other.is_strictly_lower(self) - - def is_adjacent_to(self, other): # type: (VersionRange) -> bool - if self.max != other.min: - return False - - return ( - self.include_max - and not other.include_min - or not self.include_max - and other.include_min - ) - - def __eq__(self, other): - if not isinstance(other, VersionRange): - return False - - return ( - self._min == other.min - and self._max == other.max - and self._include_min == other.include_min - and self._include_max == other.include_max - ) - - def __lt__(self, other): - return self._cmp(other) < 0 - - def __le__(self, other): - return self._cmp(other) <= 0 - - def __gt__(self, other): - return self._cmp(other) > 0 - - def __ge__(self, other): - return self._cmp(other) >= 0 - - def _cmp(self, other): # type: (VersionRange) -> int - if self.min is None: - if other.min is None: - return self._compare_max(other) - - return -1 - elif other.min is None: - return 1 - - result = self.min._cmp(other.min) - if result != 0: - return result - - if self.include_min != other.include_min: - return -1 if self.include_min else 1 - - return self._compare_max(other) - - def _compare_max(self, other): # type: (VersionRange) -> int - if self.max is None: - if other.max is None: - return 0 - - return 1 - elif other.max is None: - return -1 - - result = self.max._cmp(other.max) - if result != 0: - return result - - if self.include_max != other.include_max: - return 1 if self.include_max else -1 - - return 0 - - def __str__(self): - text = "" - - if self.min is not None: - text += ">=" if self.include_min else ">" - text += self.min.text - - if self.max is not None: - if self.min is not None: - text += "," - - text += "{}{}".format("<=" if self.include_max else "<", self.max.text) - - if self.min is None and self.max is None: - return "*" - - return text - - def __repr__(self): - return "".format(str(self)) - - def __hash__(self): - return hash((self.min, self.max, self.include_min, self.include_max)) diff --git a/poetry/semver/version_union.py b/poetry/semver/version_union.py deleted file mode 100644 index 532864ceed9..00000000000 --- a/poetry/semver/version_union.py +++ /dev/null @@ -1,252 +0,0 @@ -from .empty_constraint import EmptyConstraint -from .version_constraint import VersionConstraint - - -class VersionUnion(VersionConstraint): - """ - A version constraint representing a union of multiple disjoint version - ranges. - - An instance of this will only be created if the version can't be represented - as a non-compound value. - """ - - def __init__(self, *ranges): - self._ranges = list(ranges) - - @property - def ranges(self): - return self._ranges - - @classmethod - def of(cls, *ranges): - from .version_range import VersionRange - - flattened = [] - for constraint in ranges: - if constraint.is_empty(): - continue - - if isinstance(constraint, VersionUnion): - flattened += constraint.ranges - continue - - flattened.append(constraint) - - if not flattened: - return EmptyConstraint() - - if any([constraint.is_any() for constraint in flattened]): - return VersionRange() - - # Only allow Versions and VersionRanges here so we can more easily reason - # about everything in flattened. _EmptyVersions and VersionUnions are - # filtered out above. - for constraint in flattened: - if isinstance(constraint, VersionRange): - continue - - raise ValueError("Unknown VersionConstraint type {}.".format(constraint)) - - flattened.sort() - - merged = [] - for constraint in flattened: - # Merge this constraint with the previous one, but only if they touch. - if not merged or ( - not merged[-1].allows_any(constraint) - and not merged[-1].is_adjacent_to(constraint) - ): - merged.append(constraint) - else: - merged[-1] = merged[-1].union(constraint) - - if len(merged) == 1: - return merged[0] - - return VersionUnion(*merged) - - def is_empty(self): - return False - - def is_any(self): - return False - - def allows(self, version): # type: (Version) -> bool - return any([constraint.allows(version) for constraint in self._ranges]) - - def allows_all(self, other): # type: (VersionConstraint) -> bool - our_ranges = iter(self._ranges) - their_ranges = iter(self._ranges_for(other)) - - our_current_range = next(our_ranges, None) - their_current_range = next(their_ranges, None) - - while our_current_range and their_current_range: - if our_current_range.allows_all(their_current_range): - their_current_range = next(their_ranges, None) - else: - our_current_range = next(our_ranges, None) - - return their_current_range is None - - def allows_any(self, other): # type: (VersionConstraint) -> bool - our_ranges = iter(self._ranges) - their_ranges = iter(self._ranges_for(other)) - - our_current_range = next(our_ranges, None) - their_current_range = next(their_ranges, None) - - while our_current_range and their_current_range: - if our_current_range.allows_any(their_current_range): - return True - - if their_current_range.allows_higher(our_current_range): - our_current_range = next(our_ranges, None) - else: - their_current_range = next(their_ranges, None) - - return False - - def intersect(self, other): # type: (VersionConstraint) -> VersionConstraint - our_ranges = iter(self._ranges) - their_ranges = iter(self._ranges_for(other)) - new_ranges = [] - - our_current_range = next(our_ranges, None) - their_current_range = next(their_ranges, None) - - while our_current_range and their_current_range: - intersection = our_current_range.intersect(their_current_range) - - if not intersection.is_empty(): - new_ranges.append(intersection) - - if their_current_range.allows_higher(our_current_range): - our_current_range = next(our_ranges, None) - else: - their_current_range = next(their_ranges, None) - - return VersionUnion.of(*new_ranges) - - def union(self, other): # type: (VersionConstraint) -> VersionConstraint - return VersionUnion.of(self, other) - - def difference(self, other): # type: (VersionConstraint) -> VersionConstraint - our_ranges = iter(self._ranges) - their_ranges = iter(self._ranges_for(other)) - new_ranges = [] - - state = { - "current": next(our_ranges, None), - "their_range": next(their_ranges, None), - } - - def their_next_range(): - state["their_range"] = next(their_ranges, None) - if state["their_range"]: - return True - - new_ranges.append(state["current"]) - our_current = next(our_ranges, None) - while our_current: - new_ranges.append(our_current) - our_current = next(our_ranges, None) - - return False - - def our_next_range(include_current=True): - if include_current: - new_ranges.append(state["current"]) - - our_current = next(our_ranges, None) - if not our_current: - return False - - state["current"] = our_current - - return True - - while True: - if state["their_range"] is None: - break - - if state["their_range"].is_strictly_lower(state["current"]): - if not their_next_range(): - break - - continue - - if state["their_range"].is_strictly_higher(state["current"]): - if not our_next_range(): - break - - continue - - difference = state["current"].difference(state["their_range"]) - if isinstance(difference, VersionUnion): - assert len(difference.ranges) == 2 - new_ranges.append(difference.ranges[0]) - state["current"] = difference.ranges[-1] - - if not their_next_range(): - break - elif difference.is_empty(): - if not our_next_range(False): - break - else: - state["current"] = difference - - if state["current"].allows_higher(state["their_range"]): - if not their_next_range(): - break - else: - if not our_next_range(): - break - - if not new_ranges: - return EmptyConstraint() - - if len(new_ranges) == 1: - return new_ranges[0] - - return VersionUnion.of(*new_ranges) - - def _ranges_for( - self, constraint - ): # type: (VersionConstraint) -> List[VersionRange] - from .version_range import VersionRange - - if constraint.is_empty(): - return [] - - if isinstance(constraint, VersionUnion): - return constraint.ranges - - if isinstance(constraint, VersionRange): - return [constraint] - - raise ValueError("Unknown VersionConstraint type {}".format(constraint)) - - def _excludes_single_version(self): # type: () -> bool - from .version import Version - from .version_range import VersionRange - - return isinstance(VersionRange().difference(self), Version) - - def __eq__(self, other): - if not isinstance(other, VersionUnion): - return False - - return self._ranges == other.ranges - - def __str__(self): - from .version_range import VersionRange - - if self._excludes_single_version(): - return "!={}".format(VersionRange().difference(self)) - - return " || ".join([str(r) for r in self._ranges]) - - def __repr__(self): - return "".format(str(self)) diff --git a/poetry/spdx/__init__.py b/poetry/spdx/__init__.py deleted file mode 100644 index 2811059cf62..00000000000 --- a/poetry/spdx/__init__.py +++ /dev/null @@ -1,52 +0,0 @@ -import json -import os - -from io import open - -from .license import License -from .updater import Updater - -_licenses = None - - -def license_by_id(identifier): - if _licenses is None: - load_licenses() - - id = identifier.lower() - - if id not in _licenses: - raise ValueError("Invalid license id: {}".format(identifier)) - - return _licenses[id] - - -def load_licenses(): - global _licenses - - _licenses = {} - - licenses_file = os.path.join(os.path.dirname(__file__), "data", "licenses.json") - - with open(licenses_file, encoding="utf-8") as f: - data = json.loads(f.read()) - - for name, license_info in data.items(): - license = License(name, license_info[0], license_info[1], license_info[2]) - _licenses[name.lower()] = license - - full_name = license_info[0].lower() - if full_name in _licenses: - existing_license = _licenses[full_name] - if not existing_license.is_deprecated: - continue - - _licenses[full_name] = license - - # Add a Proprietary license for non-standard licenses - _licenses["proprietary"] = License("Proprietary", "Proprietary", False, False) - - -if __name__ == "__main__": - updater = Updater() - updater.dump() diff --git a/poetry/spdx/data/licenses.json b/poetry/spdx/data/licenses.json deleted file mode 100644 index 08b3a11ca0e..00000000000 --- a/poetry/spdx/data/licenses.json +++ /dev/null @@ -1,1847 +0,0 @@ -{ - "0BSD": [ - "BSD Zero Clause License", - false, - false - ], - "AAL": [ - "Attribution Assurance License", - true, - false - ], - "ADSL": [ - "Amazon Digital Services License", - false, - false - ], - "AFL-1.1": [ - "Academic Free License v1.1", - true, - false - ], - "AFL-1.2": [ - "Academic Free License v1.2", - true, - false - ], - "AFL-2.0": [ - "Academic Free License v2.0", - true, - false - ], - "AFL-2.1": [ - "Academic Free License v2.1", - true, - false - ], - "AFL-3.0": [ - "Academic Free License v3.0", - true, - false - ], - "AGPL-1.0": [ - "Affero General Public License v1.0", - false, - false - ], - "AGPL-3.0": [ - "GNU Affero General Public License v3.0", - true, - true - ], - "AGPL-3.0-only": [ - "GNU Affero General Public License v3.0 only", - true, - false - ], - "AGPL-3.0-or-later": [ - "GNU Affero General Public License v3.0 or later", - true, - false - ], - "AMDPLPA": [ - "AMD's plpa_map.c License", - false, - false - ], - "AML": [ - "Apple MIT License", - false, - false - ], - "AMPAS": [ - "Academy of Motion Picture Arts and Sciences BSD", - false, - false - ], - "ANTLR-PD": [ - "ANTLR Software Rights Notice", - false, - false - ], - "APAFML": [ - "Adobe Postscript AFM License", - false, - false - ], - "APL-1.0": [ - "Adaptive Public License 1.0", - true, - false - ], - "APSL-1.0": [ - "Apple Public Source License 1.0", - true, - false - ], - "APSL-1.1": [ - "Apple Public Source License 1.1", - true, - false - ], - "APSL-1.2": [ - "Apple Public Source License 1.2", - true, - false - ], - "APSL-2.0": [ - "Apple Public Source License 2.0", - true, - false - ], - "Abstyles": [ - "Abstyles License", - false, - false - ], - "Adobe-2006": [ - "Adobe Systems Incorporated Source Code License Agreement", - false, - false - ], - "Adobe-Glyph": [ - "Adobe Glyph List License", - false, - false - ], - "Afmparse": [ - "Afmparse License", - false, - false - ], - "Aladdin": [ - "Aladdin Free Public License", - false, - false - ], - "Apache-1.0": [ - "Apache License 1.0", - false, - false - ], - "Apache-1.1": [ - "Apache License 1.1", - true, - false - ], - "Apache-2.0": [ - "Apache License 2.0", - true, - false - ], - "Artistic-1.0": [ - "Artistic License 1.0", - true, - false - ], - "Artistic-1.0-Perl": [ - "Artistic License 1.0 (Perl)", - true, - false - ], - "Artistic-1.0-cl8": [ - "Artistic License 1.0 w/clause 8", - true, - false - ], - "Artistic-2.0": [ - "Artistic License 2.0", - true, - false - ], - "BSD-1-Clause": [ - "BSD 1-Clause License", - false, - false - ], - "BSD-2-Clause": [ - "BSD 2-Clause \"Simplified\" License", - true, - false - ], - "BSD-2-Clause-FreeBSD": [ - "BSD 2-Clause FreeBSD License", - false, - false - ], - "BSD-2-Clause-NetBSD": [ - "BSD 2-Clause NetBSD License", - false, - false - ], - "BSD-2-Clause-Patent": [ - "BSD-2-Clause Plus Patent License", - true, - false - ], - "BSD-3-Clause": [ - "BSD 3-Clause \"New\" or \"Revised\" License", - true, - false - ], - "BSD-3-Clause-Attribution": [ - "BSD with attribution", - false, - false - ], - "BSD-3-Clause-Clear": [ - "BSD 3-Clause Clear License", - false, - false - ], - "BSD-3-Clause-LBNL": [ - "Lawrence Berkeley National Labs BSD variant license", - false, - false - ], - "BSD-3-Clause-No-Nuclear-License": [ - "BSD 3-Clause No Nuclear License", - false, - false - ], - "BSD-3-Clause-No-Nuclear-License-2014": [ - "BSD 3-Clause No Nuclear License 2014", - false, - false - ], - "BSD-3-Clause-No-Nuclear-Warranty": [ - "BSD 3-Clause No Nuclear Warranty", - false, - false - ], - "BSD-4-Clause": [ - "BSD 4-Clause \"Original\" or \"Old\" License", - false, - false - ], - "BSD-4-Clause-UC": [ - "BSD-4-Clause (University of California-Specific)", - false, - false - ], - "BSD-Protection": [ - "BSD Protection License", - false, - false - ], - "BSD-Source-Code": [ - "BSD Source Code Attribution", - false, - false - ], - "BSL-1.0": [ - "Boost Software License 1.0", - true, - false - ], - "Bahyph": [ - "Bahyph License", - false, - false - ], - "Barr": [ - "Barr License", - false, - false - ], - "Beerware": [ - "Beerware License", - false, - false - ], - "BitTorrent-1.0": [ - "BitTorrent Open Source License v1.0", - false, - false - ], - "BitTorrent-1.1": [ - "BitTorrent Open Source License v1.1", - false, - false - ], - "Borceux": [ - "Borceux license", - false, - false - ], - "CATOSL-1.1": [ - "Computer Associates Trusted Open Source License 1.1", - true, - false - ], - "CC-BY-1.0": [ - "Creative Commons Attribution 1.0", - false, - false - ], - "CC-BY-2.0": [ - "Creative Commons Attribution 2.0", - false, - false - ], - "CC-BY-2.5": [ - "Creative Commons Attribution 2.5", - false, - false - ], - "CC-BY-3.0": [ - "Creative Commons Attribution 3.0", - false, - false - ], - "CC-BY-4.0": [ - "Creative Commons Attribution 4.0", - false, - false - ], - "CC-BY-NC-1.0": [ - "Creative Commons Attribution Non Commercial 1.0", - false, - false - ], - "CC-BY-NC-2.0": [ - "Creative Commons Attribution Non Commercial 2.0", - false, - false - ], - "CC-BY-NC-2.5": [ - "Creative Commons Attribution Non Commercial 2.5", - false, - false - ], - "CC-BY-NC-3.0": [ - "Creative Commons Attribution Non Commercial 3.0", - false, - false - ], - "CC-BY-NC-4.0": [ - "Creative Commons Attribution Non Commercial 4.0", - false, - false - ], - "CC-BY-NC-ND-1.0": [ - "Creative Commons Attribution Non Commercial No Derivatives 1.0", - false, - false - ], - "CC-BY-NC-ND-2.0": [ - "Creative Commons Attribution Non Commercial No Derivatives 2.0", - false, - false - ], - "CC-BY-NC-ND-2.5": [ - "Creative Commons Attribution Non Commercial No Derivatives 2.5", - false, - false - ], - "CC-BY-NC-ND-3.0": [ - "Creative Commons Attribution Non Commercial No Derivatives 3.0", - false, - false - ], - "CC-BY-NC-ND-4.0": [ - "Creative Commons Attribution Non Commercial No Derivatives 4.0", - false, - false - ], - "CC-BY-NC-SA-1.0": [ - "Creative Commons Attribution Non Commercial Share Alike 1.0", - false, - false - ], - "CC-BY-NC-SA-2.0": [ - "Creative Commons Attribution Non Commercial Share Alike 2.0", - false, - false - ], - "CC-BY-NC-SA-2.5": [ - "Creative Commons Attribution Non Commercial Share Alike 2.5", - false, - false - ], - "CC-BY-NC-SA-3.0": [ - "Creative Commons Attribution Non Commercial Share Alike 3.0", - false, - false - ], - "CC-BY-NC-SA-4.0": [ - "Creative Commons Attribution Non Commercial Share Alike 4.0", - false, - false - ], - "CC-BY-ND-1.0": [ - "Creative Commons Attribution No Derivatives 1.0", - false, - false - ], - "CC-BY-ND-2.0": [ - "Creative Commons Attribution No Derivatives 2.0", - false, - false - ], - "CC-BY-ND-2.5": [ - "Creative Commons Attribution No Derivatives 2.5", - false, - false - ], - "CC-BY-ND-3.0": [ - "Creative Commons Attribution No Derivatives 3.0", - false, - false - ], - "CC-BY-ND-4.0": [ - "Creative Commons Attribution No Derivatives 4.0", - false, - false - ], - "CC-BY-SA-1.0": [ - "Creative Commons Attribution Share Alike 1.0", - false, - false - ], - "CC-BY-SA-2.0": [ - "Creative Commons Attribution Share Alike 2.0", - false, - false - ], - "CC-BY-SA-2.5": [ - "Creative Commons Attribution Share Alike 2.5", - false, - false - ], - "CC-BY-SA-3.0": [ - "Creative Commons Attribution Share Alike 3.0", - false, - false - ], - "CC-BY-SA-4.0": [ - "Creative Commons Attribution Share Alike 4.0", - false, - false - ], - "CC0-1.0": [ - "Creative Commons Zero v1.0 Universal", - false, - false - ], - "CDDL-1.0": [ - "Common Development and Distribution License 1.0", - true, - false - ], - "CDDL-1.1": [ - "Common Development and Distribution License 1.1", - false, - false - ], - "CDLA-Permissive-1.0": [ - "Community Data License Agreement Permissive 1.0", - false, - false - ], - "CDLA-Sharing-1.0": [ - "Community Data License Agreement Sharing 1.0", - false, - false - ], - "CECILL-1.0": [ - "CeCILL Free Software License Agreement v1.0", - false, - false - ], - "CECILL-1.1": [ - "CeCILL Free Software License Agreement v1.1", - false, - false - ], - "CECILL-2.0": [ - "CeCILL Free Software License Agreement v2.0", - false, - false - ], - "CECILL-2.1": [ - "CeCILL Free Software License Agreement v2.1", - true, - false - ], - "CECILL-B": [ - "CeCILL-B Free Software License Agreement", - false, - false - ], - "CECILL-C": [ - "CeCILL-C Free Software License Agreement", - false, - false - ], - "CNRI-Jython": [ - "CNRI Jython License", - false, - false - ], - "CNRI-Python": [ - "CNRI Python License", - true, - false - ], - "CNRI-Python-GPL-Compatible": [ - "CNRI Python Open Source GPL Compatible License Agreement", - false, - false - ], - "CPAL-1.0": [ - "Common Public Attribution License 1.0", - true, - false - ], - "CPL-1.0": [ - "Common Public License 1.0", - true, - false - ], - "CPOL-1.02": [ - "Code Project Open License 1.02", - false, - false - ], - "CUA-OPL-1.0": [ - "CUA Office Public License v1.0", - true, - false - ], - "Caldera": [ - "Caldera License", - false, - false - ], - "ClArtistic": [ - "Clarified Artistic License", - false, - false - ], - "Condor-1.1": [ - "Condor Public License v1.1", - false, - false - ], - "Crossword": [ - "Crossword License", - false, - false - ], - "CrystalStacker": [ - "CrystalStacker License", - false, - false - ], - "Cube": [ - "Cube License", - false, - false - ], - "D-FSL-1.0": [ - "Deutsche Freie Software Lizenz", - false, - false - ], - "DOC": [ - "DOC License", - false, - false - ], - "DSDP": [ - "DSDP License", - false, - false - ], - "Dotseqn": [ - "Dotseqn License", - false, - false - ], - "ECL-1.0": [ - "Educational Community License v1.0", - true, - false - ], - "ECL-2.0": [ - "Educational Community License v2.0", - true, - false - ], - "EFL-1.0": [ - "Eiffel Forum License v1.0", - true, - false - ], - "EFL-2.0": [ - "Eiffel Forum License v2.0", - true, - false - ], - "EPL-1.0": [ - "Eclipse Public License 1.0", - true, - false - ], - "EPL-2.0": [ - "Eclipse Public License 2.0", - true, - false - ], - "EUDatagrid": [ - "EU DataGrid Software License", - true, - false - ], - "EUPL-1.0": [ - "European Union Public License 1.0", - false, - false - ], - "EUPL-1.1": [ - "European Union Public License 1.1", - true, - false - ], - "EUPL-1.2": [ - "European Union Public License 1.2", - true, - false - ], - "Entessa": [ - "Entessa Public License v1.0", - true, - false - ], - "ErlPL-1.1": [ - "Erlang Public License v1.1", - false, - false - ], - "Eurosym": [ - "Eurosym License", - false, - false - ], - "FSFAP": [ - "FSF All Permissive License", - false, - false - ], - "FSFUL": [ - "FSF Unlimited License", - false, - false - ], - "FSFULLR": [ - "FSF Unlimited License (with License Retention)", - false, - false - ], - "FTL": [ - "Freetype Project License", - false, - false - ], - "Fair": [ - "Fair License", - true, - false - ], - "Frameworx-1.0": [ - "Frameworx Open License 1.0", - true, - false - ], - "FreeImage": [ - "FreeImage Public License v1.0", - false, - false - ], - "GFDL-1.1": [ - "GNU Free Documentation License v1.1", - false, - true - ], - "GFDL-1.1-only": [ - "GNU Free Documentation License v1.1 only", - false, - false - ], - "GFDL-1.1-or-later": [ - "GNU Free Documentation License v1.1 or later", - false, - false - ], - "GFDL-1.2": [ - "GNU Free Documentation License v1.2", - false, - true - ], - "GFDL-1.2-only": [ - "GNU Free Documentation License v1.2 only", - false, - false - ], - "GFDL-1.2-or-later": [ - "GNU Free Documentation License v1.2 or later", - false, - false - ], - "GFDL-1.3": [ - "GNU Free Documentation License v1.3", - false, - true - ], - "GFDL-1.3-only": [ - "GNU Free Documentation License v1.3 only", - false, - false - ], - "GFDL-1.3-or-later": [ - "GNU Free Documentation License v1.3 or later", - false, - false - ], - "GL2PS": [ - "GL2PS License", - false, - false - ], - "GPL-1.0": [ - "GNU General Public License v1.0 only", - false, - true - ], - "GPL-1.0+": [ - "GNU General Public License v1.0 or later", - false, - true - ], - "GPL-1.0-only": [ - "GNU General Public License v1.0 only", - false, - false - ], - "GPL-1.0-or-later": [ - "GNU General Public License v1.0 or later", - false, - false - ], - "GPL-2.0": [ - "GNU General Public License v2.0 only", - true, - true - ], - "GPL-2.0+": [ - "GNU General Public License v2.0 or later", - true, - true - ], - "GPL-2.0-only": [ - "GNU General Public License v2.0 only", - true, - false - ], - "GPL-2.0-or-later": [ - "GNU General Public License v2.0 or later", - true, - false - ], - "GPL-2.0-with-GCC-exception": [ - "GNU General Public License v2.0 w/GCC Runtime Library exception", - false, - true - ], - "GPL-2.0-with-autoconf-exception": [ - "GNU General Public License v2.0 w/Autoconf exception", - false, - true - ], - "GPL-2.0-with-bison-exception": [ - "GNU General Public License v2.0 w/Bison exception", - false, - true - ], - "GPL-2.0-with-classpath-exception": [ - "GNU General Public License v2.0 w/Classpath exception", - false, - true - ], - "GPL-2.0-with-font-exception": [ - "GNU General Public License v2.0 w/Font exception", - false, - true - ], - "GPL-3.0": [ - "GNU General Public License v3.0 only", - true, - true - ], - "GPL-3.0+": [ - "GNU General Public License v3.0 or later", - true, - true - ], - "GPL-3.0-only": [ - "GNU General Public License v3.0 only", - true, - false - ], - "GPL-3.0-or-later": [ - "GNU General Public License v3.0 or later", - true, - false - ], - "GPL-3.0-with-GCC-exception": [ - "GNU General Public License v3.0 w/GCC Runtime Library exception", - true, - true - ], - "GPL-3.0-with-autoconf-exception": [ - "GNU General Public License v3.0 w/Autoconf exception", - false, - true - ], - "Giftware": [ - "Giftware License", - false, - false - ], - "Glide": [ - "3dfx Glide License", - false, - false - ], - "Glulxe": [ - "Glulxe License", - false, - false - ], - "HPND": [ - "Historical Permission Notice and Disclaimer", - true, - false - ], - "HaskellReport": [ - "Haskell Language Report License", - false, - false - ], - "IBM-pibs": [ - "IBM PowerPC Initialization and Boot Software", - false, - false - ], - "ICU": [ - "ICU License", - false, - false - ], - "IJG": [ - "Independent JPEG Group License", - false, - false - ], - "IPA": [ - "IPA Font License", - true, - false - ], - "IPL-1.0": [ - "IBM Public License v1.0", - true, - false - ], - "ISC": [ - "ISC License", - true, - false - ], - "ImageMagick": [ - "ImageMagick License", - false, - false - ], - "Imlib2": [ - "Imlib2 License", - false, - false - ], - "Info-ZIP": [ - "Info-ZIP License", - false, - false - ], - "Intel": [ - "Intel Open Source License", - true, - false - ], - "Intel-ACPI": [ - "Intel ACPI Software License Agreement", - false, - false - ], - "Interbase-1.0": [ - "Interbase Public License v1.0", - false, - false - ], - "JSON": [ - "JSON License", - false, - false - ], - "JasPer-2.0": [ - "JasPer License", - false, - false - ], - "LAL-1.2": [ - "Licence Art Libre 1.2", - false, - false - ], - "LAL-1.3": [ - "Licence Art Libre 1.3", - false, - false - ], - "LGPL-2.0": [ - "GNU Library General Public License v2 only", - true, - true - ], - "LGPL-2.0+": [ - "GNU Library General Public License v2 or later", - true, - true - ], - "LGPL-2.0-only": [ - "GNU Library General Public License v2 only", - true, - false - ], - "LGPL-2.0-or-later": [ - "GNU Library General Public License v2 or later", - true, - false - ], - "LGPL-2.1": [ - "GNU Lesser General Public License v2.1 only", - true, - true - ], - "LGPL-2.1+": [ - "GNU Library General Public License v2 or later", - true, - true - ], - "LGPL-2.1-only": [ - "GNU Lesser General Public License v2.1 only", - true, - false - ], - "LGPL-2.1-or-later": [ - "GNU Lesser General Public License v2.1 or later", - true, - false - ], - "LGPL-3.0": [ - "GNU Lesser General Public License v3.0 only", - true, - true - ], - "LGPL-3.0+": [ - "GNU Lesser General Public License v3.0 or later", - true, - true - ], - "LGPL-3.0-only": [ - "GNU Lesser General Public License v3.0 only", - true, - false - ], - "LGPL-3.0-or-later": [ - "GNU Lesser General Public License v3.0 or later", - true, - false - ], - "LGPLLR": [ - "Lesser General Public License For Linguistic Resources", - false, - false - ], - "LPL-1.0": [ - "Lucent Public License Version 1.0", - true, - false - ], - "LPL-1.02": [ - "Lucent Public License v1.02", - true, - false - ], - "LPPL-1.0": [ - "LaTeX Project Public License v1.0", - false, - false - ], - "LPPL-1.1": [ - "LaTeX Project Public License v1.1", - false, - false - ], - "LPPL-1.2": [ - "LaTeX Project Public License v1.2", - false, - false - ], - "LPPL-1.3a": [ - "LaTeX Project Public License v1.3a", - false, - false - ], - "LPPL-1.3c": [ - "LaTeX Project Public License v1.3c", - true, - false - ], - "Latex2e": [ - "Latex2e License", - false, - false - ], - "Leptonica": [ - "Leptonica License", - false, - false - ], - "LiLiQ-P-1.1": [ - "Licence Libre du Qu\u00e9bec \u2013 Permissive version 1.1", - true, - false - ], - "LiLiQ-R-1.1": [ - "Licence Libre du Qu\u00e9bec \u2013 R\u00e9ciprocit\u00e9 version 1.1", - true, - false - ], - "LiLiQ-Rplus-1.1": [ - "Licence Libre du Qu\u00e9bec \u2013 R\u00e9ciprocit\u00e9 forte version 1.1", - true, - false - ], - "Libpng": [ - "libpng License", - false, - false - ], - "MIT": [ - "MIT License", - true, - false - ], - "MIT-CMU": [ - "CMU License", - false, - false - ], - "MIT-advertising": [ - "Enlightenment License (e16)", - false, - false - ], - "MIT-enna": [ - "enna License", - false, - false - ], - "MIT-feh": [ - "feh License", - false, - false - ], - "MITNFA": [ - "MIT +no-false-attribs license", - false, - false - ], - "MPL-1.0": [ - "Mozilla Public License 1.0", - true, - false - ], - "MPL-1.1": [ - "Mozilla Public License 1.1", - true, - false - ], - "MPL-2.0": [ - "Mozilla Public License 2.0", - true, - false - ], - "MPL-2.0-no-copyleft-exception": [ - "Mozilla Public License 2.0 (no copyleft exception)", - true, - false - ], - "MS-PL": [ - "Microsoft Public License", - true, - false - ], - "MS-RL": [ - "Microsoft Reciprocal License", - true, - false - ], - "MTLL": [ - "Matrix Template Library License", - false, - false - ], - "MakeIndex": [ - "MakeIndex License", - false, - false - ], - "MirOS": [ - "MirOS License", - true, - false - ], - "Motosoto": [ - "Motosoto License", - true, - false - ], - "Multics": [ - "Multics License", - true, - false - ], - "Mup": [ - "Mup License", - false, - false - ], - "NASA-1.3": [ - "NASA Open Source Agreement 1.3", - true, - false - ], - "NBPL-1.0": [ - "Net Boolean Public License v1", - false, - false - ], - "NCSA": [ - "University of Illinois/NCSA Open Source License", - true, - false - ], - "NGPL": [ - "Nethack General Public License", - true, - false - ], - "NLOD-1.0": [ - "Norwegian Licence for Open Government Data", - false, - false - ], - "NLPL": [ - "No Limit Public License", - false, - false - ], - "NOSL": [ - "Netizen Open Source License", - false, - false - ], - "NPL-1.0": [ - "Netscape Public License v1.0", - false, - false - ], - "NPL-1.1": [ - "Netscape Public License v1.1", - false, - false - ], - "NPOSL-3.0": [ - "Non-Profit Open Software License 3.0", - true, - false - ], - "NRL": [ - "NRL License", - false, - false - ], - "NTP": [ - "NTP License", - true, - false - ], - "Naumen": [ - "Naumen Public License", - true, - false - ], - "Net-SNMP": [ - "Net-SNMP License", - false, - false - ], - "NetCDF": [ - "NetCDF license", - false, - false - ], - "Newsletr": [ - "Newsletr License", - false, - false - ], - "Nokia": [ - "Nokia Open Source License", - true, - false - ], - "Noweb": [ - "Noweb License", - false, - false - ], - "Nunit": [ - "Nunit License", - false, - true - ], - "OCCT-PL": [ - "Open CASCADE Technology Public License", - false, - false - ], - "OCLC-2.0": [ - "OCLC Research Public License 2.0", - true, - false - ], - "ODbL-1.0": [ - "ODC Open Database License v1.0", - false, - false - ], - "OFL-1.0": [ - "SIL Open Font License 1.0", - false, - false - ], - "OFL-1.1": [ - "SIL Open Font License 1.1", - true, - false - ], - "OGTSL": [ - "Open Group Test Suite License", - true, - false - ], - "OLDAP-1.1": [ - "Open LDAP Public License v1.1", - false, - false - ], - "OLDAP-1.2": [ - "Open LDAP Public License v1.2", - false, - false - ], - "OLDAP-1.3": [ - "Open LDAP Public License v1.3", - false, - false - ], - "OLDAP-1.4": [ - "Open LDAP Public License v1.4", - false, - false - ], - "OLDAP-2.0": [ - "Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)", - false, - false - ], - "OLDAP-2.0.1": [ - "Open LDAP Public License v2.0.1", - false, - false - ], - "OLDAP-2.1": [ - "Open LDAP Public License v2.1", - false, - false - ], - "OLDAP-2.2": [ - "Open LDAP Public License v2.2", - false, - false - ], - "OLDAP-2.2.1": [ - "Open LDAP Public License v2.2.1", - false, - false - ], - "OLDAP-2.2.2": [ - "Open LDAP Public License 2.2.2", - false, - false - ], - "OLDAP-2.3": [ - "Open LDAP Public License v2.3", - false, - false - ], - "OLDAP-2.4": [ - "Open LDAP Public License v2.4", - false, - false - ], - "OLDAP-2.5": [ - "Open LDAP Public License v2.5", - false, - false - ], - "OLDAP-2.6": [ - "Open LDAP Public License v2.6", - false, - false - ], - "OLDAP-2.7": [ - "Open LDAP Public License v2.7", - false, - false - ], - "OLDAP-2.8": [ - "Open LDAP Public License v2.8", - false, - false - ], - "OML": [ - "Open Market License", - false, - false - ], - "OPL-1.0": [ - "Open Public License v1.0", - false, - false - ], - "OSET-PL-2.1": [ - "OSET Public License version 2.1", - true, - false - ], - "OSL-1.0": [ - "Open Software License 1.0", - true, - false - ], - "OSL-1.1": [ - "Open Software License 1.1", - false, - false - ], - "OSL-2.0": [ - "Open Software License 2.0", - true, - false - ], - "OSL-2.1": [ - "Open Software License 2.1", - true, - false - ], - "OSL-3.0": [ - "Open Software License 3.0", - true, - false - ], - "OpenSSL": [ - "OpenSSL License", - false, - false - ], - "PDDL-1.0": [ - "ODC Public Domain Dedication & License 1.0", - false, - false - ], - "PHP-3.0": [ - "PHP License v3.0", - true, - false - ], - "PHP-3.01": [ - "PHP License v3.01", - false, - false - ], - "Plexus": [ - "Plexus Classworlds License", - false, - false - ], - "PostgreSQL": [ - "PostgreSQL License", - true, - false - ], - "Python-2.0": [ - "Python License 2.0", - true, - false - ], - "QPL-1.0": [ - "Q Public License 1.0", - true, - false - ], - "Qhull": [ - "Qhull License", - false, - false - ], - "RHeCos-1.1": [ - "Red Hat eCos Public License v1.1", - false, - false - ], - "RPL-1.1": [ - "Reciprocal Public License 1.1", - true, - false - ], - "RPL-1.5": [ - "Reciprocal Public License 1.5", - true, - false - ], - "RPSL-1.0": [ - "RealNetworks Public Source License v1.0", - true, - false - ], - "RSA-MD": [ - "RSA Message-Digest License ", - false, - false - ], - "RSCPL": [ - "Ricoh Source Code Public License", - true, - false - ], - "Rdisc": [ - "Rdisc License", - false, - false - ], - "Ruby": [ - "Ruby License", - false, - false - ], - "SAX-PD": [ - "Sax Public Domain Notice", - false, - false - ], - "SCEA": [ - "SCEA Shared Source License", - false, - false - ], - "SGI-B-1.0": [ - "SGI Free Software License B v1.0", - false, - false - ], - "SGI-B-1.1": [ - "SGI Free Software License B v1.1", - false, - false - ], - "SGI-B-2.0": [ - "SGI Free Software License B v2.0", - false, - false - ], - "SISSL": [ - "Sun Industry Standards Source License v1.1", - true, - false - ], - "SISSL-1.2": [ - "Sun Industry Standards Source License v1.2", - false, - false - ], - "SMLNJ": [ - "Standard ML of New Jersey License", - false, - false - ], - "SMPPL": [ - "Secure Messaging Protocol Public License", - false, - false - ], - "SNIA": [ - "SNIA Public License 1.1", - false, - false - ], - "SPL-1.0": [ - "Sun Public License v1.0", - true, - false - ], - "SWL": [ - "Scheme Widget Library (SWL) Software License Agreement", - false, - false - ], - "Saxpath": [ - "Saxpath License", - false, - false - ], - "Sendmail": [ - "Sendmail License", - false, - false - ], - "SimPL-2.0": [ - "Simple Public License 2.0", - true, - false - ], - "Sleepycat": [ - "Sleepycat License", - true, - false - ], - "Spencer-86": [ - "Spencer License 86", - false, - false - ], - "Spencer-94": [ - "Spencer License 94", - false, - false - ], - "Spencer-99": [ - "Spencer License 99", - false, - false - ], - "StandardML-NJ": [ - "Standard ML of New Jersey License", - false, - true - ], - "SugarCRM-1.1.3": [ - "SugarCRM Public License v1.1.3", - false, - false - ], - "TCL": [ - "TCL/TK License", - false, - false - ], - "TCP-wrappers": [ - "TCP Wrappers License", - false, - false - ], - "TMate": [ - "TMate Open Source License", - false, - false - ], - "TORQUE-1.1": [ - "TORQUE v2.5+ Software License v1.1", - false, - false - ], - "TOSL": [ - "Trusster Open Source License", - false, - false - ], - "UPL-1.0": [ - "Universal Permissive License v1.0", - true, - false - ], - "Unicode-DFS-2015": [ - "Unicode License Agreement - Data Files and Software (2015)", - false, - false - ], - "Unicode-DFS-2016": [ - "Unicode License Agreement - Data Files and Software (2016)", - false, - false - ], - "Unicode-TOU": [ - "Unicode Terms of Use", - false, - false - ], - "Unlicense": [ - "The Unlicense", - false, - false - ], - "VOSTROM": [ - "VOSTROM Public License for Open Source", - false, - false - ], - "VSL-1.0": [ - "Vovida Software License v1.0", - true, - false - ], - "Vim": [ - "Vim License", - false, - false - ], - "W3C": [ - "W3C Software Notice and License (2002-12-31)", - true, - false - ], - "W3C-19980720": [ - "W3C Software Notice and License (1998-07-20)", - false, - false - ], - "W3C-20150513": [ - "W3C Software Notice and Document License (2015-05-13)", - false, - false - ], - "WTFPL": [ - "Do What The F*ck You Want To Public License", - false, - false - ], - "Watcom-1.0": [ - "Sybase Open Watcom Public License 1.0", - true, - false - ], - "Wsuipa": [ - "Wsuipa License", - false, - false - ], - "X11": [ - "X11 License", - false, - false - ], - "XFree86-1.1": [ - "XFree86 License 1.1", - false, - false - ], - "XSkat": [ - "XSkat License", - false, - false - ], - "Xerox": [ - "Xerox License", - false, - false - ], - "Xnet": [ - "X.Net License", - true, - false - ], - "YPL-1.0": [ - "Yahoo! Public License v1.0", - false, - false - ], - "YPL-1.1": [ - "Yahoo! Public License v1.1", - false, - false - ], - "ZPL-1.1": [ - "Zope Public License 1.1", - false, - false - ], - "ZPL-2.0": [ - "Zope Public License 2.0", - true, - false - ], - "ZPL-2.1": [ - "Zope Public License 2.1", - false, - false - ], - "Zed": [ - "Zed License", - false, - false - ], - "Zend-2.0": [ - "Zend License v2.0", - false, - false - ], - "Zimbra-1.3": [ - "Zimbra Public License v1.3", - false, - false - ], - "Zimbra-1.4": [ - "Zimbra Public License v1.4", - false, - false - ], - "Zlib": [ - "zlib License", - true, - false - ], - "bzip2-1.0.5": [ - "bzip2 and libbzip2 License v1.0.5", - false, - false - ], - "bzip2-1.0.6": [ - "bzip2 and libbzip2 License v1.0.6", - false, - false - ], - "curl": [ - "curl License", - false, - false - ], - "diffmark": [ - "diffmark license", - false, - false - ], - "dvipdfm": [ - "dvipdfm License", - false, - false - ], - "eCos-2.0": [ - "eCos license version 2.0", - false, - true - ], - "eGenix": [ - "eGenix.com Public License 1.1.0", - false, - false - ], - "gSOAP-1.3b": [ - "gSOAP Public License v1.3b", - false, - false - ], - "gnuplot": [ - "gnuplot License", - false, - false - ], - "iMatix": [ - "iMatix Standard Function Library Agreement", - false, - false - ], - "libtiff": [ - "libtiff License", - false, - false - ], - "mpich2": [ - "mpich2 License", - false, - false - ], - "psfrag": [ - "psfrag License", - false, - false - ], - "psutils": [ - "psutils License", - false, - false - ], - "wxWindows": [ - "wxWindows Library License", - false, - true - ], - "xinetd": [ - "xinetd License", - false, - false - ], - "xpp": [ - "XPP License", - false, - false - ], - "zlib-acknowledgement": [ - "zlib/libpng License with Acknowledgement", - false, - false - ] -} \ No newline at end of file diff --git a/poetry/spdx/license.py b/poetry/spdx/license.py deleted file mode 100644 index 11bd2942a5e..00000000000 --- a/poetry/spdx/license.py +++ /dev/null @@ -1,156 +0,0 @@ -from collections import namedtuple - - -class License(namedtuple("License", "id name is_osi_approved is_deprecated")): - - CLASSIFIER_SUPPORTED = { - # Not OSI Approved - "Aladdin", - "CC0-1.0", - "CECILL-B", - "CECILL-C", - "NPL-1.0", - "NPL-1.1", - # OSI Approved - "AFPL", - "AFL-1.1", - "AFL-1.2", - "AFL-2.0", - "AFL-2.1", - "AFL-3.0", - "Apache-1.1", - "Apache-2.0", - "APSL-1.1", - "APSL-1.2", - "APSL-2.0", - "Artistic-1.0", - "Artistic-2.0", - "AAL", - "AGPL-3.0", - "AGPL-3.0-only", - "AGPL-3.0-or-later", - "BSL-1.0", - "BSD-2-Clause", - "BSD-3-Clause", - "CDDL-1.0", - "CECILL-2.1", - "CPL-1.0", - "EFL-1.0", - "EFL-2.0", - "EPL-1.0", - "EPL-2.0", - "EUPL-1.1", - "EUPL-1.2", - "GPL-2.0", - "GPL-2.0+", - "GPL-2.0-only", - "GPL-2.0-or-later", - "GPL-3.0", - "GPL-3.0+", - "GPL-3.0-only", - "GPL-3.0-or-later", - "LGPL-2.0", - "LGPL-2.0+", - "LGPL-2.0-only", - "LGPL-2.0-or-later", - "LGPL-3.0", - "LGPL-3.0+", - "LGPL-3.0-only", - "LGPL-3.0-or-later", - "MIT", - "MPL-1.0", - "MPL-1.1", - "MPL-1.2", - "Nokia", - "W3C", - "ZPL-1.0", - "ZPL-2.0", - "ZPL-2.1", - } - - CLASSIFIER_NAMES = { - # Not OSI Approved - "AFPL": "Aladdin Free Public License (AFPL)", - "CC0-1.0": "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", - "CECILL-B": "CeCILL-B Free Software License Agreement (CECILL-B)", - "CECILL-C": "CeCILL-C Free Software License Agreement (CECILL-C)", - "NPL-1.0": "Netscape Public License (NPL)", - "NPL-1.1": "Netscape Public License (NPL)", - # OSI Approved - "AFL-1.1": "Academic Free License (AFL)", - "AFL-1.2": "Academic Free License (AFL)", - "AFL-2.0": "Academic Free License (AFL)", - "AFL-2.1": "Academic Free License (AFL)", - "AFL-3.0": "Academic Free License (AFL)", - "Apache-1.1": "Apache Software License", - "Apache-2.0": "Apache Software License", - "APSL-1.1": "Apple Public Source License", - "APSL-1.2": "Apple Public Source License", - "APSL-2.0": "Apple Public Source License", - "Artistic-1.0": "Artistic License", - "Artistic-2.0": "Artistic License", - "AAL": "Attribution Assurance License", - "AGPL-3.0": "GNU Affero General Public License v3", - "AGPL-3.0-only": "GNU Affero General Public License v3", - "AGPL-3.0-or-later": "GNU Affero General Public License v3 or later (AGPLv3+)", - "BSL-1.0": "Boost Software License 1.0 (BSL-1.0)", - "BSD-2-Clause": "BSD License", - "BSD-3-Clause": "BSD License", - "CDDL-1.0": "Common Development and Distribution License 1.0 (CDDL-1.0)", - "CECILL-2.1": "CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)", - "CPL-1.0": "Common Public License", - "EPL-1.0": "Eclipse Public License 1.0 (EPL-1.0)", - "EFL-1.0": "Eiffel Forum License", - "EFL-2.0": "Eiffel Forum License", - "EUPL-1.1": "European Union Public Licence 1.1 (EUPL 1.1)", - "EUPL-1.2": "European Union Public Licence 1.2 (EUPL 1.2)", - "GPL-2.0": "GNU General Public License v2 (GPLv2)", - "GPL-2.0-only": "GNU General Public License v2 (GPLv2)", - "GPL-2.0+": "GNU General Public License v2 or later (GPLv2+)", - "GPL-2.0-or-later": "GNU General Public License v2 or later (GPLv2+)", - "GPL-3.0": "GNU General Public License v3 (GPLv3)", - "GPL-3.0-only": "GNU General Public License v3 (GPLv3)", - "GPL-3.0+": "GNU General Public License v3 or later (GPLv3+)", - "GPL-3.0-or-later": "GNU General Public License v3 or later (GPLv3+)", - "LGPL-2.0": "GNU Lesser General Public License v2 (LGPLv2)", - "LGPL-2.0-only": "GNU Lesser General Public License v2 (LGPLv2)", - "LGPL-2.0+": "GNU Lesser General Public License v2 or later (LGPLv2+)", - "LGPL-2.0-or-later": "GNU Lesser General Public License v2 or later (LGPLv2+)", - "LGPL-3.0": "GNU Lesser General Public License v3 (LGPLv3)", - "LGPL-3.0-only": "GNU Lesser General Public License v3 (LGPLv3)", - "LGPL-3.0+": "GNU Lesser General Public License v3 or later (LGPLv3+)", - "LGPL-3.0-or-later": "GNU Lesser General Public License v3 or later (LGPLv3+)", - "MPL-1.0": "Mozilla Public License 1.0 (MPL)", - "MPL-1.1": "Mozilla Public License 1.1 (MPL 1.1)", - "MPL-2.0": "Mozilla Public License 2.0 (MPL 2.0)", - "W3C": "W3C License", - "ZPL-1.1": "Zope Public License", - "ZPL-2.0": "Zope Public License", - "ZPL-2.1": "Zope Public License", - } - - @property - def classifier(self): - parts = ["License"] - - if self.is_osi_approved: - parts.append("OSI Approved") - - name = self.classifier_name - if name is not None: - parts.append(name) - - return " :: ".join(parts) - - @property - def classifier_name(self): - if self.id not in self.CLASSIFIER_SUPPORTED: - if self.is_osi_approved: - return None - - return "Other/Proprietary License" - - if self.id in self.CLASSIFIER_NAMES: - return self.CLASSIFIER_NAMES[self.id] - - return self.name diff --git a/poetry/spdx/updater.py b/poetry/spdx/updater.py deleted file mode 100644 index 895d595f83c..00000000000 --- a/poetry/spdx/updater.py +++ /dev/null @@ -1,42 +0,0 @@ -import json -import os - -from io import open - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - - -class Updater: - - BASE_URL = "https://raw.githubusercontent.com/spdx/license-list-data/master/json/" - - def __init__(self, base_url=BASE_URL): - self._base_url = base_url - - def dump(self, file=None): - if file is None: - file = os.path.join(os.path.dirname(__file__), "data", "licenses.json") - - licenses_url = self._base_url + "licenses.json" - - with open(file, "w", encoding="utf-8") as f: - f.write( - json.dumps(self.get_licenses(licenses_url), indent=2, sort_keys=True) - ) - - def get_licenses(self, url): - licenses = {} - with urlopen(url) as r: - data = json.loads(r.read().decode()) - - for info in data["licenses"]: - licenses[info["licenseId"]] = [ - info["name"], - info["isOsiApproved"], - info["isDeprecatedLicenseId"], - ] - - return licenses diff --git a/poetry/utils/_compat.py b/poetry/utils/_compat.py index ad2cbe27b1d..6f8d5b4c372 100644 --- a/poetry/utils/_compat.py +++ b/poetry/utils/_compat.py @@ -1,5 +1,6 @@ import sys + try: from functools32 import lru_cache except ImportError: @@ -10,6 +11,13 @@ except ImportError: from glob import glob +try: + from importlib import metadata + import zipfile as zipp +except ImportError: + import importlib_metadata as metadata + import zipp + try: import urllib.parse as urlparse except ImportError: diff --git a/poetry/utils/appdirs.py b/poetry/utils/appdirs.py index 522dcf3291c..5b9da0cdde3 100644 --- a/poetry/utils/appdirs.py +++ b/poetry/utils/appdirs.py @@ -5,6 +5,7 @@ import os import sys + WINDOWS = sys.platform.startswith("win") or (sys.platform == "cli" and os.name == "nt") diff --git a/poetry/utils/env.py b/poetry/utils/env.py index 7baf90a67f9..a40b00baede 100644 --- a/poetry/utils/env.py +++ b/poetry/utils/env.py @@ -9,8 +9,6 @@ import sysconfig import warnings -import tomlkit - from contextlib import contextmanager from typing import Any from typing import Dict @@ -18,11 +16,15 @@ from typing import Optional from typing import Tuple +import tomlkit + from clikit.api.io import IO -from poetry.config.config import Config +from poetry.core.semver import parse_constraint +from poetry.core.semver.version import Version +from poetry.core.version.markers import BaseMarker from poetry.locations import CACHE_DIR -from poetry.semver.version import Version +from poetry.poetry import Poetry from poetry.utils._compat import CalledProcessError from poetry.utils._compat import Path from poetry.utils._compat import decode @@ -30,7 +32,6 @@ from poetry.utils._compat import list_to_shell_command from poetry.utils._compat import subprocess from poetry.utils.toml_file import TomlFile -from poetry.version.markers import BaseMarker GET_ENVIRONMENT_INFO = """\ @@ -93,6 +94,20 @@ print('.'.join([str(s) for s in sys.version_info[:3]])) """ +GET_SYS_PATH = """\ +import json +import sys + +print(json.dumps(sys.path)) +""" + +GET_PATHS = """\ +import json +import sysconfig + +print(json.dumps(sysconfig.get_paths())) +""" + CREATE_VENV_COMMAND = """\ path = {!r} @@ -100,14 +115,19 @@ from venv import EnvBuilder builder = EnvBuilder(with_pip=True) - build = builder.create + builder.create(path) except ImportError: - # We fallback on virtualenv for Python 2.7 - from virtualenv import create_environment + try: + # We fallback on virtualenv for Python 2.7 + from virtualenv import create_environment - build = create_environment + create_environment(path) + except ImportError: + # since virtualenv>20 we have to use cli_run + from virtualenv import cli_run -build(path)""" + cli_run([path]) +""" class EnvError(Exception): @@ -127,6 +147,26 @@ def __init__(self, e, input=None): # type: (CalledProcessError) -> None super(EnvCommandError, self).__init__(message) +class NoCompatiblePythonVersionFound(EnvError): + def __init__(self, expected, given=None): + if given: + message = ( + "The specified Python version ({}) " + "is not supported by the project ({}).\n" + "Please choose a compatible version " + "or loosen the python constraint specified " + "in the pyproject.toml file.".format(given, expected) + ) + else: + message = ( + "Poetry was unable to find a compatible version. " + "If you have one, you can explicitly use it " + 'via the "env use" command.' + ) + + super(NoCompatiblePythonVersionFound, self).__init__(message) + + class EnvManager(object): """ Environments manager @@ -136,19 +176,18 @@ class EnvManager(object): ENVS_FILE = "envs.toml" - def __init__(self, config=None): # type: (Config) -> None - if config is None: - config = Config() - - self._config = config + def __init__(self, poetry): # type: (Poetry) -> None + self._poetry = poetry - def activate(self, python, cwd, io): # type: (str, Optional[Path], IO) -> Env - venv_path = self._config.get("virtualenvs.path") + def activate(self, python, io): # type: (str, IO) -> Env + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: venv_path = Path(venv_path) + cwd = self._poetry.file.parent + envs_file = TomlFile(venv_path / self.ENVS_FILE) try: @@ -163,7 +202,7 @@ def activate(self, python, cwd, io): # type: (str, Optional[Path], IO) -> Env try: python_version = decode( subprocess.check_output( - " ".join( + list_to_shell_command( [ python, "-c", @@ -181,8 +220,26 @@ def activate(self, python, cwd, io): # type: (str, Optional[Path], IO) -> Env patch = python_version.text create = False + is_root_venv = self._poetry.config.get("virtualenvs.in-project") + # If we are required to create the virtual environment in the root folder, + # create or recreate it if needed + if is_root_venv: + create = False + venv = self._poetry.file.parent / ".venv" + if venv.exists(): + # We need to check if the patch version is correct + _venv = VirtualEnv(venv) + current_patch = ".".join(str(v) for v in _venv.version_info[:3]) + + if patch != current_patch: + create = True + + self.create_venv(io, executable=python, force=create) + + return self.get(reload=True) + envs = tomlkit.document() - base_env_name = self.generate_env_name(cwd.name, str(cwd)) + base_env_name = self.generate_env_name(self._poetry.package.name, str(cwd)) if envs_file.exists(): envs = envs_file.read() current_env = envs.get(base_env_name) @@ -211,23 +268,23 @@ def activate(self, python, cwd, io): # type: (str, Optional[Path], IO) -> Env if patch != current_patch: create = True - self.create_venv(cwd, io, executable=python, force=create) + self.create_venv(io, executable=python, force=create) # Activate envs[base_env_name] = {"minor": minor, "patch": patch} envs_file.write(envs) - return self.get(cwd, reload=True) + return self.get(reload=True) - def deactivate(self, cwd, io): # type: (Optional[Path], IO) -> None - venv_path = self._config.get("virtualenvs.path") + def deactivate(self, io): # type: (IO) -> None + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: venv_path = Path(venv_path) - name = cwd.name - name = self.generate_env_name(name, str(cwd)) + name = self._poetry.package.name + name = self.generate_env_name(name, str(self._poetry.file.parent)) envs_file = TomlFile(venv_path / self.ENVS_FILE) if envs_file.exists(): @@ -243,21 +300,22 @@ def deactivate(self, cwd, io): # type: (Optional[Path], IO) -> None envs_file.write(envs) - def get(self, cwd, reload=False): # type: (Path, bool) -> Env + def get(self, reload=False): # type: (bool) -> Env if self._env is not None and not reload: return self._env python_minor = ".".join([str(v) for v in sys.version_info[:2]]) - venv_path = self._config.get("virtualenvs.path") + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: venv_path = Path(venv_path) + cwd = self._poetry.file.parent envs_file = TomlFile(venv_path / self.ENVS_FILE) env = None - base_env_name = self.generate_env_name(cwd.name, str(cwd)) + base_env_name = self.generate_env_name(self._poetry.package.name, str(cwd)) if envs_file.exists(): envs = envs_file.read() env = envs.get(base_env_name) @@ -265,7 +323,13 @@ def get(self, cwd, reload=False): # type: (Path, bool) -> Env python_minor = env["minor"] # Check if we are inside a virtualenv or not - in_venv = os.environ.get("VIRTUAL_ENV") is not None + # Conda sets CONDA_PREFIX in its envs, see + # https://github.com/conda/conda/issues/2764 + env_prefix = os.environ.get("VIRTUAL_ENV", os.environ.get("CONDA_PREFIX")) + conda_env_name = os.environ.get("CONDA_DEFAULT_ENV") + # It's probably not a good idea to pollute Conda's global "base" env, since + # most users have it activated all the time. + in_venv = env_prefix is not None and conda_env_name != "base" if not in_venv or env is not None: # Checking if a local virtualenv exists @@ -274,12 +338,12 @@ def get(self, cwd, reload=False): # type: (Path, bool) -> Env return VirtualEnv(venv) - create_venv = self._config.get("virtualenvs.create", True) + create_venv = self._poetry.config.get("virtualenvs.create", True) if not create_venv: return SystemEnv(Path(sys.prefix)) - venv_path = self._config.get("virtualenvs.path") + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: @@ -294,8 +358,8 @@ def get(self, cwd, reload=False): # type: (Path, bool) -> Env return VirtualEnv(venv) - if os.environ.get("VIRTUAL_ENV") is not None: - prefix = Path(os.environ["VIRTUAL_ENV"]) + if env_prefix is not None: + prefix = Path(env_prefix) base_prefix = None else: prefix = Path(sys.prefix) @@ -303,35 +367,45 @@ def get(self, cwd, reload=False): # type: (Path, bool) -> Env return VirtualEnv(prefix, base_prefix) - def list(self, cwd, name=None): # type: (Path, Optional[str]) -> List[VirtualEnv] + def list(self, name=None): # type: (Optional[str]) -> List[VirtualEnv] if name is None: - name = cwd.name + name = self._poetry.package.name - venv_name = self.generate_env_name(name, str(cwd)) + venv_name = self.generate_env_name(name, str(self._poetry.file.parent)) - venv_path = self._config.get("virtualenvs.path") + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: venv_path = Path(venv_path) - return [ + env_list = [ VirtualEnv(Path(p)) for p in sorted(venv_path.glob("{}-py*".format(venv_name))) ] - def remove(self, python, cwd): # type: (str, Optional[Path]) -> Env - venv_path = self._config.get("virtualenvs.path") + venv = self._poetry.file.parent / ".venv" + if ( + self._poetry.config.get("virtualenvs.in-project") + and venv.exists() + and venv.is_dir() + ): + env_list.insert(0, VirtualEnv(venv)) + return env_list + + def remove(self, python): # type: (str) -> Env + venv_path = self._poetry.config.get("virtualenvs.path") if venv_path is None: venv_path = Path(CACHE_DIR) / "virtualenvs" else: venv_path = Path(venv_path) + cwd = self._poetry.file.parent envs_file = TomlFile(venv_path / self.ENVS_FILE) - base_env_name = self.generate_env_name(cwd.name, str(cwd)) + base_env_name = self.generate_env_name(self._poetry.package.name, str(cwd)) if python.startswith(base_env_name): - venvs = self.list(cwd) + venvs = self.list() for venv in venvs: if venv.path.name == python: # Exact virtualenv name @@ -374,7 +448,7 @@ def remove(self, python, cwd): # type: (str, Optional[Path]) -> Env try: python_version = decode( subprocess.check_output( - " ".join( + list_to_shell_command( [ python, "-c", @@ -413,20 +487,25 @@ def remove(self, python, cwd): # type: (str, Optional[Path]) -> Env return VirtualEnv(venv) def create_venv( - self, cwd, io, name=None, executable=None, force=False - ): # type: (Path, IO, Optional[str], Optional[str], bool) -> Env + self, io, name=None, executable=None, force=False + ): # type: (IO, Optional[str], Optional[str], bool) -> Env if self._env is not None and not force: return self._env - env = self.get(cwd, reload=True) + cwd = self._poetry.file.parent + env = self.get(reload=True) + + if not env.is_sane(): + force = True + if env.is_venv() and not force: # Already inside a virtualenv. return env - create_venv = self._config.get("virtualenvs.create") - root_venv = self._config.get("virtualenvs.in-project") + create_venv = self._poetry.config.get("virtualenvs.create") + root_venv = self._poetry.config.get("virtualenvs.in-project") - venv_path = self._config.get("virtualenvs.path") + venv_path = self._poetry.config.get("virtualenvs.path") if root_venv: venv_path = cwd / ".venv" elif venv_path is None: @@ -435,23 +514,98 @@ def create_venv( venv_path = Path(venv_path) if not name: - name = cwd.name + name = self._poetry.package.name + python_patch = ".".join([str(v) for v in sys.version_info[:3]]) python_minor = ".".join([str(v) for v in sys.version_info[:2]]) if executable: - python_minor = decode( + python_patch = decode( subprocess.check_output( - " ".join( + list_to_shell_command( [ executable, "-c", - "\"import sys; print('.'.join([str(s) for s in sys.version_info[:2]]))\"", + "\"import sys; print('.'.join([str(s) for s in sys.version_info[:3]]))\"", ] ), shell=True, + ).strip() + ) + python_minor = ".".join(python_patch.split(".")[:2]) + + supported_python = self._poetry.package.python_constraint + if not supported_python.allows(Version.parse(python_patch)): + # The currently activated or chosen Python version + # is not compatible with the Python constraint specified + # for the project. + # If an executable has been specified, we stop there + # and notify the user of the incompatibility. + # Otherwise, we try to find a compatible Python version. + if executable: + raise NoCompatiblePythonVersionFound( + self._poetry.package.python_versions, python_patch + ) + + io.write_line( + "The currently activated Python version {} " + "is not supported by the project ({}).\n" + "Trying to find and use a compatible version. ".format( + python_patch, self._poetry.package.python_versions ) ) + for python_to_try in reversed( + sorted( + self._poetry.package.AVAILABLE_PYTHONS, + key=lambda v: (v.startswith("3"), -len(v), v), + ) + ): + if len(python_to_try) == 1: + if not parse_constraint("^{}.0".format(python_to_try)).allows_any( + supported_python + ): + continue + elif not supported_python.allows_all( + parse_constraint(python_to_try + ".*") + ): + continue + + python = "python" + python_to_try + + if io.is_debug(): + io.write_line("Trying {}".format(python)) + + try: + python_patch = decode( + subprocess.check_output( + list_to_shell_command( + [ + python, + "-c", + "\"import sys; print('.'.join([str(s) for s in sys.version_info[:3]]))\"", + ] + ), + stderr=subprocess.STDOUT, + shell=True, + ).strip() + ) + except CalledProcessError: + continue + + if not python_patch: + continue + + if supported_python.allows(Version.parse(python_patch)): + io.write_line("Using {} ({})".format(python, python_patch)) + executable = python + python_minor = ".".join(python_patch.split(".")[:2]) + break + + if not executable: + raise NoCompatiblePythonVersionFound( + self._poetry.package.python_versions + ) + if root_venv: venv = venv_path else: @@ -471,19 +625,25 @@ def create_venv( return SystemEnv(Path(sys.prefix)) io.write_line( - "Creating virtualenv {} in {}".format(name, str(venv_path)) + "Creating virtualenv {} in {}".format(name, str(venv_path)) ) self.build_venv(str(venv), executable=executable) else: if force: + if not env.is_sane(): + io.write_line( + "The virtual environment found in {} seems to be broken.".format( + env.path + ) + ) io.write_line( - "Recreating virtualenv {} in {}".format(name, str(venv)) + "Recreating virtualenv {} in {}".format(name, str(venv)) ) self.remove_venv(str(venv)) self.build_venv(str(venv), executable=executable) elif io.is_very_verbose(): - io.write_line("Virtualenv {} already exists.".format(name)) + io.write_line("Virtualenv {} already exists.".format(name)) # venv detection: # stdlib venv may symlink sys.executable, so we can't use realpath. @@ -503,12 +663,15 @@ def create_venv( return VirtualEnv(venv) - def build_venv(self, path, executable=None): + @classmethod + def build_venv(cls, path, executable=None): if executable is not None: # Create virtualenv by using an external executable try: p = subprocess.Popen( - " ".join([executable, "-"]), stdin=subprocess.PIPE, shell=True + list_to_shell_command([executable, "-"]), + stdin=subprocess.PIPE, + shell=True, ) p.communicate(encode(CREATE_VENV_COMMAND.format(path))) except CalledProcessError as e: @@ -526,14 +689,18 @@ def build_venv(self, path, executable=None): use_symlinks = True builder = EnvBuilder(with_pip=True, symlinks=use_symlinks) - build = builder.create + builder.create(path) except ImportError: - # We fallback on virtualenv for Python 2.7 - from virtualenv import create_environment + try: + # We fallback on virtualenv for Python 2.7 + from virtualenv import create_environment - build = create_environment + create_environment(path) + except ImportError: + # since virtualenv>20 we have to use cli_run + from virtualenv import cli_run - build(path) + cli_run([path]) def remove_venv(self, path): # type: (str) -> None shutil.rmtree(path) @@ -573,6 +740,8 @@ def __init__(self, path, base=None): # type: (Path, Optional[Path]) -> None self._marker_env = None self._pip_version = None + self._site_packages = None + self._paths = None @property def path(self): # type: () -> Path @@ -628,15 +797,21 @@ def pip_version(self): @property def site_packages(self): # type: () -> Path - if self._is_windows: - return self._path / "Lib" / "site-packages" - - return ( - self._path - / "lib" - / "python{}.{}".format(*self.version_info[:2]) - / "site-packages" - ) + if self._site_packages is None: + self._site_packages = Path(self.paths["purelib"]) + + return self._site_packages + + @property + def sys_path(self): # type: () -> List[str] + raise NotImplementedError() + + @property + def paths(self): # type: () -> Dict[str, str] + if self._paths is None: + self._paths = self.get_paths() + + return self._paths @classmethod def get_base_prefix(cls): # type: () -> Path @@ -657,12 +832,18 @@ def get_python_implementation(self): # type: () -> str def get_marker_env(self): # type: () -> Dict[str, Any] raise NotImplementedError() + def get_pip_command(self): # type: () -> List[str] + raise NotImplementedError() + def config_var(self, var): # type: (str) -> Any raise NotImplementedError() def get_pip_version(self): # type: () -> Version raise NotImplementedError() + def get_paths(self): # type: () -> Dict[str, str] + raise NotImplementedError() + def is_valid_for_marker(self, marker): # type: (BaseMarker) -> bool return marker.validate(self.marker_env) @@ -673,12 +854,19 @@ def is_sane(self): # type: () -> bool return True def run(self, bin, *args, **kwargs): + bin = self._bin(bin) + cmd = [bin] + list(args) + return self._run(cmd, **kwargs) + + def run_pip(self, *args, **kwargs): + pip = self.get_pip_command() + cmd = pip + list(args) + return self._run(cmd, **kwargs) + + def _run(self, cmd, **kwargs): """ Run a command inside the Python environment. """ - bin = self._bin(bin) - - cmd = [bin] + list(args) shell = kwargs.get("shell", False) call = kwargs.pop("call", False) input_ = kwargs.pop("input_", None) @@ -712,7 +900,16 @@ def run(self, bin, *args, **kwargs): def execute(self, bin, *args, **kwargs): bin = self._bin(bin) - return subprocess.call([bin] + list(args), **kwargs) + if not self._is_windows: + args = [bin] + list(args) + if "env" in kwargs: + return os.execvpe(bin, args, kwargs["env"]) + else: + return os.execvp(bin, args) + else: + exe = subprocess.Popen([bin] + list(args), **kwargs) + exe.communicate() + return exe.returncode def is_venv(self): # type: () -> bool raise NotImplementedError() @@ -752,12 +949,44 @@ class SystemEnv(Env): A system (i.e. not a virtualenv) Python environment. """ + @property + def sys_path(self): # type: () -> List[str] + return sys.path + def get_version_info(self): # type: () -> Tuple[int] return sys.version_info def get_python_implementation(self): # type: () -> str return platform.python_implementation() + def get_pip_command(self): # type: () -> List[str] + # If we're not in a venv, assume the interpreter we're running on + # has a pip and use that + return [sys.executable, "-m", "pip"] + + def get_paths(self): # type: () -> Dict[str, str] + # We can't use sysconfig.get_paths() because + # on some distributions it does not return the proper paths + # (those used by pip for instance). We go through distutils + # to get the proper ones. + from distutils.core import Distribution + from distutils.command.install import SCHEME_KEYS # noqa + + d = Distribution() + d.parse_config_files() + obj = d.get_command_obj("install", create=True) + obj.finalize_options() + + paths = sysconfig.get_paths().copy() + for key in SCHEME_KEYS: + if key == "headers": + # headers is not a path returned by sysconfig.get_paths() + continue + + paths[key] = getattr(obj, "install_{}".format(key)) + + return paths + def get_marker_env(self): # type: () -> Dict[str, Any] if hasattr(sys, "implementation"): info = sys.implementation.version @@ -781,7 +1010,9 @@ def get_marker_env(self): # type: () -> Dict[str, Any] "platform_version": platform.version(), "python_full_version": platform.python_version(), "platform_python_implementation": platform.python_implementation(), - "python_version": platform.python_version()[:3], + "python_version": ".".join( + v for v in platform.python_version().split(".")[:2] + ), "sys_platform": sys.platform, "version_info": sys.version_info, } @@ -818,6 +1049,12 @@ def __init__(self, path, base=None): # type: (Path, Optional[Path]) -> None if base is None: self._base = Path(self.run("python", "-", input_=GET_BASE_PREFIX).strip()) + @property + def sys_path(self): # type: () -> List[str] + output = self.run("python", "-", input_=GET_SYS_PATH) + + return json.loads(output) + def get_version_info(self): # type: () -> Tuple[int] output = self.run("python", "-", input_=GET_PYTHON_VERSION) @@ -826,6 +1063,11 @@ def get_version_info(self): # type: () -> Tuple[int] def get_python_implementation(self): # type: () -> str return self.marker_env["platform_python_implementation"] + def get_pip_command(self): # type: () -> List[str] + # We're in a virtualenv that is known to be sane, + # so assume that we have a functional pip + return [self._bin("pip")] + def get_marker_env(self): # type: () -> Dict[str, Any] output = self.run("python", "-", input_=GET_ENVIRONMENT_INFO) @@ -850,13 +1092,18 @@ def config_var(self, var): # type: (str) -> Any return value def get_pip_version(self): # type: () -> Version - output = self.run("python", "-m", "pip", "--version").strip() + output = self.run_pip("--version").strip() m = re.match("pip (.+?)(?: from .+)?$", output) if not m: return Version.parse("0.0") return Version.parse(m.group(1)) + def get_paths(self): # type: () -> Dict[str, str] + output = self.run("python", "-", input_=GET_PATHS) + + return json.loads(output) + def is_venv(self): # type: () -> bool return True @@ -864,7 +1111,7 @@ def is_sane(self): # A virtualenv is considered sane if both "python" and "pip" exist. return os.path.exists(self._bin("python")) and os.path.exists(self._bin("pip")) - def run(self, bin, *args, **kwargs): + def _run(self, cmd, **kwargs): with self.temp_environ(): os.environ["PATH"] = self._updated_path() os.environ["VIRTUAL_ENV"] = str(self._path) @@ -872,7 +1119,7 @@ def run(self, bin, *args, **kwargs): self.unset_env("PYTHONHOME") self.unset_env("__PYVENV_LAUNCHER__") - return super(VirtualEnv, self).run(bin, *args, **kwargs) + return super(VirtualEnv, self)._run(cmd, **kwargs) def execute(self, bin, *args, **kwargs): with self.temp_environ(): @@ -911,11 +1158,14 @@ def __init__(self, path=None, base=None, execute=False): self._execute = execute self.executed = [] - def run(self, bin, *args, **kwargs): - self.executed.append([bin] + list(args)) + def get_pip_command(self): # type: () -> List[str] + return [self._bin("python"), "-m", "pip"] + + def _run(self, cmd, **kwargs): + self.executed.append(cmd) if self._execute: - return super(NullEnv, self).run(bin, *args, **kwargs) + return super(NullEnv, self)._run(cmd, **kwargs) def execute(self, bin, *args, **kwargs): self.executed.append([bin] + list(args)) @@ -936,6 +1186,9 @@ def __init__( os_name="posix", is_venv=False, pip_version="19.1", + sys_path=None, + marker_env=None, + config_vars=None, **kwargs ): super(MockEnv, self).__init__(**kwargs) @@ -946,6 +1199,9 @@ def __init__( self._os_name = os_name self._is_venv = is_venv self._pip_version = Version.parse(pip_version) + self._sys_path = sys_path + self._mock_marker_env = marker_env + self._config_vars = config_vars @property def version_info(self): # type: () -> Tuple[int] @@ -967,5 +1223,33 @@ def os(self): # type: () -> str def pip_version(self): return self._pip_version + @property + def sys_path(self): + if self._sys_path is None: + return super(MockEnv, self).sys_path + + return self._sys_path + + def get_marker_env(self): # type: () -> Dict[str, Any] + if self._mock_marker_env is not None: + return self._mock_marker_env + + marker_env = super(MockEnv, self).get_marker_env() + marker_env["python_implementation"] = self._python_implementation + marker_env["version_info"] = self._version_info + marker_env["python_version"] = ".".join(str(v) for v in self._version_info[:2]) + marker_env["sys_platform"] = self._platform + + return marker_env + def is_venv(self): # type: () -> bool return self._is_venv + + def config_var(self, var): # type: (str) -> Any + if self._config_vars is None: + return super().config_var(var) + else: + try: + return self._config_vars[var] + except KeyError: + return None diff --git a/poetry/utils/exporter.py b/poetry/utils/exporter.py index 94b3c797111..116e20c8804 100644 --- a/poetry/utils/exporter.py +++ b/poetry/utils/exporter.py @@ -2,10 +2,10 @@ from clikit.api.io import IO -from poetry.packages.directory_dependency import DirectoryDependency -from poetry.packages.file_dependency import FileDependency -from poetry.packages.url_dependency import URLDependency -from poetry.packages.vcs_dependency import VCSDependency +from poetry.core.packages.directory_dependency import DirectoryDependency +from poetry.core.packages.file_dependency import FileDependency +from poetry.core.packages.url_dependency import URLDependency +from poetry.core.packages.vcs_dependency import VCSDependency from poetry.poetry import Poetry from poetry.utils._compat import Path from poetry.utils._compat import decode @@ -17,7 +17,9 @@ class Exporter(object): Exporter class to export a lock file to alternative formats. """ - ACCEPTED_FORMATS = ("requirements.txt",) + FORMAT_REQUIREMENTS_TXT = "requirements.txt" + #: The names of the supported export formats. + ACCEPTED_FORMATS = (FORMAT_REQUIREMENTS_TXT,) ALLOWED_HASH_ALGORITHMS = ("sha256", "sha384", "sha512") def __init__(self, poetry): # type: (Poetry) -> None @@ -54,7 +56,7 @@ def _export_requirements_txt( extras=None, with_credentials=False, ): # type: (Path, Union[IO, str], bool, bool, bool) -> None - indexes = [] + indexes = set() content = "" packages = self._poetry.locker.locked_repository(dev).packages @@ -94,7 +96,7 @@ def _export_requirements_txt( dependency.marker = package.marker line = "{}".format(package.source_url) - if package.develop: + if package.develop and package.source_type == "directory": line = "-e " + line else: dependency = package.to_dependency() @@ -104,12 +106,16 @@ def _export_requirements_txt( if ";" in requirement: line += "; {}".format(requirement.split(";")[1].strip()) - if package.source_type == "legacy" and package.source_url: - indexes.append(package.source_url) + if ( + package.source_type not in {"git", "directory", "file", "url"} + and package.source_url + ): + indexes.add(package.source_url) - if package.hashes and with_hashes: + if package.files and with_hashes: hashes = [] - for h in package.hashes: + for f in package.files: + h = f["hash"] algorithm = "sha256" if ":" in h: algorithm, h = h.split(":") @@ -123,17 +129,16 @@ def _export_requirements_txt( line += " \\\n" for i, h in enumerate(hashes): line += " --hash={}{}".format( - h, " \\\n" if i < len(package.hashes) - 1 else "" + h, " \\\n" if i < len(hashes) - 1 else "" ) line += "\n" content += line if indexes: - # If we have extra indexes, we add them to the begin - # of the output + # If we have extra indexes, we add them to the beginning of the output indexes_header = "" - for index in indexes: + for index in sorted(indexes): repository = [ r for r in self._poetry.pool.repositories diff --git a/poetry/utils/extras.py b/poetry/utils/extras.py index 7a1b24ad42e..32b02ee9b00 100644 --- a/poetry/utils/extras.py +++ b/poetry/utils/extras.py @@ -1,12 +1,15 @@ -from typing import Iterator, Mapping, Sequence +from typing import Iterator +from typing import List +from typing import Mapping +from typing import Sequence -from poetry.packages import Package +from poetry.core.packages import Package from poetry.utils.helpers import canonicalize_name def get_extra_package_names( packages, # type: Sequence[Package] - extras, # type: Mapping[str, Collection[str]] + extras, # type: Mapping[str, List[str]] extra_names, # type: Sequence[str] ): # type: (...) -> Iterator[str] """ diff --git a/poetry/utils/helpers.py b/poetry/utils/helpers.py index 1e7bc660424..ac00c53bec0 100644 --- a/poetry/utils/helpers.py +++ b/poetry/utils/helpers.py @@ -1,4 +1,3 @@ -import collections import os import re import shutil @@ -6,14 +5,20 @@ import tempfile from contextlib import contextmanager -from typing import List from typing import Optional -from keyring import delete_password, set_password, get_password -from keyring.errors import KeyringError +import requests from poetry.config.config import Config -from poetry.version import Version +from poetry.core.version import Version +from poetry.utils._compat import Path + + +try: + from collections.abc import Mapping +except ImportError: + from collections import Mapping + _canonicalize_regex = re.compile("[-_]+") @@ -30,125 +35,68 @@ def normalize_version(version): # type: (str) -> str return str(Version(version)) -@contextmanager -def temporary_directory(*args, **kwargs): - try: - from tempfile import TemporaryDirectory - - with TemporaryDirectory(*args, **kwargs) as name: - yield name - except ImportError: - name = tempfile.mkdtemp(*args, **kwargs) - - yield name - - shutil.rmtree(name) - - -def parse_requires(requires): # type: (str) -> List[str] - lines = requires.split("\n") - - requires_dist = [] - in_section = False - current_marker = None - for line in lines: - line = line.strip() - if not line: - if in_section: - in_section = False - - continue - - if line.startswith("["): - # extras or conditional dependencies - marker = line.lstrip("[").rstrip("]") - if ":" not in marker: - extra, marker = marker, None - else: - extra, marker = marker.split(":") +def _del_ro(action, name, exc): + os.chmod(name, stat.S_IWRITE) + os.remove(name) - if extra: - if marker: - marker = '{} and extra == "{}"'.format(marker, extra) - else: - marker = 'extra == "{}"'.format(extra) - if marker: - current_marker = marker - - continue - - if current_marker: - line = "{}; {}".format(line, current_marker) - - requires_dist.append(line) - - return requires_dist +@contextmanager +def temporary_directory(*args, **kwargs): + name = tempfile.mkdtemp(*args, **kwargs) + yield name -def keyring_service_name(repository_name): # type: (str) -> str - return "{}-{}".format("poetry-repository", repository_name) + shutil.rmtree(name, onerror=_del_ro) -def keyring_repository_password_get( - repository_name, username -): # type: (str, str) -> Optional[str] - try: - return get_password(keyring_service_name(repository_name), username) - except (RuntimeError, KeyringError): +def get_cert(config, repository_name): # type: (Config, str) -> Optional[Path] + cert = config.get("certificates.{}.cert".format(repository_name)) + if cert: + return Path(cert) + else: return None -def keyring_repository_password_set( - repository_name, username, password -): # type: (str, str, str) -> None - try: - set_password(keyring_service_name(repository_name), username, password) - except (RuntimeError, KeyringError): - raise RuntimeError("Failed to store password in keyring") - - -def keyring_repository_password_del( - config, repository_name -): # type: (Config, str) -> None - try: - repo_auth = config.get("http-basic.{}".format(repository_name)) - if repo_auth and "username" in repo_auth: - delete_password( - keyring_service_name(repository_name), repo_auth["username"] - ) - except (RuntimeError, KeyringError): - pass - - -def get_http_basic_auth( - config, repository_name -): # type: (Config, str) -> Optional[tuple] - repo_auth = config.get("http-basic.{}".format(repository_name)) - if repo_auth: - username, password = repo_auth["username"], repo_auth.get("password") - if password is None: - password = keyring_repository_password_get(repository_name, username) - return username, password - return None +def get_client_cert(config, repository_name): # type: (Config, str) -> Optional[Path] + client_cert = config.get("certificates.{}.client-cert".format(repository_name)) + if client_cert: + return Path(client_cert) + else: + return None def _on_rm_error(func, path, exc_info): + if not os.path.exists(path): + return + os.chmod(path, stat.S_IWRITE) func(path) def safe_rmtree(path): + if Path(path).is_symlink(): + return os.unlink(str(path)) + shutil.rmtree(path, onerror=_on_rm_error) def merge_dicts(d1, d2): for k, v in d2.items(): - if ( - k in d1 - and isinstance(d1[k], dict) - and isinstance(d2[k], collections.Mapping) - ): + if k in d1 and isinstance(d1[k], dict) and isinstance(d2[k], Mapping): merge_dicts(d1[k], d2[k]) else: d1[k] = d2[k] + + +def download_file( + url, dest, session=None, chunk_size=1024 +): # type: (str, str, Optional[requests.Session], int) -> None + get = requests.get if not session else session.get + + with get(url, stream=True) as response: + response.raise_for_status() + + with open(dest, "wb") as f: + for chunk in response.iter_content(chunk_size=chunk_size): + if chunk: + f.write(chunk) diff --git a/poetry/utils/inspector.py b/poetry/utils/inspector.py deleted file mode 100644 index 8b43180231d..00000000000 --- a/poetry/utils/inspector.py +++ /dev/null @@ -1,236 +0,0 @@ -from typing import Dict -from typing import List -from typing import Union - -import logging -import os -import tarfile -import zipfile -from bz2 import BZ2File -from gzip import GzipFile - -import pkginfo -from requests import get - -from ._compat import Path -from .helpers import parse_requires -from .setup_reader import SetupReader -from .toml_file import TomlFile - -logger = logging.getLogger(__name__) - - -class Inspector: - """ - A class to download and inspect remote packages. - """ - - @classmethod - def download(cls, url, dest): # type: (str, Path) -> None - r = get(url, stream=True) - r.raise_for_status() - - with open(str(dest), "wb") as f: - for chunk in r.iter_content(chunk_size=1024): - if chunk: - f.write(chunk) - - def inspect(self, file_path): # type: (Path) -> Dict[str, Union[str, List[str]]] - if file_path.suffix == ".whl": - return self.inspect_wheel(file_path) - - return self.inspect_sdist(file_path) - - def inspect_wheel( - self, file_path - ): # type: (Path) -> Dict[str, Union[str, List[str]]] - info = { - "name": "", - "version": "", - "summary": "", - "requires_python": None, - "requires_dist": [], - } - - try: - meta = pkginfo.Wheel(str(file_path)) - except ValueError: - # Unable to determine dependencies - # Assume none - return info - - if meta.name: - info["name"] = meta.name - - if meta.version: - info["version"] = meta.version - - if meta.summary: - info["summary"] = meta.summary or "" - - info["requires_python"] = meta.requires_python - - if meta.requires_dist: - info["requires_dist"] = meta.requires_dist - - return info - - def inspect_sdist( - self, file_path - ): # type: (Path) -> Dict[str, Union[str, List[str]]] - info = { - "name": "", - "version": "", - "summary": "", - "requires_python": None, - "requires_dist": None, - } - - try: - meta = pkginfo.SDist(str(file_path)) - if meta.name: - info["name"] = meta.name - - if meta.version: - info["version"] = meta.version - - if meta.summary: - info["summary"] = meta.summary - - if meta.requires_python: - info["requires_python"] = meta.requires_python - - if meta.requires_dist: - info["requires_dist"] = list(meta.requires_dist) - - return info - except ValueError: - # Unable to determine dependencies - # We pass and go deeper - pass - - # Still not dependencies found - # So, we unpack and introspect - suffix = file_path.suffix - gz = None - if suffix == ".zip": - tar = zipfile.ZipFile(str(file_path)) - else: - if suffix == ".bz2": - gz = BZ2File(str(file_path)) - suffixes = file_path.suffixes - if len(suffixes) > 1 and suffixes[-2] == ".tar": - suffix = ".tar.bz2" - else: - gz = GzipFile(str(file_path)) - suffix = ".tar.gz" - - tar = tarfile.TarFile(str(file_path), fileobj=gz) - - try: - tar.extractall(os.path.join(str(file_path.parent), "unpacked")) - finally: - if gz: - gz.close() - - tar.close() - - unpacked = file_path.parent / "unpacked" - elements = list(unpacked.glob("*")) - if len(elements) == 1 and elements[0].is_dir(): - sdist_dir = elements[0] - else: - sdist_dir = unpacked / file_path.name.rstrip(suffix) - - pyproject = TomlFile(sdist_dir / "pyproject.toml") - if pyproject.exists(): - from poetry.poetry import Poetry - - pyproject_content = pyproject.read() - if "tool" in pyproject_content and "poetry" in pyproject_content["tool"]: - package = Poetry.create(sdist_dir).package - return { - "name": package.name, - "version": package.version.text, - "summary": package.description, - "requires_dist": [dep.to_pep_508() for dep in package.requires], - "requires_python": package.python_versions, - } - - # Checking for .egg-info at root - eggs = list(sdist_dir.glob("*.egg-info")) - if eggs: - egg_info = eggs[0] - - requires = egg_info / "requires.txt" - if requires.exists(): - with requires.open(encoding="utf-8") as f: - info["requires_dist"] = parse_requires(f.read()) - - return info - - # Searching for .egg-info in sub directories - eggs = list(sdist_dir.glob("**/*.egg-info")) - if eggs: - egg_info = eggs[0] - - requires = egg_info / "requires.txt" - if requires.exists(): - with requires.open(encoding="utf-8") as f: - info["requires_dist"] = parse_requires(f.read()) - - return info - - # Still nothing, try reading (without executing it) - # the setup.py file. - try: - setup_info = self._inspect_sdist_with_setup(sdist_dir) - - for key, value in info.items(): - if value: - continue - - info[key] = setup_info[key] - - return info - except Exception as e: - logger.warning( - "An error occurred when reading setup.py or setup.cfg: {}".format( - str(e) - ) - ) - return info - - def _inspect_sdist_with_setup( - self, sdist_dir - ): # type: (Path) -> Dict[str, Union[str, List[str]]] - info = { - "name": None, - "version": None, - "summary": "", - "requires_python": None, - "requires_dist": None, - } - - result = SetupReader.read_from_directory(sdist_dir) - requires = "" - for dep in result["install_requires"]: - requires += dep + "\n" - - if result["extras_require"]: - requires += "\n" - - for extra_name, deps in result["extras_require"].items(): - requires += "[{}]\n".format(extra_name) - - for dep in deps: - requires += dep + "\n" - - requires += "\n" - - info["name"] = result["name"] - info["version"] = result["version"] - info["requires_dist"] = parse_requires(requires) - info["requires_python"] = result["python_requires"] - - return info diff --git a/poetry/utils/password_manager.py b/poetry/utils/password_manager.py new file mode 100644 index 00000000000..24a615a46bf --- /dev/null +++ b/poetry/utils/password_manager.py @@ -0,0 +1,192 @@ +import logging + + +logger = logging.getLogger(__name__) + + +class PasswordManagerError(Exception): + + pass + + +class KeyRingError(Exception): + + pass + + +class KeyRing: + def __init__(self, namespace): + self._namespace = namespace + self._is_available = True + + self._check() + + def is_available(self): + return self._is_available + + def get_password(self, name, username): + if not self.is_available(): + return + + import keyring + import keyring.errors + + name = self.get_entry_name(name) + + try: + return keyring.get_password(name, username) + except (RuntimeError, keyring.errors.KeyringError): + raise KeyRingError( + "Unable to retrieve the password for {} from the key ring".format(name) + ) + + def set_password(self, name, username, password): + if not self.is_available(): + return + + import keyring + import keyring.errors + + name = self.get_entry_name(name) + + try: + keyring.set_password(name, username, password) + except (RuntimeError, keyring.errors.KeyringError) as e: + raise KeyRingError( + "Unable to store the password for {} in the key ring: {}".format( + name, str(e) + ) + ) + + def delete_password(self, name, username): + if not self.is_available(): + return + + import keyring + import keyring.errors + + name = self.get_entry_name(name) + + try: + keyring.delete_password(name, username) + except (RuntimeError, keyring.errors.KeyringError): + raise KeyRingError( + "Unable to delete the password for {} from the key ring".format(name) + ) + + def get_entry_name(self, name): + return "{}-{}".format(self._namespace, name) + + def _check(self): + try: + import keyring + except Exception as e: + logger.debug("An error occurred while importing keyring: {}".format(str(e))) + self._is_available = False + + return + + backend = keyring.get_keyring() + name = backend.name.split(" ")[0] + if name == "fail": + logger.debug("No suitable keyring backend found") + self._is_available = False + elif "plaintext" in backend.name.lower(): + logger.debug("Only a plaintext keyring backend is available. Not using it.") + self._is_available = False + elif name == "chainer": + try: + import keyring.backend + + backends = keyring.backend.get_all_keyring() + + self._is_available = any( + [ + b.name.split(" ")[0] not in ["chainer", "fail"] + and "plaintext" not in b.name.lower() + for b in backends + ] + ) + except Exception: + self._is_available = False + + if not self._is_available: + logger.warning("No suitable keyring backends were found") + + +class PasswordManager: + def __init__(self, config): + self._config = config + self._keyring = None + + @property + def keyring(self): + if self._keyring is None: + self._keyring = KeyRing("poetry-repository") + if not self._keyring.is_available(): + logger.warning( + "Using a plaintext file to store and retrieve credentials" + ) + + return self._keyring + + def set_pypi_token(self, name, token): + if not self.keyring.is_available(): + self._config.auth_config_source.add_property( + "pypi-token.{}".format(name), token + ) + else: + self.keyring.set_password(name, "__token__", token) + + def get_pypi_token(self, name): + if not self.keyring.is_available(): + return self._config.get("pypi-token.{}".format(name)) + + return self.keyring.get_password(name, "__token__") + + def delete_pypi_token(self, name): + if not self.keyring.is_available(): + return self._config.auth_config_source.remove_property( + "pypi-token.{}".format(name) + ) + + self.keyring.delete_password(name, "__token__") + + def get_http_auth(self, name): + auth = self._config.get("http-basic.{}".format(name)) + if not auth: + username = self._config.get("http-basic.{}.username".format(name)) + password = self._config.get("http-basic.{}.password".format(name)) + if not username and not password: + return None + else: + username, password = auth["username"], auth.get("password") + if password is None: + password = self.keyring.get_password(name, username) + + return { + "username": username, + "password": password, + } + + def set_http_password(self, name, username, password): + auth = {"username": username} + + if not self.keyring.is_available(): + auth["password"] = password + else: + self.keyring.set_password(name, username, password) + + self._config.auth_config_source.add_property("http-basic.{}".format(name), auth) + + def delete_http_password(self, name): + auth = self.get_http_auth(name) + if not auth or "username" not in auth: + return + + try: + self.keyring.delete_password(name, auth["username"]) + except KeyRingError: + pass + + self._config.auth_config_source.remove_property("http-basic.{}".format(name)) diff --git a/poetry/utils/setup_reader.py b/poetry/utils/setup_reader.py index 165f151d0d6..6af89bc7981 100644 --- a/poetry/utils/setup_reader.py +++ b/poetry/utils/setup_reader.py @@ -1,10 +1,5 @@ import ast -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser - from typing import Any from typing import Dict from typing import Iterable @@ -14,8 +9,14 @@ from typing import Union from ._compat import PY35 -from ._compat import basestring from ._compat import Path +from ._compat import basestring + + +try: + from configparser import ConfigParser +except ImportError: + from ConfigParser import ConfigParser class SetupReader(object): @@ -180,10 +181,12 @@ def _find_setup_call( continue func = value.func - if not isinstance(func, ast.Name): - continue - - if func.id != "setup": + if not (isinstance(func, ast.Name) and func.id == "setup") and not ( + isinstance(func, ast.Attribute) + and hasattr(func.value, "id") + and func.value.id == "setuptools" + and func.attr == "setup" + ): continue return value, elements diff --git a/poetry/utils/shell.py b/poetry/utils/shell.py index a8bc69ed65a..b18bda0dd20 100644 --- a/poetry/utils/shell.py +++ b/poetry/utils/shell.py @@ -5,10 +5,11 @@ import pexpect from clikit.utils.terminal import Terminal -from shellingham import detect_shell from shellingham import ShellDetectionFailure +from shellingham import detect_shell from ._compat import WINDOWS +from ._compat import Path from .env import VirtualEnv @@ -42,7 +43,17 @@ def get(cls): # type: () -> Shell try: name, path = detect_shell(os.getpid()) except (RuntimeError, ShellDetectionFailure): - raise RuntimeError("Unable to detect the current shell.") + shell = None + + if os.name == "posix": + shell = os.environ.get("SHELL") + elif os.name == "nt": + shell = os.environ.get("COMSPEC") + + if not shell: + raise RuntimeError("Unable to detect the current shell.") + + name, path = Path(shell).stem, shell cls._shell = cls(name, path) @@ -58,7 +69,9 @@ def activate(self, env): # type: (VirtualEnv) -> None self._path, ["-i"], dimensions=(terminal.height, terminal.width) ) - c.setecho(False) + if self._name == "zsh": + c.setecho(False) + activate_script = self._get_activate_script() bin_dir = "Scripts" if WINDOWS else "bin" activate_path = env.path / bin_dir / activate_script diff --git a/poetry/utils/toml_file.py b/poetry/utils/toml_file.py index 2d81bb31570..648defa2a4c 100644 --- a/poetry/utils/toml_file.py +++ b/poetry/utils/toml_file.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from tomlkit.toml_file import TOMLFile as BaseTOMLFile from typing import Union +from tomlkit.toml_file import TOMLFile as BaseTOMLFile + from ._compat import Path diff --git a/poetry/vcs/__init__.py b/poetry/vcs/__init__.py deleted file mode 100644 index d242ca6c285..00000000000 --- a/poetry/vcs/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -import subprocess -import warnings - -from poetry.utils._compat import Path - -from .git import Git - - -def get_vcs(directory): # type: (Path) -> Git - directory = directory.resolve() - - for p in [directory] + list(directory.parents): - if (p / ".git").is_dir(): - try: - return Git(p) - except (subprocess.CalledProcessError, OSError): - # Either git could not be found or does not exist - warnings.warn( - "git executable could not be found", category=RuntimeWarning - ) - - return diff --git a/poetry/vcs/git.py b/poetry/vcs/git.py deleted file mode 100644 index c3b8b2285b3..00000000000 --- a/poetry/vcs/git.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -import re -import subprocess - - -from poetry.utils._compat import decode - - -class GitConfig: - def __init__(self, requires_git_presence=False): - self._config = {} - - try: - config_list = decode( - subprocess.check_output( - ["git", "config", "-l"], stderr=subprocess.STDOUT - ) - ) - - m = re.findall("(?ms)^([^=]+)=(.*?)$", config_list) - if m: - for group in m: - self._config[group[0]] = group[1] - except (subprocess.CalledProcessError, OSError): - if requires_git_presence: - raise - - def get(self, key, default=None): - return self._config.get(key, default) - - def __getitem__(self, item): - return self._config[item] - - -class Git: - def __init__(self, work_dir=None): - self._config = GitConfig(requires_git_presence=True) - self._work_dir = work_dir - - @property - def config(self): # type: () -> GitConfig - return self._config - - def clone(self, repository, dest): # type: (...) -> str - return self.run("clone", repository, str(dest)) - - def checkout(self, rev, folder=None): # type: (...) -> str - args = [] - if folder is None and self._work_dir: - folder = self._work_dir - - if folder: - args += [ - "--git-dir", - (folder / ".git").as_posix(), - "--work-tree", - folder.as_posix(), - ] - - args += ["checkout", rev] - - return self.run(*args) - - def rev_parse(self, rev, folder=None): # type: (...) -> str - args = [] - if folder is None and self._work_dir: - folder = self._work_dir - - if folder: - args += [ - "--git-dir", - (folder / ".git").as_posix(), - "--work-tree", - folder.as_posix(), - ] - - args += ["rev-parse", rev] - - return self.run(*args) - - def get_ignored_files(self, folder=None): # type: (...) -> list - args = [] - if folder is None and self._work_dir: - folder = self._work_dir - - if folder: - args += [ - "--git-dir", - (folder / ".git").as_posix(), - "--work-tree", - folder.as_posix(), - ] - - args += ["ls-files", "--others", "-i", "--exclude-standard"] - output = self.run(*args) - - return output.split("\n") - - def run(self, *args): # type: (...) -> str - return decode( - subprocess.check_output(["git"] + list(args), stderr=subprocess.STDOUT) - ) diff --git a/poetry/version/__init__.py b/poetry/version/__init__.py index 62d0349fe3a..e69de29bb2d 100644 --- a/poetry/version/__init__.py +++ b/poetry/version/__init__.py @@ -1,45 +0,0 @@ -import operator - -from typing import Union - -from .exceptions import InvalidVersion -from .legacy_version import LegacyVersion -from .version import Version - - -OP_EQ = operator.eq -OP_LT = operator.lt -OP_LE = operator.le -OP_GT = operator.gt -OP_GE = operator.ge -OP_NE = operator.ne - -_trans_op = { - "=": OP_EQ, - "==": OP_EQ, - "<": OP_LT, - "<=": OP_LE, - ">": OP_GT, - ">=": OP_GE, - "!=": OP_NE, -} - - -def parse( - version, # type: str - strict=False, # type: bool -): # type:(...) -> Union[Version, LegacyVersion] - """ - Parse the given version string and return either a :class:`Version` object - or a LegacyVersion object depending on if the given version is - a valid PEP 440 version or a legacy version. - - If strict=True only PEP 440 versions will be accepted. - """ - try: - return Version(version) - except InvalidVersion: - if strict: - raise - - return LegacyVersion(version) diff --git a/poetry/version/base.py b/poetry/version/base.py deleted file mode 100644 index b2281c90b71..00000000000 --- a/poetry/version/base.py +++ /dev/null @@ -1,27 +0,0 @@ -class BaseVersion: - def __hash__(self): - return hash(self._key) - - def __lt__(self, other): - return self._compare(other, lambda s, o: s < o) - - def __le__(self, other): - return self._compare(other, lambda s, o: s <= o) - - def __eq__(self, other): - return self._compare(other, lambda s, o: s == o) - - def __ge__(self, other): - return self._compare(other, lambda s, o: s >= o) - - def __gt__(self, other): - return self._compare(other, lambda s, o: s > o) - - def __ne__(self, other): - return self._compare(other, lambda s, o: s != o) - - def _compare(self, other, method): - if not isinstance(other, BaseVersion): - return NotImplemented - - return method(self._key, other._key) diff --git a/poetry/version/exceptions.py b/poetry/version/exceptions.py deleted file mode 100644 index 741b13ca1fd..00000000000 --- a/poetry/version/exceptions.py +++ /dev/null @@ -1,3 +0,0 @@ -class InvalidVersion(ValueError): - - pass diff --git a/poetry/version/helpers.py b/poetry/version/helpers.py deleted file mode 100644 index ce84f514af6..00000000000 --- a/poetry/version/helpers.py +++ /dev/null @@ -1,56 +0,0 @@ -from poetry.semver import parse_constraint -from poetry.semver import Version -from poetry.semver import VersionUnion - -PYTHON_VERSION = [ - "2.7.*", - "3.0.*", - "3.1.*", - "3.2.*", - "3.3.*", - "3.4.*", - "3.5.*", - "3.6.*", - "3.7.*", - "3.8.*", -] - - -def format_python_constraint(constraint): - """ - This helper will help in transforming - disjunctive constraint into proper constraint. - """ - if isinstance(constraint, Version): - if constraint.precision >= 3: - return "=={}".format(str(constraint)) - - # Transform 3.6 or 3 - if constraint.precision == 2: - # 3.6 - constraint = parse_constraint( - "~{}.{}".format(constraint.major, constraint.minor) - ) - else: - constraint = parse_constraint("^{}.0".format(constraint.major)) - - if not isinstance(constraint, VersionUnion): - return str(constraint) - - formatted = [] - accepted = [] - - for version in PYTHON_VERSION: - version_constraint = parse_constraint(version) - matches = constraint.allows_any(version_constraint) - if not matches: - formatted.append("!=" + version) - else: - accepted.append(version) - - # Checking lower bound - low = accepted[0] - - formatted.insert(0, ">=" + ".".join(low.split(".")[:2])) - - return ", ".join(formatted) diff --git a/poetry/version/legacy_version.py b/poetry/version/legacy_version.py deleted file mode 100644 index db6a11b6274..00000000000 --- a/poetry/version/legacy_version.py +++ /dev/null @@ -1,90 +0,0 @@ -import re - -from .base import BaseVersion - - -class LegacyVersion(BaseVersion): - def __init__(self, version): - self._version = str(version) - self._key = _legacy_cmpkey(self._version) - - def __str__(self): - return self._version - - def __repr__(self): - return "".format(repr(str(self))) - - @property - def public(self): - return self._version - - @property - def base_version(self): - return self._version - - @property - def local(self): - return None - - @property - def is_prerelease(self): - return False - - @property - def is_postrelease(self): - return False - - -_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE) - -_legacy_version_replacement_map = { - "pre": "c", - "preview": "c", - "-": "final-", - "rc": "c", - "dev": "@", -} - - -def _parse_version_parts(s): - for part in _legacy_version_component_re.split(s): - part = _legacy_version_replacement_map.get(part, part) - - if not part or part == ".": - continue - - if part[:1] in "0123456789": - # pad for numeric comparison - yield part.zfill(8) - else: - yield "*" + part - - # ensure that alpha/beta/candidate are before final - yield "*final" - - -def _legacy_cmpkey(version): - # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch - # greater than or equal to 0. This will effectively put the LegacyVersion, - # which uses the defacto standard originally implemented by setuptools, - # as before all PEP 440 versions. - epoch = -1 - - # This scheme is taken from pkg_resources.parse_version setuptools prior to - # it's adoption of the packaging library. - parts = [] - for part in _parse_version_parts(version.lower()): - if part.startswith("*"): - # remove "-" before a prerelease tag - if part < "*final": - while parts and parts[-1] == "*final-": - parts.pop() - - # remove trailing zeros from each series of numeric parts - while parts and parts[-1] == "00000000": - parts.pop() - - parts.append(part) - parts = tuple(parts) - - return epoch, parts diff --git a/poetry/version/markers.py b/poetry/version/markers.py deleted file mode 100644 index 51cb4973bac..00000000000 --- a/poetry/version/markers.py +++ /dev/null @@ -1,653 +0,0 @@ -import re - -from pyparsing import ParseException, ParseResults, stringStart, stringEnd - -from pyparsing import ZeroOrMore, Group, Forward, QuotedString -from pyparsing import Literal as L # noqa - -from typing import Any -from typing import Dict -from typing import Iterator -from typing import List - - -class InvalidMarker(ValueError): - """ - An invalid marker was found, users should refer to PEP 508. - """ - - -class UndefinedComparison(ValueError): - """ - An invalid operation was attempted on a value that doesn't support it. - """ - - -class UndefinedEnvironmentName(ValueError): - """ - A name was attempted to be used that does not exist inside of the - environment. - """ - - -class Node(object): - def __init__(self, value): - self.value = value - - def __str__(self): - return str(self.value) - - def __repr__(self): - return "<{0}({1!r})>".format(self.__class__.__name__, str(self)) - - def serialize(self): - raise NotImplementedError - - -class Variable(Node): - def serialize(self): - return str(self) - - -class Value(Node): - def serialize(self): - return '"{0}"'.format(self) - - -class Op(Node): - def serialize(self): - return str(self) - - -VARIABLE = ( - L("implementation_version") - | L("platform_python_implementation") - | L("implementation_name") - | L("python_full_version") - | L("platform_release") - | L("platform_version") - | L("platform_machine") - | L("platform_system") - | L("python_version") - | L("sys_platform") - | L("os_name") - | L("os.name") - | L("sys.platform") # PEP-345 - | L("platform.version") # PEP-345 - | L("platform.machine") # PEP-345 - | L("platform.python_implementation") # PEP-345 - | L("python_implementation") # PEP-345 - | L("extra") # undocumented setuptools legacy -) -ALIASES = { - "os.name": "os_name", - "sys.platform": "sys_platform", - "platform.version": "platform_version", - "platform.machine": "platform_machine", - "platform.python_implementation": "platform_python_implementation", - "python_implementation": "platform_python_implementation", -} -VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0]))) - -VERSION_CMP = ( - L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<") -) - -MARKER_OP = VERSION_CMP | L("not in") | L("in") -MARKER_OP.setParseAction(lambda s, l, t: Op(t[0])) - -MARKER_VALUE = QuotedString("'") | QuotedString('"') -MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0])) - -BOOLOP = L("and") | L("or") - -MARKER_VAR = VARIABLE | MARKER_VALUE - -MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR) -MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0])) - -LPAREN = L("(").suppress() -RPAREN = L(")").suppress() - -MARKER_EXPR = Forward() -MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN) -MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR) - -MARKER = stringStart + MARKER_EXPR + stringEnd - - -_undefined = object() - - -def _coerce_parse_result(results): - if isinstance(results, ParseResults): - return [_coerce_parse_result(i) for i in results] - else: - return results - - -def _format_marker(marker, first=True): - assert isinstance(marker, (list, tuple, str)) - - # Sometimes we have a structure like [[...]] which is a single item list - # where the single item is itself it's own list. In that case we want skip - # the rest of this function so that we don't get extraneous () on the - # outside. - if ( - isinstance(marker, list) - and len(marker) == 1 - and isinstance(marker[0], (list, tuple)) - ): - return _format_marker(marker[0]) - - if isinstance(marker, list): - inner = (_format_marker(m, first=False) for m in marker) - if first: - return " ".join(inner) - else: - return "(" + " ".join(inner) + ")" - elif isinstance(marker, tuple): - return " ".join([m.serialize() for m in marker]) - else: - return marker - - -class BaseMarker(object): - def intersect(self, other): # type: (BaseMarker) -> BaseMarker - raise NotImplementedError() - - def union(self, other): # type: (BaseMarker) -> BaseMarker - raise NotImplementedError() - - def is_any(self): # type: () -> bool - return False - - def is_empty(self): # type: () -> bool - return False - - def validate(self, environment): # type: (Dict[str, Any]) -> bool - raise NotImplementedError() - - def without_extras(self): # type: () -> BaseMarker - raise NotImplementedError() - - def __repr__(self): - return "<{} {}>".format(self.__class__.__name__, str(self)) - - -class AnyMarker(BaseMarker): - def intersect(self, other): - return other - - def union(self, other): - return self - - def is_any(self): - return True - - def is_empty(self): # type: () -> bool - return False - - def validate(self, environment): - return True - - def without_extras(self): - return self - - def __str__(self): - return "" - - def __repr__(self): - return "" - - -class EmptyMarker(BaseMarker): - def intersect(self, other): - return self - - def union(self, other): - return other - - def is_any(self): - return False - - def is_empty(self): # type: () -> bool - return True - - def validate(self, environment): - return False - - def without_extras(self): - return self - - def __str__(self): - return "" - - def __repr__(self): - return "" - - -class SingleMarker(BaseMarker): - - _CONSTRAINT_RE = re.compile(r"(?i)^(~=|!=|>=?|<=?|==?|in|not in)?\s*(.+)$") - _VERSION_LIKE_MARKER_NAME = {"python_version", "platform_release"} - - def __init__(self, name, constraint): - from poetry.packages.constraints import ( - parse_constraint as parse_generic_constraint, - ) - from poetry.semver import parse_constraint - - self._name = name - self._constraint_string = str(constraint) - - # Extract operator and value - m = self._CONSTRAINT_RE.match(self._constraint_string) - self._operator = m.group(1) - if self._operator is None: - self._operator = "==" - - self._value = m.group(2) - self._parser = parse_generic_constraint - - if name in self._VERSION_LIKE_MARKER_NAME: - self._parser = parse_constraint - - if self._operator in {"in", "not in"}: - versions = [] - for v in re.split("[ ,]+", self._value): - split = v.split(".") - if len(split) in [1, 2]: - split.append("*") - op = "" if self._operator == "in" else "!=" - else: - op = "==" if self._operator == "in" else "!=" - - versions.append(op + ".".join(split)) - - glue = ", " - if self._operator == "in": - glue = " || " - - self._constraint = self._parser(glue.join(versions)) - else: - self._constraint = self._parser(self._constraint_string) - else: - self._constraint = self._parser(self._constraint_string) - - @property - def name(self): - return self._name - - @property - def constraint_string(self): - if self._operator in {"in", "not in"}: - return "{} {}".format(self._operator, self._value) - - return self._constraint_string - - @property - def constraint(self): - return self._constraint - - @property - def operator(self): - return self._operator - - @property - def value(self): - return self._value - - def intersect(self, other): - if isinstance(other, SingleMarker): - if other.name != self.name: - return MultiMarker(self, other) - - if self == other: - return self - - if self._operator in {"in", "not in"} or other.operator in {"in", "not in"}: - return MultiMarker.of(self, other) - - new_constraint = self._constraint.intersect(other.constraint) - if new_constraint.is_empty(): - return EmptyMarker() - - if new_constraint == self._constraint or new_constraint == other.constraint: - return SingleMarker(self._name, new_constraint) - - return MultiMarker.of(self, other) - - return other.intersect(self) - - def union(self, other): - if isinstance(other, SingleMarker): - if self == other: - return self - - return MarkerUnion(self, other) - - return other.union(self) - - def validate(self, environment): - if environment is None: - return True - - if self._name not in environment: - return True - - return self._constraint.allows(self._parser(environment[self._name])) - - def without_extras(self): - if self.name == "extra": - return EmptyMarker() - - return self - - def __eq__(self, other): - if not isinstance(other, SingleMarker): - return False - - return self._name == other.name and self._constraint == other.constraint - - def __hash__(self): - return hash((self._name, self._constraint_string)) - - def __str__(self): - return _format_marker( - (Variable(self._name), Op(self._operator), Value(self._value)) - ) - - -def _flatten_markers( - markers, flatten_class -): # type: (Iterator[BaseMarker], Any) -> List[BaseMarker] - flattened = [] - - for marker in markers: - if isinstance(marker, flatten_class): - flattened += _flatten_markers(marker.markers, flatten_class) - else: - flattened.append(marker) - - return flattened - - -class MultiMarker(BaseMarker): - def __init__(self, *markers): - self._markers = [] - - markers = _flatten_markers(markers, MultiMarker) - - for m in markers: - self._markers.append(m) - - @classmethod - def of(cls, *markers): - new_markers = [] - markers = _flatten_markers(markers, MultiMarker) - - for marker in markers: - if marker in new_markers or marker.is_empty(): - continue - - if isinstance(marker, SingleMarker): - intersected = False - for i, mark in enumerate(new_markers): - if ( - not isinstance(mark, SingleMarker) - or isinstance(mark, SingleMarker) - and mark.name != marker.name - ): - continue - - intersection = mark.constraint.intersect(marker.constraint) - if intersection == mark.constraint: - intersected = True - break - elif intersection == marker.constraint: - new_markers[i] = marker - intersected = True - break - elif intersection.is_empty(): - return EmptyMarker() - - if intersected: - continue - - new_markers.append(marker) - - if not new_markers: - return EmptyMarker() - - return MultiMarker(*new_markers) - - @property - def markers(self): - return self._markers - - def intersect(self, other): - if other.is_any(): - return self - - if other.is_empty(): - return other - - new_markers = self._markers + [other] - - return MultiMarker.of(*new_markers) - - def union(self, other): - if isinstance(other, (SingleMarker, MultiMarker)): - return MarkerUnion(self, other) - - return other.union(self) - - def validate(self, environment): - for m in self._markers: - if not m.validate(environment): - return False - - return True - - def without_extras(self): - new_markers = [] - - for m in self._markers: - marker = m.without_extras() - - if not marker.is_empty(): - new_markers.append(marker) - - return self.of(*new_markers) - - def __eq__(self, other): - if not isinstance(other, MultiMarker): - return False - - return set(self._markers) == set(other.markers) - - def __hash__(self): - h = hash("multi") - for m in self._markers: - h |= hash(m) - - return h - - def __str__(self): - elements = [] - for m in self._markers: - if isinstance(m, SingleMarker): - elements.append(str(m)) - elif isinstance(m, MultiMarker): - elements.append(str(m)) - else: - elements.append("({})".format(str(m))) - - return " and ".join(elements) - - -class MarkerUnion(BaseMarker): - def __init__(self, *markers): - self._markers = [] - - markers = _flatten_markers(markers, MarkerUnion) - - for marker in markers: - if marker in self._markers: - continue - - if isinstance(marker, SingleMarker) and marker.name == "python_version": - intersected = False - for i, mark in enumerate(self._markers): - if ( - not isinstance(mark, SingleMarker) - or isinstance(mark, SingleMarker) - and mark.name != marker.name - ): - continue - - intersection = mark.constraint.union(marker.constraint) - if intersection == mark.constraint: - intersected = True - break - elif intersection == marker.constraint: - self._markers[i] = marker - intersected = True - break - - if intersected: - continue - - self._markers.append(marker) - - @property - def markers(self): - return self._markers - - def append(self, marker): - if marker in self._markers: - return - - self._markers.append(marker) - - def intersect(self, other): - if other.is_any(): - return self - - if other.is_empty(): - return other - - new_markers = [] - if isinstance(other, (SingleMarker, MultiMarker)): - for marker in self._markers: - intersection = marker.intersect(other) - - if not intersection.is_empty(): - new_markers.append(intersection) - elif isinstance(other, MarkerUnion): - for our_marker in self._markers: - for their_marker in other.markers: - intersection = our_marker.intersect(their_marker) - - if not intersection.is_empty(): - new_markers.append(intersection) - - return MarkerUnion(*new_markers) - - def union(self, other): - if other.is_any(): - return other - - if other.is_empty(): - return self - - new_markers = self._markers + [other] - - return MarkerUnion(*new_markers) - - def validate(self, environment): - for m in self._markers: - if m.validate(environment): - return True - - return False - - def without_extras(self): - new_markers = [] - - for m in self._markers: - marker = m.without_extras() - - if not marker.is_empty(): - new_markers.append(marker) - - return MarkerUnion(*new_markers) - - def __eq__(self, other): - if not isinstance(other, MarkerUnion): - return False - - return set(self._markers) == set(other.markers) - - def __hash__(self): - h = hash("union") - for m in self._markers: - h |= hash(m) - - return h - - def __str__(self): - return " or ".join(str(m) for m in self._markers) - - -def parse_marker(marker): - if marker == "": - return EmptyMarker() - - if not marker or marker == "*": - return AnyMarker() - - markers = _coerce_parse_result(MARKER.parseString(marker)) - - return _compact_markers(markers) - - -def _compact_markers(markers): - groups = [MultiMarker()] - - for marker in markers: - if isinstance(marker, list): - groups[-1] = MultiMarker.of(groups[-1], _compact_markers(marker)) - elif isinstance(marker, tuple): - lhs, op, rhs = marker - - if isinstance(lhs, Variable): - name = lhs.value - value = rhs.value - else: - value = lhs.value - name = rhs.value - - groups[-1] = MultiMarker.of( - groups[-1], SingleMarker(name, "{}{}".format(op, value)) - ) - else: - if marker == "or": - groups.append(MultiMarker()) - - for i, group in enumerate(reversed(groups)): - if group.is_empty(): - del groups[len(groups) - 1 - i] - continue - - if isinstance(group, MultiMarker) and len(group.markers) == 1: - groups[len(groups) - 1 - i] = group.markers[0] - - if not groups: - return EmptyMarker() - - if len(groups) == 1: - return groups[0] - - return MarkerUnion(*groups) diff --git a/poetry/version/requirements.py b/poetry/version/requirements.py deleted file mode 100644 index 9e5bed68652..00000000000 --- a/poetry/version/requirements.py +++ /dev/null @@ -1,245 +0,0 @@ -# This file is dual licensed under the terms of the Apache License, Version -# 2.0, and the BSD License. See the LICENSE file in the root of this repository -# for complete details. -from __future__ import absolute_import, division, print_function - -import string -import re - -try: - import urllib.parse as urlparse -except ImportError: - from urlparse import urlparse - -from pyparsing import stringStart, stringEnd, originalTextFor, ParseException -from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine -from pyparsing import Literal as L # noqa - -from poetry.semver import parse_constraint - -from .markers import MARKER_EXPR -from .markers import parse_marker - - -LEGACY_REGEX = r""" - (?P(==|!=|<=|>=|<|>)) - \s* - (?P - [^,;\s)]* # Since this is a "legacy" specifier, and the version - # string can be just about anything, we match everything - # except for whitespace, a semi-colon for marker support, - # a closing paren since versions can be enclosed in - # them, and a comma since it's a version separator. - ) - """ - - -REGEX = r""" - (?P(~=|==|!=|<=|>=|<|>|===)) - (?P - (?: - # The identity operators allow for an escape hatch that will - # do an exact string match of the version you wish to install. - # This will not be parsed by PEP 440 and we cannot determine - # any semantic meaning from it. This operator is discouraged - # but included entirely as an escape hatch. - (?<====) # Only match for the identity operator - \s* - [^\s]* # We just match everything, except for whitespace - # since we are only testing for strict identity. - ) - | - (?: - # The (non)equality operators allow for wild card and local - # versions to be specified so we have to define these two - # operators separately to enable that. - (?<===|!=) # Only match for equals and not equals - - \s* - v? - (?:[0-9]+!)? # epoch - [0-9]+(?:\.[0-9]+)* # release - (?: # pre release - [-_\.]? - (a|b|c|rc|alpha|beta|pre|preview) - [-_\.]? - [0-9]* - )? - (?: # post release - (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) - )? - - # You cannot use a wild card and a dev or local version - # together so group them with a | and make them optional. - (?: - (?:[-_\.]?dev[-_\.]?[0-9]*)? # dev release - (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local - | - \.\* # Wild card syntax of .* - )? - ) - | - (?: - # The compatible operator requires at least two digits in the - # release segment. - (?<=~=) # Only match for the compatible operator - - \s* - v? - (?:[0-9]+!)? # epoch - [0-9]+(?:\.[0-9]+)+ # release (We have a + instead of a *) - (?: # pre release - [-_\.]? - (a|b|c|rc|alpha|beta|pre|preview) - [-_\.]? - [0-9]* - )? - (?: # post release - (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) - )? - (?:[-_\.]?dev[-_\.]?[0-9]*)? # dev release - ) - | - (?: - # All other operators only allow a sub set of what the - # (non)equality operators do. Specifically they do not allow - # local versions to be specified nor do they allow the prefix - # matching wild cards. - (?".format(str(self)) diff --git a/poetry/version/specifiers.py b/poetry/version/specifiers.py deleted file mode 100644 index 27e73adb37a..00000000000 --- a/poetry/version/specifiers.py +++ /dev/null @@ -1,793 +0,0 @@ -# This file is dual licensed under the terms of the Apache License, Version -# 2.0, and the BSD License. See the LICENSE file in the root of this repository -# for complete details. -from __future__ import absolute_import, division, print_function - -import abc -import functools -import itertools -import re -import sys - -from .legacy_version import LegacyVersion -from .version import Version - - -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 - -# flake8: noqa - -if PY3: - string_types = (str,) -else: - string_types = (basestring,) - - -def with_metaclass(meta, *bases): - """ - Create a base class with a metaclass. - """ - # This requires a bit of explanation: the basic idea is to make a dummy - # metaclass for one level of class instantiation that replaces itself with - # the actual metaclass. - class metaclass(meta): - def __new__(cls, name, this_bases, d): - return meta(name, bases, d) - - return type.__new__(metaclass, "temporary_class", (), {}) - - -def parse(version): - """ - Parse the given version string and return either a :class:`Version` object - or a :class:`LegacyVersion` object depending on if the given version is - a valid PEP 440 version or a legacy version. - """ - try: - return Version(version) - except InvalidVersion: - return LegacyVersion(version) - - -class InvalidVersion(ValueError): - """ - An invalid version was found, users should refer to PEP 440. - """ - - -class InvalidSpecifier(ValueError): - """ - An invalid specifier was found, users should refer to PEP 440. - """ - - -class BaseSpecifier(with_metaclass(abc.ABCMeta, object)): - @abc.abstractmethod - def __str__(self): - """ - Returns the str representation of this Specifier like object. This - should be representative of the Specifier itself. - """ - - @abc.abstractmethod - def __hash__(self): - """ - Returns a hash value for this Specifier like object. - """ - - @abc.abstractmethod - def __eq__(self, other): - """ - Returns a boolean representing whether or not the two Specifier like - objects are equal. - """ - - @abc.abstractmethod - def __ne__(self, other): - """ - Returns a boolean representing whether or not the two Specifier like - objects are not equal. - """ - - @abc.abstractproperty - def prereleases(self): - """ - Returns whether or not pre-releases as a whole are allowed by this - specifier. - """ - - @prereleases.setter - def prereleases(self, value): - """ - Sets whether or not pre-releases as a whole are allowed by this - specifier. - """ - - @abc.abstractmethod - def contains(self, item, prereleases=None): - """ - Determines if the given item is contained within this specifier. - """ - - @abc.abstractmethod - def filter(self, iterable, prereleases=None): - """ - Takes an iterable of items and filters them so that only items which - are contained within this specifier are allowed in it. - """ - - -class _IndividualSpecifier(BaseSpecifier): - - _operators = {} - - def __init__(self, spec="", prereleases=None): - match = self._regex.search(spec) - if not match: - raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec)) - - self._spec = (match.group("operator").strip(), match.group("version").strip()) - - # Store whether or not this Specifier should accept prereleases - self._prereleases = prereleases - - def __repr__(self): - pre = ( - ", prereleases={0!r}".format(self.prereleases) - if self._prereleases is not None - else "" - ) - - return "<{0}({1!r}{2})>".format(self.__class__.__name__, str(self), pre) - - def __str__(self): - return "{0}{1}".format(*self._spec) - - def __hash__(self): - return hash(self._spec) - - def __eq__(self, other): - if isinstance(other, string_types): - try: - other = self.__class__(other) - except InvalidSpecifier: - return NotImplemented - elif not isinstance(other, self.__class__): - return NotImplemented - - return self._spec == other._spec - - def __ne__(self, other): - if isinstance(other, string_types): - try: - other = self.__class__(other) - except InvalidSpecifier: - return NotImplemented - elif not isinstance(other, self.__class__): - return NotImplemented - - return self._spec != other._spec - - def _get_operator(self, op): - return getattr(self, "_compare_{0}".format(self._operators[op])) - - def _coerce_version(self, version): - if not isinstance(version, (LegacyVersion, Version)): - version = parse(version) - return version - - @property - def operator(self): - return self._spec[0] - - @property - def version(self): - return self._spec[1] - - @property - def prereleases(self): - return self._prereleases - - @prereleases.setter - def prereleases(self, value): - self._prereleases = value - - def __contains__(self, item): - return self.contains(item) - - def contains(self, item, prereleases=None): - # Determine if prereleases are to be allowed or not. - if prereleases is None: - prereleases = self.prereleases - - # Normalize item to a Version or LegacyVersion, this allows us to have - # a shortcut for ``"2.0" in Specifier(">=2") - item = self._coerce_version(item) - - # Determine if we should be supporting prereleases in this specifier - # or not, if we do not support prereleases than we can short circuit - # logic if this version is a prereleases. - if item.is_prerelease and not prereleases: - return False - - # Actually do the comparison to determine if this item is contained - # within this Specifier or not. - return self._get_operator(self.operator)(item, self.version) - - def filter(self, iterable, prereleases=None): - yielded = False - found_prereleases = [] - - kw = {"prereleases": prereleases if prereleases is not None else True} - - # Attempt to iterate over all the values in the iterable and if any of - # them match, yield them. - for version in iterable: - parsed_version = self._coerce_version(version) - - if self.contains(parsed_version, **kw): - # If our version is a prerelease, and we were not set to allow - # prereleases, then we'll store it for later incase nothing - # else matches this specifier. - if parsed_version.is_prerelease and not ( - prereleases or self.prereleases - ): - found_prereleases.append(version) - # Either this is not a prerelease, or we should have been - # accepting prereleases from the beginning. - else: - yielded = True - yield version - - # Now that we've iterated over everything, determine if we've yielded - # any values, and if we have not and we have any prereleases stored up - # then we will go ahead and yield the prereleases. - if not yielded and found_prereleases: - for version in found_prereleases: - yield version - - -class LegacySpecifier(_IndividualSpecifier): - - _regex_str = r""" - (?P(==|!=|<=|>=|<|>)) - \s* - (?P - [^,;\s)]* # Since this is a "legacy" specifier, and the version - # string can be just about anything, we match everything - # except for whitespace, a semi-colon for marker support, - # a closing paren since versions can be enclosed in - # them, and a comma since it's a version separator. - ) - """ - - _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE) - - _operators = { - "==": "equal", - "!=": "not_equal", - "<=": "less_than_equal", - ">=": "greater_than_equal", - "<": "less_than", - ">": "greater_than", - } - - def _coerce_version(self, version): - if not isinstance(version, LegacyVersion): - version = LegacyVersion(str(version)) - return version - - def _compare_equal(self, prospective, spec): - return prospective == self._coerce_version(spec) - - def _compare_not_equal(self, prospective, spec): - return prospective != self._coerce_version(spec) - - def _compare_less_than_equal(self, prospective, spec): - return prospective <= self._coerce_version(spec) - - def _compare_greater_than_equal(self, prospective, spec): - return prospective >= self._coerce_version(spec) - - def _compare_less_than(self, prospective, spec): - return prospective < self._coerce_version(spec) - - def _compare_greater_than(self, prospective, spec): - return prospective > self._coerce_version(spec) - - -def _require_version_compare(fn): - @functools.wraps(fn) - def wrapped(self, prospective, spec): - if not isinstance(prospective, Version): - return False - return fn(self, prospective, spec) - - return wrapped - - -class Specifier(_IndividualSpecifier): - - _regex_str = r""" - (?P(~=|==|!=|<=|>=|<|>|===)) - (?P - (?: - # The identity operators allow for an escape hatch that will - # do an exact string match of the version you wish to install. - # This will not be parsed by PEP 440 and we cannot determine - # any semantic meaning from it. This operator is discouraged - # but included entirely as an escape hatch. - (?<====) # Only match for the identity operator - \s* - [^\s]* # We just match everything, except for whitespace - # since we are only testing for strict identity. - ) - | - (?: - # The (non)equality operators allow for wild card and local - # versions to be specified so we have to define these two - # operators separately to enable that. - (?<===|!=) # Only match for equals and not equals - - \s* - v? - (?:[0-9]+!)? # epoch - [0-9]+(?:\.[0-9]+)* # release - (?: # pre release - [-_\.]? - (a|b|c|rc|alpha|beta|pre|preview) - [-_\.]? - [0-9]* - )? - (?: # post release - (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) - )? - - # You cannot use a wild card and a dev or local version - # together so group them with a | and make them optional. - (?: - (?:[-_\.]?dev[-_\.]?[0-9]*)? # dev release - (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local - | - \.\* # Wild card syntax of .* - )? - ) - | - (?: - # The compatible operator requires at least two digits in the - # release segment. - (?<=~=) # Only match for the compatible operator - - \s* - v? - (?:[0-9]+!)? # epoch - [0-9]+(?:\.[0-9]+)+ # release (We have a + instead of a *) - (?: # pre release - [-_\.]? - (a|b|c|rc|alpha|beta|pre|preview) - [-_\.]? - [0-9]* - )? - (?: # post release - (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) - )? - (?:[-_\.]?dev[-_\.]?[0-9]*)? # dev release - ) - | - (?: - # All other operators only allow a sub set of what the - # (non)equality operators do. Specifically they do not allow - # local versions to be specified nor do they allow the prefix - # matching wild cards. - (?=": "greater_than_equal", - "<": "less_than", - ">": "greater_than", - "===": "arbitrary", - } - - @_require_version_compare - def _compare_compatible(self, prospective, spec): - # Compatible releases have an equivalent combination of >= and ==. That - # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to - # implement this in terms of the other specifiers instead of - # implementing it ourselves. The only thing we need to do is construct - # the other specifiers. - - # We want everything but the last item in the version, but we want to - # ignore post and dev releases and we want to treat the pre-release as - # it's own separate segment. - prefix = ".".join( - list( - itertools.takewhile( - lambda x: (not x.startswith("post") and not x.startswith("dev")), - _version_split(spec), - ) - )[:-1] - ) - - # Add the prefix notation to the end of our string - prefix += ".*" - - return self._get_operator(">=")(prospective, spec) and self._get_operator("==")( - prospective, prefix - ) - - @_require_version_compare - def _compare_equal(self, prospective, spec): - # We need special logic to handle prefix matching - if spec.endswith(".*"): - # In the case of prefix matching we want to ignore local segment. - prospective = Version(prospective.public) - # Split the spec out by dots, and pretend that there is an implicit - # dot in between a release segment and a pre-release segment. - spec = _version_split(spec[:-2]) # Remove the trailing .* - - # Split the prospective version out by dots, and pretend that there - # is an implicit dot in between a release segment and a pre-release - # segment. - prospective = _version_split(str(prospective)) - - # Shorten the prospective version to be the same length as the spec - # so that we can determine if the specifier is a prefix of the - # prospective version or not. - prospective = prospective[: len(spec)] - - # Pad out our two sides with zeros so that they both equal the same - # length. - spec, prospective = _pad_version(spec, prospective) - else: - # Convert our spec string into a Version - spec = Version(spec) - - # If the specifier does not have a local segment, then we want to - # act as if the prospective version also does not have a local - # segment. - if not spec.local: - prospective = Version(prospective.public) - - return prospective == spec - - @_require_version_compare - def _compare_not_equal(self, prospective, spec): - return not self._compare_equal(prospective, spec) - - @_require_version_compare - def _compare_less_than_equal(self, prospective, spec): - return prospective <= Version(spec) - - @_require_version_compare - def _compare_greater_than_equal(self, prospective, spec): - return prospective >= Version(spec) - - @_require_version_compare - def _compare_less_than(self, prospective, spec): - # Convert our spec to a Version instance, since we'll want to work with - # it as a version. - spec = Version(spec) - - # Check to see if the prospective version is less than the spec - # version. If it's not we can short circuit and just return False now - # instead of doing extra unneeded work. - if not prospective < spec: - return False - - # This special case is here so that, unless the specifier itself - # includes is a pre-release version, that we do not accept pre-release - # versions for the version mentioned in the specifier (e.g. <3.1 should - # not match 3.1.dev0, but should match 3.0.dev0). - if not spec.is_prerelease and prospective.is_prerelease: - if Version(prospective.base_version) == Version(spec.base_version): - return False - - # If we've gotten to here, it means that prospective version is both - # less than the spec version *and* it's not a pre-release of the same - # version in the spec. - return True - - @_require_version_compare - def _compare_greater_than(self, prospective, spec): - # Convert our spec to a Version instance, since we'll want to work with - # it as a version. - spec = Version(spec) - - # Check to see if the prospective version is greater than the spec - # version. If it's not we can short circuit and just return False now - # instead of doing extra unneeded work. - if not prospective > spec: - return False - - # This special case is here so that, unless the specifier itself - # includes is a post-release version, that we do not accept - # post-release versions for the version mentioned in the specifier - # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0). - if not spec.is_postrelease and prospective.is_postrelease: - if Version(prospective.base_version) == Version(spec.base_version): - return False - - # Ensure that we do not allow a local version of the version mentioned - # in the specifier, which is technically greater than, to match. - if prospective.local is not None: - if Version(prospective.base_version) == Version(spec.base_version): - return False - - # If we've gotten to here, it means that prospective version is both - # greater than the spec version *and* it's not a pre-release of the - # same version in the spec. - return True - - def _compare_arbitrary(self, prospective, spec): - return str(prospective).lower() == str(spec).lower() - - @property - def prereleases(self): - # If there is an explicit prereleases set for this, then we'll just - # blindly use that. - if self._prereleases is not None: - return self._prereleases - - # Look at all of our specifiers and determine if they are inclusive - # operators, and if they are if they are including an explicit - # prerelease. - operator, version = self._spec - if operator in ["==", ">=", "<=", "~=", "==="]: - # The == specifier can include a trailing .*, if it does we - # want to remove before parsing. - if operator == "==" and version.endswith(".*"): - version = version[:-2] - - # Parse the version, and if it is a pre-release than this - # specifier allows pre-releases. - if parse(version).is_prerelease: - return True - - return False - - @prereleases.setter - def prereleases(self, value): - self._prereleases = value - - -_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$") - - -def _version_split(version): - result = [] - for item in version.split("."): - match = _prefix_regex.search(item) - if match: - result.extend(match.groups()) - else: - result.append(item) - return result - - -def _pad_version(left, right): - left_split, right_split = [], [] - - # Get the release segment of our versions - left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left))) - right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right))) - - # Get the rest of our versions - left_split.append(left[len(left_split[0]) :]) - right_split.append(right[len(right_split[0]) :]) - - # Insert our padding - left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0]))) - right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0]))) - - return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split))) - - -class SpecifierSet(BaseSpecifier): - def __init__(self, specifiers="", prereleases=None): - # Split on , to break each indidivual specifier into it's own item, and - # strip each item to remove leading/trailing whitespace. - specifiers = [s.strip() for s in specifiers.split(",") if s.strip()] - - # Parsed each individual specifier, attempting first to make it a - # Specifier and falling back to a LegacySpecifier. - parsed = set() - for specifier in specifiers: - try: - parsed.add(Specifier(specifier)) - except InvalidSpecifier: - parsed.add(LegacySpecifier(specifier)) - - # Turn our parsed specifiers into a frozen set and save them for later. - self._specs = frozenset(parsed) - - # Store our prereleases value so we can use it later to determine if - # we accept prereleases or not. - self._prereleases = prereleases - - def __repr__(self): - pre = ( - ", prereleases={0!r}".format(self.prereleases) - if self._prereleases is not None - else "" - ) - - return "".format(str(self), pre) - - def __str__(self): - return ",".join(sorted(str(s) for s in self._specs)) - - def __hash__(self): - return hash(self._specs) - - def __and__(self, other): - if isinstance(other, string_types): - other = SpecifierSet(other) - elif not isinstance(other, SpecifierSet): - return NotImplemented - - specifier = SpecifierSet() - specifier._specs = frozenset(self._specs | other._specs) - - if self._prereleases is None and other._prereleases is not None: - specifier._prereleases = other._prereleases - elif self._prereleases is not None and other._prereleases is None: - specifier._prereleases = self._prereleases - elif self._prereleases == other._prereleases: - specifier._prereleases = self._prereleases - else: - raise ValueError( - "Cannot combine SpecifierSets with True and False prerelease " - "overrides." - ) - - return specifier - - def __eq__(self, other): - if isinstance(other, string_types): - other = SpecifierSet(other) - elif isinstance(other, _IndividualSpecifier): - other = SpecifierSet(str(other)) - elif not isinstance(other, SpecifierSet): - return NotImplemented - - return self._specs == other._specs - - def __ne__(self, other): - if isinstance(other, string_types): - other = SpecifierSet(other) - elif isinstance(other, _IndividualSpecifier): - other = SpecifierSet(str(other)) - elif not isinstance(other, SpecifierSet): - return NotImplemented - - return self._specs != other._specs - - def __len__(self): - return len(self._specs) - - def __iter__(self): - return iter(self._specs) - - @property - def prereleases(self): - # If we have been given an explicit prerelease modifier, then we'll - # pass that through here. - if self._prereleases is not None: - return self._prereleases - - # If we don't have any specifiers, and we don't have a forced value, - # then we'll just return None since we don't know if this should have - # pre-releases or not. - if not self._specs: - return None - - # Otherwise we'll see if any of the given specifiers accept - # prereleases, if any of them do we'll return True, otherwise False. - return any(s.prereleases for s in self._specs) - - @prereleases.setter - def prereleases(self, value): - self._prereleases = value - - def __contains__(self, item): - return self.contains(item) - - def contains(self, item, prereleases=None): - # Ensure that our item is a Version or LegacyVersion instance. - if not isinstance(item, (LegacyVersion, Version)): - item = parse(item) - - # Determine if we're forcing a prerelease or not, if we're not forcing - # one for this particular filter call, then we'll use whatever the - # SpecifierSet thinks for whether or not we should support prereleases. - if prereleases is None: - prereleases = self.prereleases - - # We can determine if we're going to allow pre-releases by looking to - # see if any of the underlying items supports them. If none of them do - # and this item is a pre-release then we do not allow it and we can - # short circuit that here. - # Note: This means that 1.0.dev1 would not be contained in something - # like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0 - if not prereleases and item.is_prerelease: - return False - - # We simply dispatch to the underlying specs here to make sure that the - # given version is contained within all of them. - # Note: This use of all() here means that an empty set of specifiers - # will always return True, this is an explicit design decision. - return all(s.contains(item, prereleases=prereleases) for s in self._specs) - - def filter(self, iterable, prereleases=None): - # Determine if we're forcing a prerelease or not, if we're not forcing - # one for this particular filter call, then we'll use whatever the - # SpecifierSet thinks for whether or not we should support prereleases. - if prereleases is None: - prereleases = self.prereleases - - # If we have any specifiers, then we want to wrap our iterable in the - # filter method for each one, this will act as a logical AND amongst - # each specifier. - if self._specs: - for spec in self._specs: - iterable = spec.filter(iterable, prereleases=bool(prereleases)) - return iterable - # If we do not have any specifiers, then we need to have a rough filter - # which will filter out any pre-releases, unless there are no final - # releases, and which will filter out LegacyVersion in general. - else: - filtered = [] - found_prereleases = [] - - for item in iterable: - # Ensure that we some kind of Version class for this item. - if not isinstance(item, (LegacyVersion, Version)): - parsed_version = parse(item) - else: - parsed_version = item - - # Filter out any item which is parsed as a LegacyVersion - if isinstance(parsed_version, LegacyVersion): - continue - - # Store any item which is a pre-release for later unless we've - # already found a final version or we are accepting prereleases - if parsed_version.is_prerelease and not prereleases: - if not filtered: - found_prereleases.append(item) - else: - filtered.append(item) - - # If we've found no items except for pre-releases, then we'll go - # ahead and use the pre-releases - if not filtered and found_prereleases and prereleases is None: - return found_prereleases - - return filtered diff --git a/poetry/version/utils.py b/poetry/version/utils.py deleted file mode 100644 index 4e3d50feb7f..00000000000 --- a/poetry/version/utils.py +++ /dev/null @@ -1,62 +0,0 @@ -class Infinity(object): - def __repr__(self): - return "Infinity" - - def __hash__(self): - return hash(repr(self)) - - def __lt__(self, other): - return False - - def __le__(self, other): - return False - - def __eq__(self, other): - return isinstance(other, self.__class__) - - def __ne__(self, other): - return not isinstance(other, self.__class__) - - def __gt__(self, other): - return True - - def __ge__(self, other): - return True - - def __neg__(self): - return NegativeInfinity - - -Infinity = Infinity() # type: ignore - - -class NegativeInfinity(object): - def __repr__(self): - return "-Infinity" - - def __hash__(self): - return hash(repr(self)) - - def __lt__(self, other): - return True - - def __le__(self, other): - return True - - def __eq__(self, other): - return isinstance(other, self.__class__) - - def __ne__(self, other): - return not isinstance(other, self.__class__) - - def __gt__(self, other): - return False - - def __ge__(self, other): - return False - - def __neg__(self): - return Infinity - - -NegativeInfinity = NegativeInfinity() # type: ignore diff --git a/poetry/version/version.py b/poetry/version/version.py deleted file mode 100644 index b85c6c5c79a..00000000000 --- a/poetry/version/version.py +++ /dev/null @@ -1,229 +0,0 @@ -import re - -from collections import namedtuple -from itertools import dropwhile - -from .base import BaseVersion -from .exceptions import InvalidVersion -from .utils import Infinity - - -_Version = namedtuple("_Version", ["epoch", "release", "dev", "pre", "post", "local"]) - - -VERSION_PATTERN = re.compile( - r""" - ^ - v? - (?: - (?:(?P[0-9]+)!)? # epoch - (?P[0-9]+(?:\.[0-9]+)*) # release segment - (?P
                                                # pre-release
-            [-_.]?
-            (?P(a|b|c|rc|alpha|beta|pre|preview))
-            [-_.]?
-            (?P[0-9]+)?
-        )?
-        (?P                                         # post release
-            (?:-(?P[0-9]+))
-            |
-            (?:
-                [-_.]?
-                (?Ppost|rev|r)
-                [-_.]?
-                (?P[0-9]+)?
-            )
-        )?
-        (?P                                          # dev release
-            [-_.]?
-            (?Pdev)
-            [-_.]?
-            (?P[0-9]+)?
-        )?
-    )
-    (?:\+(?P[a-z0-9]+(?:[-_.][a-z0-9]+)*))?       # local version
-    $
-""",
-    re.IGNORECASE | re.VERBOSE,
-)
-
-
-class Version(BaseVersion):
-    def __init__(self, version):
-        # Validate the version and parse it into pieces
-        match = VERSION_PATTERN.match(version)
-        if not match:
-            raise InvalidVersion("Invalid version: '{0}'".format(version))
-
-        # Store the parsed out pieces of the version
-        self._version = _Version(
-            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
-            release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
-            post=_parse_letter_version(
-                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
-            ),
-            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
-            local=_parse_local_version(match.group("local")),
-        )
-
-        # Generate a key which will be used for sorting
-        self._key = _cmpkey(
-            self._version.epoch,
-            self._version.release,
-            self._version.pre,
-            self._version.post,
-            self._version.dev,
-            self._version.local,
-        )
-
-    def __repr__(self):
-        return "".format(repr(str(self)))
-
-    def __str__(self):
-        parts = []
-
-        # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
-
-        # Pre-release
-        if self._version.pre is not None:
-            parts.append("".join(str(x) for x in self._version.pre))
-
-        # Post-release
-        if self._version.post is not None:
-            parts.append(".post{0}".format(self._version.post[1]))
-
-        # Development release
-        if self._version.dev is not None:
-            parts.append(".dev{0}".format(self._version.dev[1]))
-
-        # Local version segment
-        if self._version.local is not None:
-            parts.append("+{0}".format(".".join(str(x) for x in self._version.local)))
-
-        return "".join(parts)
-
-    @property
-    def public(self):
-        return str(self).split("+", 1)[0]
-
-    @property
-    def base_version(self):
-        parts = []
-
-        # Epoch
-        if self._version.epoch != 0:
-            parts.append("{0}!".format(self._version.epoch))
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self._version.release))
-
-        return "".join(parts)
-
-    @property
-    def local(self):
-        version_string = str(self)
-        if "+" in version_string:
-            return version_string.split("+", 1)[1]
-
-    @property
-    def is_prerelease(self):
-        return bool(self._version.dev or self._version.pre)
-
-    @property
-    def is_postrelease(self):
-        return bool(self._version.post)
-
-
-def _parse_letter_version(letter, number):
-    if letter:
-        # We consider there to be an implicit 0 in a pre-release if there is
-        # not a numeral associated with it.
-        if number is None:
-            number = 0
-
-        # We normalize any letters to their lower case form
-        letter = letter.lower()
-
-        # We consider some words to be alternate spellings of other words and
-        # in those cases we want to normalize the spellings to our preferred
-        # spelling.
-        if letter == "alpha":
-            letter = "a"
-        elif letter == "beta":
-            letter = "b"
-        elif letter in ["c", "pre", "preview"]:
-            letter = "rc"
-        elif letter in ["rev", "r"]:
-            letter = "post"
-
-        return letter, int(number)
-    if not letter and number:
-        # We assume if we are given a number, but we are not given a letter
-        # then this is using the implicit post release syntax (e.g. 1.0-1)
-        letter = "post"
-
-        return letter, int(number)
-
-
-_local_version_seperators = re.compile(r"[._-]")
-
-
-def _parse_local_version(local):
-    """
-    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
-    """
-    if local is not None:
-        return tuple(
-            part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_seperators.split(local)
-        )
-
-
-def _cmpkey(epoch, release, pre, post, dev, local):
-    # When we compare a release version, we want to compare it with all of the
-    # trailing zeros removed. So we'll use a reverse the list, drop all the now
-    # leading zeros until we come to something non zero, then take the rest
-    # re-reverse it back into the correct order and make it a tuple and use
-    # that for our sorting key.
-    release = tuple(reversed(list(dropwhile(lambda x: x == 0, reversed(release)))))
-
-    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
-    # We'll do this by abusing the pre segment, but we _only_ want to do this
-    # if there is not a pre or a post segment. If we have one of those then
-    # the normal sorting rules will handle this case correctly.
-    if pre is None and post is None and dev is not None:
-        pre = -Infinity
-
-    # Versions without a pre-release (except as noted above) should sort after
-    # those with one.
-    elif pre is None:
-        pre = Infinity
-
-    # Versions without a post segment should sort before those with one.
-    if post is None:
-        post = -Infinity
-
-    # Versions without a development segment should sort after those with one.
-    if dev is None:
-        dev = Infinity
-
-    if local is None:
-        # Versions without a local segment should sort before those with one.
-        local = -Infinity
-    else:
-        # Versions with a local segment need that segment parsed to implement
-        # the sorting rules in PEP440.
-        # - Alpha numeric segments sort before numeric segments
-        # - Alpha numeric segments sort lexicographically
-        # - Numeric segments sort numerically
-        # - Shorter versions sort before longer versions when the prefixes
-        #   match exactly
-        local = tuple((i, "") if isinstance(i, int) else (-Infinity, i) for i in local)
-
-    return epoch, release, pre, post, dev, local
diff --git a/poetry/version/version_selector.py b/poetry/version/version_selector.py
index 7bbc23648a5..8cf02c7cbed 100644
--- a/poetry/version/version_selector.py
+++ b/poetry/version/version_selector.py
@@ -1,9 +1,9 @@
 from typing import Union
 
-from poetry.packages import Dependency
-from poetry.packages import Package
-from poetry.semver import parse_constraint
-from poetry.semver import Version
+from poetry.core.packages import Dependency
+from poetry.core.packages import Package
+from poetry.core.semver import Version
+from poetry.core.semver import parse_constraint
 
 
 class VersionSelector(object):
@@ -15,6 +15,7 @@ def find_best_candidate(
         package_name,  # type: str
         target_package_version=None,  # type:  Union[str, None]
         allow_prereleases=False,  # type: bool
+        source=None,  # type: str
     ):  # type: (...) -> Union[Package, bool]
         """
         Given a package name and optional version,
@@ -26,7 +27,7 @@ def find_best_candidate(
             constraint = parse_constraint("*")
 
         candidates = self._pool.find_packages(
-            package_name, constraint, allow_prereleases=True
+            package_name, constraint, allow_prereleases=True, repository=source
         )
         only_prereleases = all([c.version.is_prerelease() for c in candidates])
 
@@ -35,8 +36,7 @@ def find_best_candidate(
 
         dependency = Dependency(package_name, constraint)
 
-        # Select highest version if we have many
-        package = candidates[0]
+        package = None
         for candidate in candidates:
             if (
                 candidate.is_prerelease()
@@ -47,9 +47,11 @@ def find_best_candidate(
                 continue
 
             # Select highest version of the two
-            if package.version < candidate.version:
+            if package is None or package.version < candidate.version:
                 package = candidate
 
+        if package is None:
+            return False
         return package
 
     def find_recommended_require_version(self, package):
diff --git a/pyproject.toml b/pyproject.toml
index 8f0e6c706b0..3f4463dceda 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry"
-version = "1.0.0b1"
+version = "1.1.0a1"
 description = "Python dependency management and packaging made easy."
 authors = [
     "Sébastien Eustace "
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.md"
 
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
@@ -22,53 +22,118 @@ classifiers = [
 
 # Requirements
 [tool.poetry.dependencies]
-python = "~2.7 || ^3.4"
-cleo = "^0.7.5"
+python = "~2.7 || ^3.5"
+
+poetry-core = "^1.0.0a6"
+cleo = "^0.8.1"
+clikit = "^0.6.2"
 requests = "^2.18"
 cachy = "^0.3.0"
 requests-toolbelt = "^0.8.0"
-jsonschema = "^3.0a3"
-pyrsistent = "^0.14.2"
-pyparsing = "^2.2"
 cachecontrol = { version = "^0.12.4", extras = ["filecache"] }
 pkginfo = "^1.4"
 html5lib = "^1.0"
 shellingham = "^1.1"
-tomlkit = "^0.5.5"
+tomlkit = "^0.5.11"
 pexpect = "^4.7.0"
 
-# The typing module is not in the stdlib in Python 2.7 and 3.4
-typing = { version = "^3.6", python = "~2.7 || ~3.4" }
+# The typing module is not in the stdlib in Python 2.7
+typing = { version = "^3.6", python = "~2.7" }
 
-# Use pathlib2 for Python 2.7 and 3.4
-pathlib2 = { version = "^2.3", python = "~2.7 || ~3.4" }
+# Use pathlib2 for Python 2.7
+pathlib2 = { version = "^2.3", python = "~2.7" }
 # Use glob2 for Python 2.7 and 3.4
-glob2 = { version = "^0.6", python = "~2.7 || ~3.4" }
+glob2 = { version = "^0.6", python = "~2.7" }
 # Use virtualenv for Python 2.7 since venv does not exist
-virtualenv = { version = "^16.0", python = "~2.7" }
+virtualenv = { version = "^20.0.18", python = "~2.7" }
 # functools32 is needed for Python 2.7
 functools32 = { version = "^3.2.3", python = "~2.7" }
 keyring = [
-    { version = "^18.0", python = "~2.7 || ~3.4" },
-    { version = "^19.0", python = "^3.5" }
+    { version = "^18.0.1", python = "~2.7" },
+    { version = "^20.0.1", python = "~3.5" },
+    { version = "^21.2.0", python = "^3.6" }
 ]
-# Use subprocess32 for Python 2.7 and 3.4
-subprocess32 = { version = "^3.5", python = "~2.7 || ~3.4" }
+# Use subprocess32 for Python 2.7
+subprocess32 = { version = "^3.5", python = "~2.7" }
+importlib-metadata = {version = "^1.6.0", python = "<3.8"}
 
 [tool.poetry.dev-dependencies]
-pytest = "^4.1"
+pytest = [
+    {version = "^4.1", python = "<3.5"},
+    {version = "^5.4.3", python = ">=3.5"}
+]
 pytest-cov = "^2.5"
 mkdocs = { version = "^1.0", python = "~2.7.9 || ^3.4" }
 pymdown-extensions = "^6.0"
 pygments = "^2.2"
 pytest-mock = "^1.9"
 pygments-github-lexers = "^0.0.5"
-black = { version = "^19.3b0", python = "^3.6" }
+black = { version = "^19.10b0", python = "^3.6" }
 pre-commit = "^1.10"
 tox = "^3.0"
 pytest-sugar = "^0.9.2"
 httpretty = "^0.9.6"
-
+markdown-include = "^0.5.1"
 
 [tool.poetry.scripts]
 poetry = "poetry.console:main"
+
+
+[build-system]
+requires = ["poetry-core>=1.0.0a3"]
+build-backend = "poetry.core.masonry.api"
+
+
+[tool.isort]
+line_length = 88
+force_single_line = true
+atomic = true
+include_trailing_comma = true
+lines_after_imports = 2
+lines_between_types = 1
+multi_line_output = 3
+use_parentheses = true
+not_skip = "__init__.py"
+skip_glob = ["*/setup.py"]
+filter_files = true
+
+known_first_party = "poetry"
+known_third_party = [
+    "cachecontrol",
+    "cachy",
+    "cleo",
+    "clikit",
+    "html5lib",
+    "httpretty",
+    "jsonschema",
+    "keyring",
+    "pexpect",
+    "pkginfo",
+    "poetry_core",
+    "pyparsing",
+    "pytest",
+    "requests",
+    "requests_toolbelt",
+    "shellingham",
+    "tomlkit",
+]
+
+
+[tool.black]
+line-length = 88
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+  | tests/.*/setup.py
+)/
+'''
diff --git a/sonnet b/sonnet
index cbf89ab5f70..4c5e558c545 100755
--- a/sonnet
+++ b/sonnet
@@ -10,6 +10,8 @@ from gzip import GzipFile
 
 from cleo import Application
 from cleo import Command
+from clikit.api.formatter import Style
+
 
 WINDOWS = sys.platform.startswith("win") or (sys.platform == "cli" and os.name == "nt")
 
@@ -24,10 +26,10 @@ class MakeReleaseCommand(Command):
 
     PYTHON = {
         "2.7": "python2.7",
-        "3.4": "python3.4",
         "3.5": "python3.5",
         "3.6": "python3.6",
         "3.7": "python3.7",
+        "3.8": "python3.8",
     }
 
     def handle(self):
@@ -45,8 +47,9 @@ class MakeReleaseCommand(Command):
 
         self.check_system(pythons)
 
-        from poetry import __version__
-        from poetry.poetry import Poetry
+        from poetry.__version__ import __version__
+        from poetry.core.vcs import get_vcs
+        from poetry.factory import Factory
         from poetry.puzzle import Solver
         from poetry.repositories.pool import Pool
         from poetry.repositories.repository import Repository
@@ -57,9 +60,8 @@ class MakeReleaseCommand(Command):
         from poetry.utils.env import GET_BASE_PREFIX
         from poetry.utils.env import VirtualEnv
         from poetry.utils.helpers import temporary_directory
-        from poetry.vcs import get_vcs
 
-        project = Poetry.create(Path.cwd())
+        project = Factory().create_poetry(Path.cwd())
         package = project.package
         del package.dev_requires[:]
 
@@ -217,6 +219,10 @@ class MakeReleaseCommand(Command):
                 subprocess.check_output(
                     [python, "-V"], stderr=subprocess.STDOUT, shell=WINDOWS
                 )
+                if version == "3.4" and WINDOWS:
+                    continue
+
+                subprocess.check_output([python, "-m", "pip", "install", "pip", "-U"])
             except subprocess.CalledProcessError:
                 raise RuntimeError("Python {} is not available".format(version))
 
@@ -267,6 +273,7 @@ class MakeCommand(Command):
 
 
 app = Application("sonnet")
+app.config.add_style(Style("debug").fg("default").dark())
 
 app.add(MakeCommand())
 
diff --git a/tests/config/test_config.py b/tests/config/test_config.py
index 8dda26eca37..07373ade0b4 100644
--- a/tests/config/test_config.py
+++ b/tests/config/test_config.py
@@ -1,7 +1,5 @@
 import os
 
-from poetry.locations import CACHE_DIR
-
 
 def test_config_get_default_value(config):
     assert config.get("virtualenvs.create") is True
diff --git a/tests/conftest.py b/tests/conftest.py
index a4f58b0acc8..0dc637ded13 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,22 +2,19 @@
 import shutil
 import tempfile
 
-import httpretty
-import pytest
-
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
-
 from typing import Any
 from typing import Dict
 
+import httpretty
+import pytest
+
 from poetry.config.config import Config as BaseConfig
 from poetry.config.dict_config_source import DictConfigSource
-from poetry.utils._compat import PY2
-from poetry.utils._compat import WINDOWS
 from poetry.utils._compat import Path
+from poetry.utils.env import EnvManager
+from poetry.utils.env import VirtualEnv
+from tests.helpers import mock_clone
+from tests.helpers import mock_download
 
 
 class Config(BaseConfig):
@@ -40,14 +37,6 @@ def all(self):  # type: () -> Dict[str, Any]
         return super(Config, self).all()
 
 
-def tmp_dir():
-    dir_ = tempfile.mkdtemp(prefix="poetry_")
-
-    yield dir_
-
-    shutil.rmtree(dir_)
-
-
 @pytest.fixture
 def config_source():
     source = DictConfigSource()
@@ -65,6 +54,11 @@ def auth_config_source():
 
 @pytest.fixture
 def config(config_source, auth_config_source, mocker):
+    import keyring
+    from keyring.backends.fail import Keyring
+
+    keyring.set_keyring(Keyring())
+
     c = Config()
     c.merge(config_source.config)
     c.set_config_source(config_source)
@@ -76,52 +70,17 @@ def config(config_source, auth_config_source, mocker):
     return c
 
 
-def mock_clone(_, source, dest):
-    # Checking source to determine which folder we need to copy
-    parts = urlparse.urlparse(source)
-
-    folder = (
-        Path(__file__).parent.parent
-        / "fixtures"
-        / "git"
-        / parts.netloc
-        / parts.path.lstrip("/").rstrip(".git")
-    )
-
-    if dest.exists():
-        shutil.rmtree(str(dest))
-
-    shutil.rmtree(str(dest))
-    shutil.copytree(str(folder), str(dest))
-
-
-def mock_download(self, url, dest):
-    parts = urlparse.urlparse(url)
-
-    fixtures = Path(__file__).parent / "fixtures"
-    fixture = fixtures / parts.path.lstrip("/")
-
-    if dest.exists():
-        os.unlink(str(dest))
-
-    # Python2 does not support os.symlink on Windows whereas Python3 does.  os.symlink requires either administrative
-    # privileges or developer mode on Win10, throwing an OSError is neither is active.
-    if WINDOWS:
-        if PY2:
-            shutil.copyfile(str(fixture), str(dest))
-        else:
-            try:
-                os.symlink(str(fixture), str(dest))
-            except OSError:
-                shutil.copyfile(str(fixture), str(dest))
-    else:
-        os.symlink(str(fixture), str(dest))
-
-
 @pytest.fixture(autouse=True)
 def download_mock(mocker):
     # Patch download to not download anything but to just copy from fixtures
-    mocker.patch("poetry.utils.inspector.Inspector.download", new=mock_download)
+    mocker.patch("poetry.utils.helpers.download_file", new=mock_download)
+    mocker.patch("poetry.puzzle.provider.download_file", new=mock_download)
+    mocker.patch("poetry.repositories.pypi_repository.download_file", new=mock_download)
+
+
+@pytest.fixture(autouse=True)
+def execute_setup_mock(mocker):
+    mocker.patch("poetry.inspection.info.PackageInfo._execute_setup")
 
 
 @pytest.fixture
@@ -137,9 +96,9 @@ def environ():
 @pytest.fixture(autouse=True)
 def git_mock(mocker):
     # Patch git module to not actually clone projects
-    mocker.patch("poetry.vcs.git.Git.clone", new=mock_clone)
-    mocker.patch("poetry.vcs.git.Git.checkout", new=lambda *_: None)
-    p = mocker.patch("poetry.vcs.git.Git.rev_parse")
+    mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone)
+    mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None)
+    p = mocker.patch("poetry.core.vcs.git.Git.rev_parse")
     p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
 
 
@@ -167,3 +126,30 @@ def tmp_dir():
     yield dir_
 
     shutil.rmtree(dir_)
+
+
+@pytest.fixture
+def mocked_open_files(mocker):
+    files = []
+    original = Path.open
+
+    def mocked_open(self, *args, **kwargs):
+        if self.name in {"pyproject.toml"}:
+            return mocker.MagicMock()
+        return original(self, *args, **kwargs)
+
+    mocker.patch("poetry.utils._compat.Path.open", mocked_open)
+
+    yield files
+
+
+@pytest.fixture
+def tmp_venv(tmp_dir):
+    venv_path = Path(tmp_dir) / "venv"
+
+    EnvManager.build_venv(str(venv_path))
+
+    venv = VirtualEnv(venv_path)
+    yield venv
+
+    shutil.rmtree(str(venv.path))
diff --git a/tests/console/commands/env/test_info.py b/tests/console/commands/env/test_info.py
index 77001ead3c3..775680f13dc 100644
--- a/tests/console/commands/env/test_info.py
+++ b/tests/console/commands/env/test_info.py
@@ -48,4 +48,4 @@ def test_env_info_displays_path_only(app):
 
     expected = str(Path("/prefix"))
 
-    assert expected == tester.io.fetch_output()
+    assert expected + "\n" == tester.io.fetch_output()
diff --git a/tests/console/commands/env/test_list.py b/tests/console/commands/env/test_list.py
index 3e175cca01a..e2946373b6a 100644
--- a/tests/console/commands/env/test_list.py
+++ b/tests/console/commands/env/test_list.py
@@ -1,3 +1,5 @@
+import os
+
 import tomlkit
 
 from cleo.testers import CommandTester
@@ -7,11 +9,13 @@
 from poetry.utils.toml_file import TomlFile
 
 
-def test_none_activated(app, tmp_dir):
+def test_none_activated(app, tmp_dir, mocker, env):
+    mocker.patch("poetry.utils.env.EnvManager.get", return_value=env)
+
     app.poetry.config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
@@ -34,7 +38,7 @@ def test_activated(app, tmp_dir):
     app.poetry.config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
@@ -56,3 +60,19 @@ def test_activated(app, tmp_dir):
     )
 
     assert expected == tester.io.fetch_output()
+
+
+def test_in_project_venv(app, tmpdir):
+    os.environ.pop("VIRTUAL_ENV", None)
+    app.poetry.config.merge({"virtualenvs": {"in-project": True}})
+
+    (app.poetry.file.parent / ".venv").mkdir(exist_ok=True)
+
+    command = app.find("env list")
+    tester = CommandTester(command)
+    tester.execute()
+
+    expected = ".venv (Activated)\n"
+
+    assert expected == tester.io.fetch_output()
+    (app.poetry.file.parent / ".venv").rmdir()
diff --git a/tests/console/commands/env/test_remove.py b/tests/console/commands/env/test_remove.py
index 9b1e35c255c..bf3c3a6c4fb 100644
--- a/tests/console/commands/env/test_remove.py
+++ b/tests/console/commands/env/test_remove.py
@@ -11,7 +11,7 @@ def test_remove_by_python_version(app, tmp_dir, mocker):
     app.poetry.config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
@@ -39,7 +39,7 @@ def test_remove_by_name(app, tmp_dir):
     app.poetry.config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
diff --git a/tests/console/commands/env/test_use.py b/tests/console/commands/env/test_use.py
index 7e1c3adb972..ac042c93b05 100644
--- a/tests/console/commands/env/test_use.py
+++ b/tests/console/commands/env/test_use.py
@@ -6,7 +6,7 @@
 
 from cleo.testers import CommandTester
 
-from poetry.semver import Version
+from poetry.core.semver import Version
 from poetry.utils._compat import Path
 from poetry.utils.env import EnvManager
 from poetry.utils.env import MockEnv
@@ -37,6 +37,7 @@ def check_output(cmd, *args, **kwargs):
 
 
 def test_activate_activates_non_existing_virtualenv_no_envs_file(app, tmp_dir, mocker):
+    mocker.stopall()
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
@@ -57,7 +58,7 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(app, tmp_dir, m
     tester.execute("3.7")
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
 
     m.assert_called_with(
@@ -85,10 +86,11 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(app, tmp_dir, m
 def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
     app, tmp_dir, mocker
 ):
+    mocker.stopall()
     os.environ["VIRTUAL_ENV"] = "/environment/prefix"
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     current_python = sys.version_info[:3]
     python_minor = ".".join(str(v) for v in current_python[:2])
@@ -127,10 +129,11 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
 def test_get_prefers_explicitly_activated_non_existing_virtualenvs_over_env_var(
     app, tmp_dir, mocker
 ):
+    mocker.stopall()
     os.environ["VIRTUAL_ENV"] = "/environment/prefix"
 
     venv_name = EnvManager.generate_env_name(
-        "simple_project", str(app.poetry.file.parent)
+        "simple-project", str(app.poetry.file.parent)
     )
     current_python = sys.version_info[:3]
     python_minor = ".".join(str(v) for v in current_python[:2])
diff --git a/poetry/packages/utils/__init__.py b/tests/console/commands/self/__init__.py
similarity index 100%
rename from poetry/packages/utils/__init__.py
rename to tests/console/commands/self/__init__.py
diff --git a/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.sha256sum b/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.sha256sum
new file mode 100644
index 00000000000..3229630afad
--- /dev/null
+++ b/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.sha256sum
@@ -0,0 +1 @@
+be3d3b916cb47038899d6ff37e875fd08ba3fed22bcdbf5a92f3f48fd2f15da8
diff --git a/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.tar.gz b/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.tar.gz
new file mode 100644
index 00000000000..09bb17bdeb9
Binary files /dev/null and b/tests/console/commands/self/fixtures/poetry-1.0.5-darwin.tar.gz differ
diff --git a/tests/console/commands/self/test_update.py b/tests/console/commands/self/test_update.py
new file mode 100644
index 00000000000..54fc88635df
--- /dev/null
+++ b/tests/console/commands/self/test_update.py
@@ -0,0 +1,87 @@
+import os
+
+from cleo.testers import CommandTester
+
+from poetry.__version__ import __version__
+from poetry.core.packages.package import Package
+from poetry.core.semver.version import Version
+from poetry.utils._compat import WINDOWS
+from poetry.utils._compat import Path
+
+
+FIXTURES = Path(__file__).parent.joinpath("fixtures")
+
+
+def test_self_update_should_install_all_necessary_elements(
+    app, http, mocker, environ, tmp_dir
+):
+    os.environ["POETRY_HOME"] = tmp_dir
+
+    command = app.find("self update")
+
+    version = Version.parse(__version__).next_minor.text
+    mocker.patch(
+        "poetry.repositories.pypi_repository.PyPiRepository.find_packages",
+        return_value=[Package("poetry", version)],
+    )
+    mocker.patch.object(command, "_check_recommended_installation", return_value=None)
+    mocker.patch.object(
+        command, "_get_release_name", return_value="poetry-{}-darwin".format(version)
+    )
+    mocker.patch("subprocess.check_output", return_value=b"Python 3.8.2")
+
+    http.register_uri(
+        "GET",
+        command.BASE_URL + "/{}/poetry-{}-darwin.sha256sum".format(version, version),
+        body=FIXTURES.joinpath("poetry-1.0.5-darwin.sha256sum").read_bytes(),
+    )
+    http.register_uri(
+        "GET",
+        command.BASE_URL + "/{}/poetry-{}-darwin.tar.gz".format(version, version),
+        body=FIXTURES.joinpath("poetry-1.0.5-darwin.tar.gz").read_bytes(),
+    )
+
+    tester = CommandTester(command)
+    tester.execute()
+
+    bin_ = Path(tmp_dir).joinpath("bin")
+    lib = Path(tmp_dir).joinpath("lib")
+    assert bin_.exists()
+
+    script = bin_.joinpath("poetry")
+    assert script.exists()
+
+    expected_script = """\
+# -*- coding: utf-8 -*-
+import glob
+import sys
+import os
+
+lib = os.path.normpath(os.path.join(os.path.realpath(__file__), "../..", "lib"))
+vendors = os.path.join(lib, "poetry", "_vendor")
+current_vendors = os.path.join(
+    vendors, "py{}".format(".".join(str(v) for v in sys.version_info[:2]))
+)
+sys.path.insert(0, lib)
+sys.path.insert(0, current_vendors)
+
+if __name__ == "__main__":
+    from poetry.console import main
+    main()
+"""
+    if not WINDOWS:
+        expected_script = "#!/usr/bin/env python\n" + expected_script
+
+    assert expected_script == script.read_text()
+
+    if WINDOWS:
+        bat = bin_.joinpath("poetry.bat")
+        expected_bat = '@echo off\r\npython "{}" %*\r\n'.format(
+            str(script).replace(os.environ.get("USERPROFILE", ""), "%USERPROFILE%")
+        )
+        assert bat.exists()
+        with bat.open(newline="") as f:
+            assert expected_bat == f.read()
+
+    assert lib.exists()
+    assert lib.joinpath("poetry").exists()
diff --git a/tests/console/commands/test_about.py b/tests/console/commands/test_about.py
index f22706e1a7e..768cf6b33e1 100644
--- a/tests/console/commands/test_about.py
+++ b/tests/console/commands/test_about.py
@@ -11,7 +11,7 @@ def test_about(app):
 Poetry - Package Management for Python
 
 Poetry is a dependency manager tracking local dependencies of your projects and libraries.
-See https://github.com/sdispater/poetry for more information.
+See https://github.com/python-poetry/poetry for more information.
 """
 
     assert expected == tester.io.fetch_output()
diff --git a/tests/console/commands/test_add.py b/tests/console/commands/test_add.py
index 2a50000bf51..866715163ae 100644
--- a/tests/console/commands/test_add.py
+++ b/tests/console/commands/test_add.py
@@ -1,10 +1,12 @@
 import sys
 
 import pytest
+
 from cleo.testers import CommandTester
 
+from poetry.core.semver import Version
+from poetry.repositories.legacy_repository import LegacyRepository
 from poetry.utils._compat import Path
-
 from tests.helpers import get_dependency
 from tests.helpers import get_package
 
@@ -109,7 +111,7 @@ def test_add_constraint_with_extras(app, repo, installer):
     repo.add_package(cachy1)
     repo.add_package(get_package("msgpack-python", "0.5.3"))
 
-    tester.execute("cachy[msgpack]^0.1.0")
+    tester.execute("cachy[msgpack]>=0.1.0,<0.2.0")
 
     expected = """\
 
@@ -264,6 +266,42 @@ def test_add_git_constraint_with_extras(app, repo, installer):
     }
 
 
+def test_add_git_ssh_constraint(app, repo, installer):
+    command = app.find("add")
+    tester = CommandTester(command)
+
+    repo.add_package(get_package("pendulum", "1.4.4"))
+    repo.add_package(get_package("cleo", "0.6.5"))
+
+    tester.execute("git+ssh://git@github.com/demo/demo.git@develop")
+
+    expected = """\
+
+Updating dependencies
+Resolving dependencies...
+
+Writing lock file
+
+
+Package operations: 2 installs, 0 updates, 0 removals
+
+  - Installing pendulum (1.4.4)
+  - Installing demo (0.1.2 9cf87a2)
+"""
+
+    assert expected == tester.io.fetch_output()
+
+    assert len(installer.installs) == 2
+
+    content = app.poetry.file.read()["tool"]["poetry"]
+
+    assert "demo" in content["dependencies"]
+    assert content["dependencies"]["demo"] == {
+        "git": "ssh://git@github.com/demo/demo.git",
+        "rev": "develop",
+    }
+
+
 def test_add_directory_constraint(app, repo, installer, mocker):
     p = mocker.patch("poetry.utils._compat.Path.cwd")
     p.return_value = Path(__file__) / ".."
@@ -456,7 +494,7 @@ def test_add_url_constraint_wheel(app, repo, installer, mocker):
     repo.add_package(get_package("pendulum", "1.4.4"))
 
     tester.execute(
-        "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl"
+        "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
     )
 
     expected = """\
@@ -470,7 +508,7 @@ def test_add_url_constraint_wheel(app, repo, installer, mocker):
 Package operations: 2 installs, 0 updates, 0 removals
 
   - Installing pendulum (1.4.4)
-  - Installing demo (0.1.0 https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl)
+  - Installing demo (0.1.0 https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl)
 """
 
     assert expected == tester.io.fetch_output()
@@ -481,7 +519,7 @@ def test_add_url_constraint_wheel(app, repo, installer, mocker):
 
     assert "demo" in content["dependencies"]
     assert content["dependencies"]["demo"] == {
-        "url": "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl"
+        "url": "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
     }
 
 
@@ -494,7 +532,7 @@ def test_add_url_constraint_wheel_with_extras(app, repo, installer, mocker):
     repo.add_package(get_package("tomlkit", "0.5.5"))
 
     tester.execute(
-        "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl[foo,bar]"
+        "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl[foo,bar]"
     )
 
     expected = """\
@@ -510,7 +548,7 @@ def test_add_url_constraint_wheel_with_extras(app, repo, installer, mocker):
   - Installing cleo (0.6.5)
   - Installing pendulum (1.4.4)
   - Installing tomlkit (0.5.5)
-  - Installing demo (0.1.0 https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl)
+  - Installing demo (0.1.0 https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl)
 """
 
     assert expected == tester.io.fetch_output()
@@ -521,7 +559,7 @@ def test_add_url_constraint_wheel_with_extras(app, repo, installer, mocker):
 
     assert "demo" in content["dependencies"]
     assert content["dependencies"]["demo"] == {
-        "url": "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl",
+        "url": "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl",
         "extras": ["foo", "bar"],
     }
 
@@ -560,8 +598,9 @@ def test_add_constraint_with_python(app, repo, installer):
     assert content["dependencies"]["cachy"] == {"version": "0.2.0", "python": ">=2.7"}
 
 
-def test_add_constraint_with_platform(app, repo, installer):
+def test_add_constraint_with_platform(app, repo, installer, env):
     platform = sys.platform
+    env._platform = platform
     command = app.find("add")
     tester = CommandTester(command)
 
@@ -570,7 +609,7 @@ def test_add_constraint_with_platform(app, repo, installer):
     repo.add_package(get_package("cachy", "0.1.0"))
     repo.add_package(cachy2)
 
-    tester.execute("cachy=0.2.0 --platform {}".format(platform))
+    tester.execute("cachy=0.2.0 --platform {} -vvv".format(platform))
 
     expected = """\
 
@@ -598,6 +637,72 @@ def test_add_constraint_with_platform(app, repo, installer):
     }
 
 
+def test_add_constraint_with_source(app, poetry, installer):
+    repo = LegacyRepository(name="my-index", url="https://my-index.fake")
+    repo.add_package(get_package("cachy", "0.2.0"))
+    repo._cache.store("matches").put("cachy:0.2.0", [Version.parse("0.2.0")], 5)
+
+    poetry.pool.add_repository(repo)
+
+    command = app.find("add")
+    tester = CommandTester(command)
+
+    tester.execute("cachy=0.2.0 --source my-index")
+
+    expected = """\
+
+Updating dependencies
+Resolving dependencies...
+
+Writing lock file
+
+
+Package operations: 1 install, 0 updates, 0 removals
+
+  - Installing cachy (0.2.0)
+"""
+
+    assert expected == tester.io.fetch_output()
+
+    assert len(installer.installs) == 1
+
+    content = app.poetry.file.read()["tool"]["poetry"]
+
+    assert "cachy" in content["dependencies"]
+    assert content["dependencies"]["cachy"] == {
+        "version": "0.2.0",
+        "source": "my-index",
+    }
+
+
+def test_add_constraint_with_source_that_does_not_exist(app):
+    command = app.find("add")
+    tester = CommandTester(command)
+
+    with pytest.raises(ValueError) as e:
+        tester.execute("foo --source i-dont-exist")
+
+    assert 'Repository "i-dont-exist" does not exist.' == str(e.value)
+
+
+def test_add_constraint_not_found_with_source(app, poetry, mocker):
+    repo = LegacyRepository(name="my-index", url="https://my-index.fake")
+    mocker.patch.object(repo, "find_packages", return_value=[])
+
+    poetry.pool.add_repository(repo)
+
+    pypi = poetry.pool.repositories[0]
+    pypi.add_package(get_package("cachy", "0.2.0"))
+
+    command = app.find("add")
+    tester = CommandTester(command)
+
+    with pytest.raises(ValueError) as e:
+        tester.execute("cachy --source my-index")
+
+    assert "Could not find a matching version of package cachy" == str(e.value)
+
+
 def test_add_to_section_that_does_no_exist_yet(app, repo, installer):
     command = app.find("add")
     tester = CommandTester(command)
@@ -766,3 +871,23 @@ def test_add_preferes_stable_releases(app, repo, installer):
 """
 
     assert expected in tester.io.fetch_output()
+
+
+def test_add_with_lock(app, repo, installer):
+    command = app.find("add")
+    tester = CommandTester(command)
+
+    repo.add_package(get_package("cachy", "0.2.0"))
+
+    tester.execute("cachy --lock")
+
+    expected = """\
+Using version ^0.2.0 for cachy
+
+Updating dependencies
+Resolving dependencies...
+
+Writing lock file
+"""
+
+    assert expected == tester.io.fetch_output()
diff --git a/tests/console/commands/test_cache.py b/tests/console/commands/test_cache.py
new file mode 100644
index 00000000000..8a22eee7f1b
--- /dev/null
+++ b/tests/console/commands/test_cache.py
@@ -0,0 +1,60 @@
+import uuid
+
+import pytest
+
+from cleo.testers import CommandTester
+
+
+@pytest.fixture
+def repository_cache_dir(monkeypatch, tmpdir):
+    import poetry.locations
+    from poetry.utils._compat import Path
+
+    path = Path(str(tmpdir))
+    monkeypatch.setattr(poetry.locations, "REPOSITORY_CACHE_DIR", path)
+    return path
+
+
+@pytest.fixture
+def repository_one():
+    return "01_{}".format(uuid.uuid4())
+
+
+@pytest.fixture
+def repository_two():
+    return "02_{}".format(uuid.uuid4())
+
+
+@pytest.fixture
+def mock_caches(repository_cache_dir, repository_one, repository_two):
+    (repository_cache_dir / repository_one).mkdir()
+    (repository_cache_dir / repository_two).mkdir()
+
+
+def test_cache_list(app, mock_caches, repository_one, repository_two):
+    command = app.find("cache list")
+    tester = CommandTester(command)
+
+    tester.execute()
+
+    expected = """\
+{}
+{}
+""".format(
+        repository_one, repository_two
+    )
+
+    assert expected == tester.io.fetch_output()
+
+
+def test_cache_list_empty(app, repository_cache_dir):
+    command = app.find("cache list")
+    tester = CommandTester(command)
+
+    tester.execute()
+
+    expected = """\
+No caches found
+"""
+
+    assert expected == tester.io.fetch_output()
diff --git a/tests/console/commands/test_check.py b/tests/console/commands/test_check.py
index bfc4ce9d0f2..8f8b94a5c9b 100644
--- a/tests/console/commands/test_check.py
+++ b/tests/console/commands/test_check.py
@@ -34,14 +34,14 @@ def test_check_invalid(app, mocker):
     if PY2:
         expected = """\
 Error: u'description' is a required property
-Error: INVALID is not a valid license
 Warning: A wildcard Python dependency is ambiguous. Consider specifying a more explicit one.
+Warning: The "pendulum" dependency specifies the "allows-prereleases" property, which is deprecated. Use "allow-prereleases" instead.
 """
     else:
         expected = """\
 Error: 'description' is a required property
-Error: INVALID is not a valid license
 Warning: A wildcard Python dependency is ambiguous. Consider specifying a more explicit one.
+Warning: The "pendulum" dependency specifies the "allows-prereleases" property, which is deprecated. Use "allow-prereleases" instead.
 """
 
     assert expected == tester.io.fetch_output()
diff --git a/tests/console/commands/test_config.py b/tests/console/commands/test_config.py
index b690b2a2f4d..fe331d777fc 100644
--- a/tests/console/commands/test_config.py
+++ b/tests/console/commands/test_config.py
@@ -99,3 +99,26 @@ def test_set_pypi_token(app, config, config_source, auth_config_source):
     tester.execute("--list")
 
     assert "mytoken" == auth_config_source.config["pypi-token"]["pypi"]
+
+
+def test_set_client_cert(app, config_source, auth_config_source, mocker):
+    mocker.spy(ConfigSource, "__init__")
+    command = app.find("config")
+    tester = CommandTester(command)
+
+    tester.execute("certificates.foo.client-cert path/to/cert.pem")
+
+    assert (
+        "path/to/cert.pem"
+        == auth_config_source.config["certificates"]["foo"]["client-cert"]
+    )
+
+
+def test_set_cert(app, config_source, auth_config_source, mocker):
+    mocker.spy(ConfigSource, "__init__")
+    command = app.find("config")
+    tester = CommandTester(command)
+
+    tester.execute("certificates.foo.cert path/to/ca.pem")
+
+    assert "path/to/ca.pem" == auth_config_source.config["certificates"]["foo"]["cert"]
diff --git a/tests/console/commands/test_export.py b/tests/console/commands/test_export.py
index 45de47c6eb1..65d4927916d 100644
--- a/tests/console/commands/test_export.py
+++ b/tests/console/commands/test_export.py
@@ -26,9 +26,9 @@
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
@@ -168,6 +168,28 @@ def test_export_prints_to_stdout_by_default(app, repo):
     assert expected == tester.io.fetch_output()
 
 
+def test_export_uses_requirements_txt_format_by_default(app, repo):
+    repo.add_package(get_package("foo", "1.0.0"))
+    repo.add_package(get_package("bar", "1.1.0"))
+
+    command = app.find("lock")
+    tester = CommandTester(command)
+    tester.execute()
+
+    assert app.poetry.locker.lock.exists()
+
+    command = app.find("export")
+    tester = CommandTester(command)
+
+    tester.execute()
+
+    expected = """\
+foo==1.0.0
+"""
+
+    assert expected == tester.io.fetch_output()
+
+
 def test_export_includes_extras_by_flag(app, repo):
     repo.add_package(get_package("foo", "1.0.0"))
     repo.add_package(get_package("bar", "1.1.0"))
diff --git a/tests/console/commands/test_init.py b/tests/console/commands/test_init.py
index ac9ff63b58e..a5851ade958 100644
--- a/tests/console/commands/test_init.py
+++ b/tests/console/commands/test_init.py
@@ -1,8 +1,8 @@
 import sys
+
 from cleo.testers import CommandTester
 
 from poetry.utils._compat import Path
-
 from tests.helpers import get_package
 
 
@@ -140,14 +140,16 @@ def test_empty_license(app, mocker, poetry):
     assert expected in tester.io.fetch_output()
 
 
-def test_interactive_with_git_dependencies(app, repo, mocker, poetry):
+def test_interactive_with_git_dependencies(
+    app, repo, mocker, poetry, mocked_open_files
+):
     repo.add_package(get_package("pendulum", "2.0.0"))
     repo.add_package(get_package("pytest", "3.6.0"))
 
     command = app.find("init")
     command._pool = poetry.pool
 
-    mocker.patch("poetry.utils._compat.Path.open")
+    mocked_open_files.append("pyproject.toml")
     p = mocker.patch("poetry.utils._compat.Path.cwd")
     p.return_value = Path(__file__).parent
 
@@ -191,14 +193,16 @@ def test_interactive_with_git_dependencies(app, repo, mocker, poetry):
     assert expected in tester.io.fetch_output()
 
 
-def test_interactive_with_git_dependencies_with_reference(app, repo, mocker, poetry):
+def test_interactive_with_git_dependencies_with_reference(
+    app, repo, mocker, poetry, mocked_open_files
+):
     repo.add_package(get_package("pendulum", "2.0.0"))
     repo.add_package(get_package("pytest", "3.6.0"))
 
     command = app.find("init")
     command._pool = poetry.pool
 
-    mocker.patch("poetry.utils._compat.Path.open")
+    mocked_open_files.append("pyproject.toml")
     p = mocker.patch("poetry.utils._compat.Path.cwd")
     p.return_value = Path(__file__).parent
 
@@ -242,14 +246,16 @@ def test_interactive_with_git_dependencies_with_reference(app, repo, mocker, poe
     assert expected in tester.io.fetch_output()
 
 
-def test_interactive_with_git_dependencies_and_other_name(app, repo, mocker, poetry):
+def test_interactive_with_git_dependencies_and_other_name(
+    app, repo, mocker, poetry, mocked_open_files
+):
     repo.add_package(get_package("pendulum", "2.0.0"))
     repo.add_package(get_package("pytest", "3.6.0"))
 
     command = app.find("init")
     command._pool = poetry.pool
 
-    mocker.patch("poetry.utils._compat.Path.open")
+    mocked_open_files.append("pyproject.toml")
     p = mocker.patch("poetry.utils._compat.Path.cwd")
     p.return_value = Path(__file__).parent
 
@@ -293,14 +299,16 @@ def test_interactive_with_git_dependencies_and_other_name(app, repo, mocker, poe
     assert expected in tester.io.fetch_output()
 
 
-def test_interactive_with_directory_dependency(app, repo, mocker, poetry):
+def test_interactive_with_directory_dependency(
+    app, repo, mocker, poetry, mocked_open_files
+):
     repo.add_package(get_package("pendulum", "2.0.0"))
     repo.add_package(get_package("pytest", "3.6.0"))
 
     command = app.find("init")
     command._pool = poetry.pool
 
-    mocker.patch("poetry.utils._compat.Path.open")
+    mocked_open_files.append("pyproject.toml")
     p = mocker.patch("poetry.utils._compat.Path.cwd")
     p.return_value = Path(__file__).parent
 
diff --git a/tests/console/commands/test_publish.py b/tests/console/commands/test_publish.py
index 5d60244760b..dccc43ee87d 100644
--- a/tests/console/commands/test_publish.py
+++ b/tests/console/commands/test_publish.py
@@ -1,3 +1,14 @@
+import pytest
+import requests
+
+from poetry.publishing.uploader import UploadError
+from poetry.utils._compat import PY36
+from poetry.utils._compat import Path
+
+
+@pytest.mark.skipif(
+    not PY36, reason="Improved error rendering is only available on Python >=3.6"
+)
 def test_publish_returns_non_zero_code_for_upload_errors(app, app_tester, http):
     http.register_uri(
         http.POST, "https://upload.pypi.org/legacy/", status=400, body="Bad Request"
@@ -11,8 +22,88 @@ def test_publish_returns_non_zero_code_for_upload_errors(app, app_tester, http):
 Publishing simple-project (1.2.3) to PyPI
 
 
-[UploadError]
+  UploadError
+
+  HTTP Error 400: Bad Request
+"""
+
+    assert expected in app_tester.io.fetch_output()
+
+
+def test_publish_returns_non_zero_code_for_connection_errors(app, app_tester, http):
+    def request_callback(*_, **__):
+        raise requests.ConnectionError()
+
+    http.register_uri(
+        http.POST, "https://upload.pypi.org/legacy/", body=request_callback
+    )
+
+    exit_code = app_tester.execute("publish --username foo --password bar")
+
+    assert 1 == exit_code
+
+    expected = str(UploadError(error=requests.ConnectionError()))
+
+    assert expected in app_tester.io.fetch_output()
+
+
+@pytest.mark.skipif(
+    PY36, reason="Improved error rendering is not available on Python <3.6"
+)
+def test_publish_returns_non_zero_code_for_upload_errors_older_python(
+    app, app_tester, http
+):
+    http.register_uri(
+        http.POST, "https://upload.pypi.org/legacy/", status=400, body="Bad Request"
+    )
+
+    exit_code = app_tester.execute("publish --username foo --password bar")
+
+    assert 1 == exit_code
+
+    expected = """
+Publishing simple-project (1.2.3) to PyPI
+
+
+UploadError
+
 HTTP Error 400: Bad Request
 """
 
     assert app_tester.io.fetch_output() == expected
+
+
+def test_publish_with_cert(app_tester, mocker):
+    publisher_publish = mocker.patch("poetry.publishing.Publisher.publish")
+
+    app_tester.execute("publish --cert path/to/ca.pem")
+
+    assert [
+        (None, None, None, Path("path/to/ca.pem"), None, False)
+    ] == publisher_publish.call_args
+
+
+def test_publish_with_client_cert(app_tester, mocker):
+    publisher_publish = mocker.patch("poetry.publishing.Publisher.publish")
+
+    app_tester.execute("publish --client-cert path/to/client.pem")
+    assert [
+        (None, None, None, None, Path("path/to/client.pem"), False)
+    ] == publisher_publish.call_args
+
+
+def test_publish_dry_run(app_tester, http):
+    http.register_uri(
+        http.POST, "https://upload.pypi.org/legacy/", status=403, body="Forbidden"
+    )
+
+    exit_code = app_tester.execute("publish --dry-run --username foo --password bar")
+
+    assert 0 == exit_code
+
+    output = app_tester.io.fetch_output()
+    error = app_tester.io.fetch_error()
+
+    assert "Publishing simple-project (1.2.3) to PyPI" in output
+    assert "- Uploading simple-project-1.2.3.tar.gz" in error
+    assert "- Uploading simple_project-1.2.3-py2.py3-none-any.whl" in error
diff --git a/tests/console/commands/test_run.py b/tests/console/commands/test_run.py
index 45848222841..e8ae40aa606 100644
--- a/tests/console/commands/test_run.py
+++ b/tests/console/commands/test_run.py
@@ -1,11 +1,7 @@
 from cleo.testers import CommandTester
 
-from poetry.utils._compat import Path
-from poetry.utils.env import MockEnv
 
-
-def test_run_passes_all_args(app, mocker):
-    env = MockEnv(path=Path("/prefix"), base=Path("/base/prefix"), is_venv=True)
+def test_run_passes_all_args(app, mocker, env):
     mocker.patch("poetry.utils.env.EnvManager.get", return_value=env)
 
     command = app.find("run")
diff --git a/tests/console/commands/test_search.py b/tests/console/commands/test_search.py
new file mode 100644
index 00000000000..57891e93b2f
--- /dev/null
+++ b/tests/console/commands/test_search.py
@@ -0,0 +1,85 @@
+from cleo.testers import CommandTester
+
+from poetry.utils._compat import Path
+
+
+TESTS_DIRECTORY = Path(__file__).parent.parent.parent
+FIXTURES_DIRECTORY = (
+    TESTS_DIRECTORY / "repositories" / "fixtures" / "pypi.org" / "search"
+)
+
+
+def test_search(app, http):
+    with FIXTURES_DIRECTORY.joinpath("search.html").open(encoding="utf-8") as f:
+        search_results = f.read()
+
+    http.register_uri("GET", "https://pypi.org/search", search_results)
+
+    command = app.find("search")
+    tester = CommandTester(command)
+
+    tester.execute("sqlalchemy")
+
+    expected = """
+sqlalchemy (1.3.10)
+ Database Abstraction Library
+
+sqlalchemy-dao (1.3.1)
+ Simple wrapper for sqlalchemy.
+
+graphene-sqlalchemy (2.2.2)
+ Graphene SQLAlchemy integration
+
+sqlalchemy-utcdatetime (1.0.4)
+ Convert to/from timezone aware datetimes when storing in a DBMS
+
+paginate-sqlalchemy (0.3.0)
+ Extension to paginate.Page that supports SQLAlchemy queries
+
+sqlalchemy-audit (0.1.0)
+ sqlalchemy-audit provides an easy way to set up revision tracking for your data.
+
+transmogrify.sqlalchemy (1.0.2)
+ Feed data from SQLAlchemy into a transmogrifier pipeline
+
+sqlalchemy-schemadisplay (1.3)
+ Turn SQLAlchemy DB Model into a graph
+
+sqlalchemy-traversal (0.5.2)
+ UNKNOWN
+
+sqlalchemy-filters (0.10.0)
+ A library to filter SQLAlchemy queries.
+
+sqlalchemy-wrap (2.1.7)
+ Python wrapper for the CircleCI API
+
+sqlalchemy-nav (0.0.2)
+ SQLAlchemy-Nav provides SQLAlchemy Mixins for creating navigation bars compatible with Bootstrap
+
+sqlalchemy-repr (0.0.1)
+ Automatically generates pretty repr of a SQLAlchemy model.
+
+sqlalchemy-diff (0.1.3)
+ Compare two database schemas using sqlalchemy.
+
+sqlalchemy-equivalence (0.1.1)
+ Provides natural equivalence support for SQLAlchemy declarative models.
+
+broadway-sqlalchemy (0.0.1)
+ A broadway extension wrapping Flask-SQLAlchemy
+
+jsonql-sqlalchemy (1.0.1)
+ Simple JSON-Based CRUD Query Language for SQLAlchemy
+
+sqlalchemy-plus (0.2.0)
+ Create Views and Materialized Views with SqlAlchemy
+
+cherrypy-sqlalchemy (0.5.3)
+ Use SQLAlchemy with CherryPy
+
+sqlalchemy-sqlany (1.0.3)
+ SAP Sybase SQL Anywhere dialect for SQLAlchemy
+"""
+
+    assert expected == tester.io.fetch_output()
diff --git a/tests/console/commands/test_show.py b/tests/console/commands/test_show.py
index b1d919e3c04..af646ea4046 100644
--- a/tests/console/commands/test_show.py
+++ b/tests/console/commands/test_show.py
@@ -379,6 +379,178 @@ def test_show_outdated(app, poetry, installed, repo):
     assert expected == tester.io.fetch_output()
 
 
+def test_show_outdated_with_only_up_to_date_packages(app, poetry, installed, repo):
+    command = app.find("show")
+    tester = CommandTester(command)
+
+    cachy_020 = get_package("cachy", "0.2.0")
+    cachy_020.description = "Cachy package"
+
+    installed.add_package(cachy_020)
+    repo.add_package(cachy_020)
+
+    poetry.locker.mock_lock_data(
+        {
+            "package": [
+                {
+                    "name": "cachy",
+                    "version": "0.2.0",
+                    "description": "Cachy package",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                },
+            ],
+            "metadata": {
+                "python-versions": "*",
+                "platform": "*",
+                "content-hash": "123456789",
+                "hashes": {"cachy": []},
+            },
+        }
+    )
+
+    tester.execute("--outdated")
+
+    expected = ""
+
+    assert expected == tester.io.fetch_output()
+
+
+def test_show_outdated_has_prerelease_but_not_allowed(app, poetry, installed, repo):
+    command = app.find("show")
+    tester = CommandTester(command)
+
+    cachy_010 = get_package("cachy", "0.1.0")
+    cachy_010.description = "Cachy package"
+    cachy_020 = get_package("cachy", "0.2.0")
+    cachy_020.description = "Cachy package"
+    cachy_030dev = get_package("cachy", "0.3.0.dev123")
+    cachy_030dev.description = "Cachy package"
+
+    pendulum_200 = get_package("pendulum", "2.0.0")
+    pendulum_200.description = "Pendulum package"
+
+    installed.add_package(cachy_010)
+    installed.add_package(pendulum_200)
+
+    # sorting isn't used, so this has to be the first element to
+    # replicate the issue in PR #1548
+    repo.add_package(cachy_030dev)
+    repo.add_package(cachy_010)
+    repo.add_package(cachy_020)
+    repo.add_package(pendulum_200)
+
+    poetry.locker.mock_lock_data(
+        {
+            "package": [
+                {
+                    "name": "cachy",
+                    "version": "0.1.0",
+                    "description": "Cachy package",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                },
+                {
+                    "name": "pendulum",
+                    "version": "2.0.0",
+                    "description": "Pendulum package",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                },
+            ],
+            "metadata": {
+                "python-versions": "*",
+                "platform": "*",
+                "content-hash": "123456789",
+                "hashes": {"cachy": [], "pendulum": []},
+            },
+        }
+    )
+
+    tester.execute("--outdated")
+
+    expected = """\
+cachy 0.1.0 0.2.0 Cachy package
+"""
+
+    assert expected == tester.io.fetch_output()
+
+
+def test_show_outdated_has_prerelease_and_allowed(app, poetry, installed, repo):
+    command = app.find("show")
+    tester = CommandTester(command)
+
+    cachy_010dev = get_package("cachy", "0.1.0.dev1")
+    cachy_010dev.description = "Cachy package"
+    cachy_020 = get_package("cachy", "0.2.0")
+    cachy_020.description = "Cachy package"
+    cachy_030dev = get_package("cachy", "0.3.0.dev123")
+    cachy_030dev.description = "Cachy package"
+
+    pendulum_200 = get_package("pendulum", "2.0.0")
+    pendulum_200.description = "Pendulum package"
+
+    installed.add_package(cachy_010dev)
+    installed.add_package(pendulum_200)
+
+    # sorting isn't used, so this has to be the first element to
+    # replicate the issue in PR #1548
+    repo.add_package(cachy_030dev)
+    repo.add_package(cachy_010dev)
+    repo.add_package(cachy_020)
+    repo.add_package(pendulum_200)
+
+    poetry.locker.mock_lock_data(
+        {
+            "package": [
+                {
+                    "name": "cachy",
+                    "version": "0.1.0.dev1",
+                    "description": "Cachy package",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                },
+                {
+                    "name": "pendulum",
+                    "version": "2.0.0",
+                    "description": "Pendulum package",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                },
+            ],
+            "metadata": {
+                "python-versions": "*",
+                "platform": "*",
+                "content-hash": "123456789",
+                "hashes": {"cachy": [], "pendulum": []},
+            },
+        }
+    )
+
+    tester.execute("--outdated")
+
+    expected = """\
+cachy 0.1.0.dev1 0.3.0.dev123 Cachy package
+"""
+
+    assert expected == tester.io.fetch_output()
+
+
 def test_show_outdated_formatting(app, poetry, installed, repo):
     command = app.find("show")
     tester = CommandTester(command)
@@ -538,10 +710,12 @@ def test_show_outdated_local_dependencies(app, poetry, installed, repo):
     tester.execute("--outdated")
 
     expected = """\
-cachy      0.1.0                       0.2.0                      
+cachy      0.1.0                       0.2.0
 my-package 0.1.1 ../project_with_setup 0.1.2 ../project_with_setup
 """
-    assert expected == tester.io.fetch_output()
+    assert expected.rstrip() == "\n".join(
+        l.rstrip() for l in tester.io.fetch_output().splitlines()
+    )
 
 
 @pytest.mark.parametrize("project_directory", ["project_with_git_dev_dependency"])
diff --git a/tests/console/commands/test_version.py b/tests/console/commands/test_version.py
index 62dd7c2a881..42c4d297d44 100644
--- a/tests/console/commands/test_version.py
+++ b/tests/console/commands/test_version.py
@@ -1,4 +1,5 @@
 import pytest
+
 from cleo import CommandTester
 
 from poetry.console.commands import VersionCommand
@@ -43,4 +44,11 @@ def test_version_show(app):
     command = app.find("version")
     tester = CommandTester(command)
     tester.execute()
-    assert "Project (simple-project) version is 1.2.3\n" == tester.io.fetch_output()
+    assert "simple-project 1.2.3\n" == tester.io.fetch_output()
+
+
+def test_short_version_show(app):
+    command = app.find("version")
+    tester = CommandTester(command)
+    tester.execute("--short")
+    assert "1.2.3\n" == tester.io.fetch_output()
diff --git a/tests/console/conftest.py b/tests/console/conftest.py
index 5f2a4d4923b..e96a4a9d52d 100644
--- a/tests/console/conftest.py
+++ b/tests/console/conftest.py
@@ -1,26 +1,21 @@
 import os
-import pytest
-import shutil
 
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import pytest
 
 from cleo import ApplicationTester
 
 from poetry.console import Application as BaseApplication
 from poetry.factory import Factory
 from poetry.installation.noop_installer import NoopInstaller
-from poetry.poetry import Poetry as BasePoetry
 from poetry.packages import Locker as BaseLocker
+from poetry.poetry import Poetry as BasePoetry
 from poetry.repositories import Pool
 from poetry.repositories import Repository as BaseRepository
-from poetry.utils._compat import PY2
-from poetry.utils._compat import WINDOWS
+from poetry.repositories.exceptions import PackageNotFound
 from poetry.utils._compat import Path
+from poetry.utils.env import MockEnv
 from poetry.utils.toml_file import TomlFile
-from poetry.repositories.exceptions import PackageNotFound
+from tests.helpers import mock_clone
 
 
 @pytest.fixture()
@@ -28,52 +23,18 @@ def installer():
     return NoopInstaller()
 
 
-def mock_clone(self, source, dest):
-    # Checking source to determine which folder we need to copy
-    parts = urlparse.urlparse(source)
-
-    folder = (
-        Path(__file__).parent.parent
-        / "fixtures"
-        / "git"
-        / parts.netloc
-        / parts.path.lstrip("/").rstrip(".git")
-    )
-
-    shutil.rmtree(str(dest))
-    shutil.copytree(str(folder), str(dest))
-
-
-def mock_download(self, url, dest):
-    parts = urlparse.urlparse(url)
-
-    fixtures = Path(__file__).parent.parent / "fixtures"
-    fixture = fixtures / parts.path.lstrip("/")
-
-    if dest.exists():
-        shutil.rmtree(str(dest))
-
-    # Python2 does not support os.symlink on Windows whereas Python3 does.  os.symlink requires either administrative
-    # privileges or developer mode on Win10, throwing an OSError is neither is active.
-    if WINDOWS:
-        if PY2:
-            shutil.copyfile(str(fixture), str(dest))
-        else:
-            try:
-                os.symlink(str(fixture), str(dest))
-            except OSError:
-                shutil.copyfile(str(fixture), str(dest))
-    else:
-        os.symlink(str(fixture), str(dest))
-
-
 @pytest.fixture
 def installed():
     return BaseRepository()
 
 
+@pytest.fixture
+def env():
+    return MockEnv(path=Path("/prefix"), base=Path("/base/prefix"), is_venv=True)
+
+
 @pytest.fixture(autouse=True)
-def setup(mocker, installer, installed, config):
+def setup(mocker, installer, installed, config, env):
     # Set Installer's installer
     p = mocker.patch("poetry.installation.installer.Installer._get_installer")
     p.return_value = installer
@@ -87,13 +48,16 @@ def setup(mocker, installer, installed, config):
     p.return_value = installed
 
     # Patch git module to not actually clone projects
-    mocker.patch("poetry.vcs.git.Git.clone", new=mock_clone)
-    mocker.patch("poetry.vcs.git.Git.checkout", new=lambda *_: None)
-    p = mocker.patch("poetry.vcs.git.Git.rev_parse")
+    mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone)
+    mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None)
+    p = mocker.patch("poetry.core.vcs.git.Git.rev_parse")
     p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
 
-    # Patch download to not download anything but to just copy from fixtures
-    mocker.patch("poetry.utils.inspector.Inspector.download", new=mock_download)
+    # Patch the virtual environment creation do actually do nothing
+    mocker.patch("poetry.utils.env.EnvManager.create_venv", return_value=env)
+
+    # Patch the virtual environment creation do actually do nothing
+    mocker.patch("poetry.utils.env.EnvManager.create_venv", return_value=env)
 
     # Setting terminal width
     environ = dict(os.environ)
diff --git a/tests/fixtures/complete.toml b/tests/fixtures/complete.toml
index 0747b2d70dc..a894a89c689 100644
--- a/tests/fixtures/complete.toml
+++ b/tests/fixtures/complete.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/directory/project_with_transitive_directory_dependencies/pyproject.toml b/tests/fixtures/directory/project_with_transitive_directory_dependencies/pyproject.toml
index 0a97ea02c5f..28678e0d0ae 100644
--- a/tests/fixtures/directory/project_with_transitive_directory_dependencies/pyproject.toml
+++ b/tests/fixtures/directory/project_with_transitive_directory_dependencies/pyproject.toml
@@ -8,5 +8,6 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "*"
 project-with-extras = {path = "../../project_with_extras/"}
+project-with-transitive-file-dependencies = {path = "../project_with_transitive_file_dependencies/"}
 
 [tool.poetry.dev-dependencies]
diff --git a/tests/fixtures/directory/project_with_transitive_file_dependencies/inner-directory-project/pyproject.toml b/tests/fixtures/directory/project_with_transitive_file_dependencies/inner-directory-project/pyproject.toml
new file mode 100644
index 00000000000..a80113675e6
--- /dev/null
+++ b/tests/fixtures/directory/project_with_transitive_file_dependencies/inner-directory-project/pyproject.toml
@@ -0,0 +1,11 @@
+[tool.poetry]
+name = "inner-directory-project"
+version = "1.2.4"
+description = "This is a description"
+authors = ["Your Name "]
+license = "MIT"
+
+[tool.poetry.dependencies]
+python = "*"
+
+[tool.poetry.dev-dependencies]
diff --git a/tests/fixtures/directory/project_with_transitive_file_dependencies/pyproject.toml b/tests/fixtures/directory/project_with_transitive_file_dependencies/pyproject.toml
index 14512e2746e..678e42f2fa5 100644
--- a/tests/fixtures/directory/project_with_transitive_file_dependencies/pyproject.toml
+++ b/tests/fixtures/directory/project_with_transitive_file_dependencies/pyproject.toml
@@ -8,5 +8,6 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "*"
 demo = {path = "../../distributions/demo-0.1.0-py2.py3-none-any.whl"}
+inner-directory-project = {path = "./inner-directory-project"}
 
 [tool.poetry.dev-dependencies]
diff --git a/tests/fixtures/directory/project_with_transitive_file_dependencies/setup.py b/tests/fixtures/directory/project_with_transitive_file_dependencies/setup.py
deleted file mode 100644
index 24a8f05be9f..00000000000
--- a/tests/fixtures/directory/project_with_transitive_file_dependencies/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from distutils.core import setup
-
-packages = ["project_with_extras"]
-
-package_data = {"": ["*"]}
-
-extras_require = {"extras_a": ["pendulum>=1.4.4"], "extras_b": ["cachy>=0.2.0"]}
-
-setup_kwargs = {
-    "name": "project-with-extras",
-    "version": "1.2.3",
-    "description": "This is a description",
-    "long_description": None,
-    "author": "Your Name",
-    "author_email": "you@example.com",
-    "url": None,
-    "packages": packages,
-    "package_data": package_data,
-    "extras_require": extras_require,
-}
-
-
-setup(**setup_kwargs)
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/README.rst b/tests/fixtures/excluded_subpackage/README.rst
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/README.rst
rename to tests/fixtures/excluded_subpackage/README.rst
diff --git a/tests/fixtures/excluded_subpackage/example/__init__.py b/tests/fixtures/excluded_subpackage/example/__init__.py
new file mode 100644
index 00000000000..3dc1f76bc69
--- /dev/null
+++ b/tests/fixtures/excluded_subpackage/example/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.1.0"
diff --git a/tests/json/__init__.py b/tests/fixtures/excluded_subpackage/example/test/__init__.py
similarity index 100%
rename from tests/json/__init__.py
rename to tests/fixtures/excluded_subpackage/example/test/__init__.py
diff --git a/tests/fixtures/excluded_subpackage/example/test/excluded.py b/tests/fixtures/excluded_subpackage/example/test/excluded.py
new file mode 100644
index 00000000000..bf6e1f8962f
--- /dev/null
+++ b/tests/fixtures/excluded_subpackage/example/test/excluded.py
@@ -0,0 +1,5 @@
+from .. import __version__
+
+
+def test_version():
+    assert __version__ == "0.1.0"
diff --git a/tests/fixtures/excluded_subpackage/pyproject.toml b/tests/fixtures/excluded_subpackage/pyproject.toml
new file mode 100644
index 00000000000..3852bb831fa
--- /dev/null
+++ b/tests/fixtures/excluded_subpackage/pyproject.toml
@@ -0,0 +1,18 @@
+[tool.poetry]
+name = "example"
+version = "0.1.0"
+description = ""
+authors = ["Sébastien Eustace "]
+exclude = [
+    "**/test/**/*",
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+
+[tool.poetry.dev-dependencies]
+pytest = "^3.0"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"
diff --git a/tests/masonry/builders/fixtures/complete/README.rst b/tests/fixtures/extended_project/README.rst
similarity index 100%
rename from tests/masonry/builders/fixtures/complete/README.rst
rename to tests/fixtures/extended_project/README.rst
diff --git a/tests/masonry/__init__.py b/tests/fixtures/extended_project/build.py
similarity index 100%
rename from tests/masonry/__init__.py
rename to tests/fixtures/extended_project/build.py
diff --git a/tests/masonry/builders/__init__.py b/tests/fixtures/extended_project/extended_project/__init__.py
similarity index 100%
rename from tests/masonry/builders/__init__.py
rename to tests/fixtures/extended_project/extended_project/__init__.py
diff --git a/tests/masonry/builders/fixtures/with_vcs_dependency/pyproject.toml b/tests/fixtures/extended_project/pyproject.toml
similarity index 57%
rename from tests/masonry/builders/fixtures/with_vcs_dependency/pyproject.toml
rename to tests/fixtures/extended_project/pyproject.toml
index d260f69da1d..954b12b3497 100644
--- a/tests/masonry/builders/fixtures/with_vcs_dependency/pyproject.toml
+++ b/tests/fixtures/extended_project/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "with-vcs-dependency"
+name = "extended-project"
 version = "1.2.3"
 description = "Some description."
 authors = [
@@ -7,9 +7,11 @@ authors = [
 ]
 license = "MIT"
 
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+readme = "README.rst"
+
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
@@ -18,7 +20,11 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
 
+build = "build.py"
+
 # Requirements
 [tool.poetry.dependencies]
-python = "^3.6"
-cleo = { git = "https://github.com/sdispater/cleo.git", branch = "master" }
+python = "~2.7 || ^3.4"
+
+[tool.poetry.scripts]
+foo = "foo:bar"
diff --git a/tests/fixtures/git/github.com/demo/demo/demo.egg-info/PKG-INFO b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/PKG-INFO
new file mode 100755
index 00000000000..7f543c49cb3
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/PKG-INFO
@@ -0,0 +1,12 @@
+Metadata-Version: 2.1
+Name: demo
+Version: 0.1.2
+Summary: Demo project.
+Home-page: https://github.com/demo/demo
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+License: MIT
+Description: UNKNOWN
+Platform: UNKNOWN
+Provides-Extra: bar
+Provides-Extra: foo
diff --git a/tests/fixtures/git/github.com/demo/demo/demo.egg-info/SOURCES.txt b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/SOURCES.txt
new file mode 100755
index 00000000000..6eb8a3ef3e3
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/SOURCES.txt
@@ -0,0 +1,7 @@
+setup.py
+demo/__init__.py
+demo.egg-info/PKG-INFO
+demo.egg-info/SOURCES.txt
+demo.egg-info/dependency_links.txt
+demo.egg-info/requires.txt
+demo.egg-info/top_level.txt
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/Bar.py b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/dependency_links.txt
old mode 100644
new mode 100755
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/Bar.py
rename to tests/fixtures/git/github.com/demo/demo/demo.egg-info/dependency_links.txt
diff --git a/tests/fixtures/git/github.com/demo/demo/demo.egg-info/requires.txt b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/requires.txt
new file mode 100755
index 00000000000..e05a65d3c93
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/requires.txt
@@ -0,0 +1,7 @@
+pendulum>=1.4.4
+
+[bar]
+tomlkit
+
+[foo]
+cleo
diff --git a/tests/fixtures/git/github.com/demo/demo/demo.egg-info/top_level.txt b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/top_level.txt
new file mode 100755
index 00000000000..1549b67ca59
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/demo/demo.egg-info/top_level.txt
@@ -0,0 +1 @@
+demo
diff --git a/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/__init__.py b/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/__init__.py
new file mode 100644
index 00000000000..5284146ebf2
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/__init__.py
@@ -0,0 +1 @@
+__import__("pkg_resources").declare_namespace(__name__)
diff --git a/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/one/__init__.py b/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/one/__init__.py
new file mode 100644
index 00000000000..1ac9243c76f
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/namespace-package-one/namespace_package/one/__init__.py
@@ -0,0 +1 @@
+name = "one"
diff --git a/tests/fixtures/git/github.com/demo/namespace-package-one/setup.py b/tests/fixtures/git/github.com/demo/namespace-package-one/setup.py
new file mode 100644
index 00000000000..871fae6cf69
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/namespace-package-one/setup.py
@@ -0,0 +1,15 @@
+from setuptools import setup, find_packages
+
+
+setup(
+    name="namespace_package_one",
+    version="1.0.0",
+    description="",
+    long_description="",
+    author="Python Poetry",
+    author_email="noreply@python-poetry.org",
+    license="MIT",
+    packages=find_packages(),
+    namespace_packages=["namespace_package"],
+    zip_safe=False,
+)
diff --git a/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/PKG-INFO b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/PKG-INFO
new file mode 100644
index 00000000000..7ba97897a10
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: demo
+Version: 0.1.2
+Summary: Demo project.
+Home-page: https://github.com/demo/demo
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+License: MIT
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/SOURCES.txt b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..e19f4a4eb57
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/SOURCES.txt
@@ -0,0 +1,6 @@
+setup.py
+demo/__init__.py
+demo.egg-info/PKG-INFO
+demo.egg-info/SOURCES.txt
+demo.egg-info/dependency_links.txt
+demo.egg-info/top_level.txt
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/IncludedBar.py b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/dependency_links.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/IncludedBar.py
rename to tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/dependency_links.txt
diff --git a/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/top_level.txt b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/top_level.txt
new file mode 100644
index 00000000000..1549b67ca59
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/no-dependencies/demo.egg-info/top_level.txt
@@ -0,0 +1 @@
+demo
diff --git a/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/PKG-INFO b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/PKG-INFO
new file mode 100644
index 00000000000..996589ec257
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/PKG-INFO
@@ -0,0 +1,12 @@
+Metadata-Version: 2.1
+Name: Demo
+Version: 0.1.2
+Summary: Demo project.
+Home-page: https://github.com/demo/demo
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+License: MIT
+Description: UNKNOWN
+Platform: UNKNOWN
+Provides-Extra: foo
+Provides-Extra: bar
diff --git a/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/SOURCES.txt b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..8134b008da5
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/SOURCES.txt
@@ -0,0 +1,7 @@
+setup.py
+Demo.egg-info/PKG-INFO
+Demo.egg-info/SOURCES.txt
+Demo.egg-info/dependency_links.txt
+Demo.egg-info/requires.txt
+Demo.egg-info/top_level.txt
+demo/__init__.py
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/SecondBar.py b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/dependency_links.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/SecondBar.py
rename to tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/dependency_links.txt
diff --git a/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/requires.txt b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/requires.txt
new file mode 100644
index 00000000000..e05a65d3c93
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/requires.txt
@@ -0,0 +1,7 @@
+pendulum>=1.4.4
+
+[bar]
+tomlkit
+
+[foo]
+cleo
diff --git a/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/top_level.txt b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/top_level.txt
new file mode 100644
index 00000000000..1549b67ca59
--- /dev/null
+++ b/tests/fixtures/git/github.com/demo/non-canonical-name/Demo.egg-info/top_level.txt
@@ -0,0 +1 @@
+demo
diff --git a/tests/masonry/builders/fixtures/complete/my_package/sub_pkg1/__init__.py b/tests/fixtures/git/github.com/demo/prerelease/prerelease/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/complete/my_package/sub_pkg1/__init__.py
rename to tests/fixtures/git/github.com/demo/prerelease/prerelease/__init__.py
diff --git a/tests/masonry/builders/fixtures/module1/pyproject.toml b/tests/fixtures/git/github.com/demo/prerelease/pyproject.toml
similarity index 57%
rename from tests/masonry/builders/fixtures/module1/pyproject.toml
rename to tests/fixtures/git/github.com/demo/prerelease/pyproject.toml
index 834fac92de1..b06aef85184 100644
--- a/tests/masonry/builders/fixtures/module1/pyproject.toml
+++ b/tests/fixtures/git/github.com/demo/prerelease/pyproject.toml
@@ -1,16 +1,14 @@
 [tool.poetry]
-name = "module1"
-version = "0.1"
+name = "prerelease"
+version = "1.0.0.dev0"
 description = "Some description."
 authors = [
     "Sébastien Eustace "
 ]
 license = "MIT"
 
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-
+# Requirements
 [tool.poetry.dependencies]
-python = "*"
+python = "~2.7 || ^3.4"
+
+[tool.poetry.dev-dependencies]
diff --git a/tests/fixtures/invalid_pyproject/pyproject.toml b/tests/fixtures/invalid_pyproject/pyproject.toml
index d5dc17d38f5..06a8e27dae8 100644
--- a/tests/fixtures/invalid_pyproject/pyproject.toml
+++ b/tests/fixtures/invalid_pyproject/pyproject.toml
@@ -8,3 +8,4 @@ license = "INVALID"
 
 [tool.poetry.dependencies]
 python = "*"
+pendulum = {"version" = "^2.0.5", allows-prereleases = true}
diff --git a/tests/fixtures/project_with_git_dev_dependency/pyproject.toml b/tests/fixtures/project_with_git_dev_dependency/pyproject.toml
index 5217ed0e1e3..57009d822fd 100644
--- a/tests/fixtures/project_with_git_dev_dependency/pyproject.toml
+++ b/tests/fixtures/project_with_git_dev_dependency/pyproject.toml
@@ -7,9 +7,9 @@ authors = [
 ]
 license = "MIT"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/project_with_local_dependencies/pyproject.toml b/tests/fixtures/project_with_local_dependencies/pyproject.toml
index ac4c86e1358..04f146ed509 100644
--- a/tests/fixtures/project_with_local_dependencies/pyproject.toml
+++ b/tests/fixtures/project_with_local_dependencies/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/project_with_setup/my_package.egg-info/PKG-INFO b/tests/fixtures/project_with_setup/my_package.egg-info/PKG-INFO
new file mode 100644
index 00000000000..71ba645751f
--- /dev/null
+++ b/tests/fixtures/project_with_setup/my_package.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: my-package
+Version: 0.1.2
+Summary: Demo project.
+Home-page: https://github.com/demo/demo
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+License: MIT
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/tests/fixtures/project_with_setup/my_package.egg-info/SOURCES.txt b/tests/fixtures/project_with_setup/my_package.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..f5255dc9dad
--- /dev/null
+++ b/tests/fixtures/project_with_setup/my_package.egg-info/SOURCES.txt
@@ -0,0 +1,7 @@
+setup.py
+my_package/__init__.py
+my_package.egg-info/PKG-INFO
+my_package.egg-info/SOURCES.txt
+my_package.egg-info/dependency_links.txt
+my_package.egg-info/requires.txt
+my_package.egg-info/top_level.txt
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/lowercasebar.py b/tests/fixtures/project_with_setup/my_package.egg-info/dependency_links.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/Foo/lowercasebar.py
rename to tests/fixtures/project_with_setup/my_package.egg-info/dependency_links.txt
diff --git a/tests/fixtures/project_with_setup/my_package.egg-info/requires.txt b/tests/fixtures/project_with_setup/my_package.egg-info/requires.txt
new file mode 100644
index 00000000000..eeb0a4815ce
--- /dev/null
+++ b/tests/fixtures/project_with_setup/my_package.egg-info/requires.txt
@@ -0,0 +1,2 @@
+pendulum>=1.4.4
+cachy[msgpack]>=0.2.0
diff --git a/tests/fixtures/project_with_setup/my_package.egg-info/top_level.txt b/tests/fixtures/project_with_setup/my_package.egg-info/top_level.txt
new file mode 100644
index 00000000000..5d04b540bc9
--- /dev/null
+++ b/tests/fixtures/project_with_setup/my_package.egg-info/top_level.txt
@@ -0,0 +1 @@
+my_package
diff --git a/tests/fixtures/sample_project/pyproject.toml b/tests/fixtures/sample_project/pyproject.toml
index 526a6b91f0d..aff10e12c04 100644
--- a/tests/fixtures/sample_project/pyproject.toml
+++ b/tests/fixtures/sample_project/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/simple_project/pyproject.toml b/tests/fixtures/simple_project/pyproject.toml
index e799fcb7004..0b41162c6f4 100644
--- a/tests/fixtures/simple_project/pyproject.toml
+++ b/tests/fixtures/simple_project/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
@@ -23,3 +23,7 @@ classifiers = [
 # Requirements
 [tool.poetry.dependencies]
 python = "~2.7 || ^3.4"
+
+[tool.poetry.scripts]
+foo = "foo:bar"
+baz = "bar:baz.boom.bim"
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/LICENSE b/tests/fixtures/with-include/LICENSE
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/LICENSE
rename to tests/fixtures/with-include/LICENSE
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/README.rst b/tests/fixtures/with-include/README.rst
similarity index 100%
rename from tests/masonry/builders/fixtures/default_with_excluded_data/README.rst
rename to tests/fixtures/with-include/README.rst
diff --git a/tests/masonry/builders/fixtures/with-include/extra_dir/README.md b/tests/fixtures/with-include/extra_dir/README.md
similarity index 100%
rename from tests/masonry/builders/fixtures/with-include/extra_dir/README.md
rename to tests/fixtures/with-include/extra_dir/README.md
diff --git a/tests/masonry/builders/fixtures/complete/my_package/sub_pkg2/__init__.py b/tests/fixtures/with-include/extra_dir/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/complete/my_package/sub_pkg2/__init__.py
rename to tests/fixtures/with-include/extra_dir/__init__.py
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/__init__.py b/tests/fixtures/with-include/extra_dir/sub_pkg/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/default_with_excluded_data/my_package/__init__.py
rename to tests/fixtures/with-include/extra_dir/sub_pkg/__init__.py
diff --git a/tests/masonry/builders/fixtures/with-include/extra_dir/sub_pkg/vcs_excluded.txt b/tests/fixtures/with-include/extra_dir/sub_pkg/vcs_excluded.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/with-include/extra_dir/sub_pkg/vcs_excluded.txt
rename to tests/fixtures/with-include/extra_dir/sub_pkg/vcs_excluded.txt
diff --git a/tests/masonry/builders/fixtures/with-include/extra_dir/vcs_excluded.txt b/tests/fixtures/with-include/extra_dir/vcs_excluded.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/with-include/extra_dir/vcs_excluded.txt
rename to tests/fixtures/with-include/extra_dir/vcs_excluded.txt
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/__init__.py b/tests/fixtures/with-include/for_wheel_only/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/__init__.py
rename to tests/fixtures/with-include/for_wheel_only/__init__.py
diff --git a/tests/masonry/builders/fixtures/with-include/my_module.py b/tests/fixtures/with-include/my_module.py
similarity index 100%
rename from tests/masonry/builders/fixtures/with-include/my_module.py
rename to tests/fixtures/with-include/my_module.py
diff --git a/tests/masonry/builders/fixtures/with-include/notes.txt b/tests/fixtures/with-include/notes.txt
similarity index 100%
rename from tests/masonry/builders/fixtures/with-include/notes.txt
rename to tests/fixtures/with-include/notes.txt
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/__init__.py b/tests/fixtures/with-include/package_with_include/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/__init__.py
rename to tests/fixtures/with-include/package_with_include/__init__.py
diff --git a/tests/masonry/builders/fixtures/with-include/pyproject.toml b/tests/fixtures/with-include/pyproject.toml
similarity index 88%
rename from tests/masonry/builders/fixtures/with-include/pyproject.toml
rename to tests/fixtures/with-include/pyproject.toml
index 4a03b3c5c92..07f5f4cf24c 100644
--- a/tests/masonry/builders/fixtures/with-include/pyproject.toml
+++ b/tests/fixtures/with-include/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/__init__.py b/tests/fixtures/with-include/src/src_package/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/__init__.py
rename to tests/fixtures/with-include/src/src_package/__init__.py
diff --git a/tests/masonry/builders/fixtures/extended/extended/__init__.py b/tests/fixtures/with-include/tests/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/extended/extended/__init__.py
rename to tests/fixtures/with-include/tests/__init__.py
diff --git a/tests/fixtures/with_default_source/pyproject.toml b/tests/fixtures/with_default_source/pyproject.toml
index a73d5d235eb..0d639ec25d7 100644
--- a/tests/fixtures/with_default_source/pyproject.toml
+++ b/tests/fixtures/with_default_source/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/with_local_config/poetry.toml b/tests/fixtures/with_local_config/poetry.toml
index 084377a033b..bcf738c9f08 100644
--- a/tests/fixtures/with_local_config/poetry.toml
+++ b/tests/fixtures/with_local_config/poetry.toml
@@ -1,2 +1,3 @@
 [virtualenvs]
+in-project = false
 create = false
diff --git a/tests/fixtures/with_local_config/pyproject.toml b/tests/fixtures/with_local_config/pyproject.toml
index ac7730ddf56..b9c7bbd3862 100644
--- a/tests/fixtures/with_local_config/pyproject.toml
+++ b/tests/fixtures/with_local_config/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/fixtures/with_two_default_sources/pyproject.toml b/tests/fixtures/with_two_default_sources/pyproject.toml
index 01968646186..0d0a8a5446b 100644
--- a/tests/fixtures/with_two_default_sources/pyproject.toml
+++ b/tests/fixtures/with_two_default_sources/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.rst"
 
-homepage = "https://poetry.eustace.io"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/helpers.py b/tests/helpers.py
index 83e4260ff6b..0dd7ce312e5 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -1,7 +1,13 @@
-from poetry.packages import Dependency
-from poetry.packages import Package
+import os
+import shutil
 
+from poetry.core.packages import Dependency
+from poetry.core.packages import Package
+from poetry.core.vcs.git import ParsedUrl
+from poetry.utils._compat import PY2
+from poetry.utils._compat import WINDOWS
 from poetry.utils._compat import Path
+from poetry.utils._compat import urlparse
 
 
 FIXTURE_PATH = Path(__file__).parent / "fixtures"
@@ -28,3 +34,57 @@ def fixture(path=None):
         return FIXTURE_PATH / path
     else:
         return FIXTURE_PATH
+
+
+def copy_or_symlink(source, dest):
+    if dest.exists():
+        if dest.is_symlink():
+            os.unlink(str(dest))
+        elif dest.is_dir():
+            shutil.rmtree(str(dest))
+        else:
+            os.unlink(str(dest))
+
+    # Python2 does not support os.symlink on Windows whereas Python3 does.
+    # os.symlink requires either administrative privileges or developer mode on Win10,
+    # throwing an OSError if neither is active.
+    if WINDOWS:
+        if PY2:
+            if source.is_dir():
+                shutil.copytree(str(source), str(dest))
+            else:
+                shutil.copyfile(str(source), str(dest))
+        else:
+            try:
+                os.symlink(str(source), str(dest), target_is_directory=source.is_dir())
+            except OSError:
+                if source.is_dir():
+                    shutil.copytree(str(source), str(dest))
+                else:
+                    shutil.copyfile(str(source), str(dest))
+    else:
+        os.symlink(str(source), str(dest))
+
+
+def mock_clone(_, source, dest):
+    # Checking source to determine which folder we need to copy
+    parsed = ParsedUrl.parse(source)
+
+    folder = (
+        Path(__file__).parent
+        / "fixtures"
+        / "git"
+        / parsed.resource
+        / parsed.pathname.lstrip("/").rstrip(".git")
+    )
+
+    copy_or_symlink(folder, dest)
+
+
+def mock_download(url, dest, **__):
+    parts = urlparse.urlparse(url)
+
+    fixtures = Path(__file__).parent / "fixtures"
+    fixture = fixtures / parts.path.lstrip("/")
+
+    copy_or_symlink(fixture, Path(dest))
diff --git a/tests/installation/fixtures/extras-with-dependencies.test b/tests/installation/fixtures/extras-with-dependencies.test
index 3289a9e7fbc..9520c5665ba 100644
--- a/tests/installation/fixtures/extras-with-dependencies.test
+++ b/tests/installation/fixtures/extras-with-dependencies.test
@@ -40,7 +40,7 @@ foo = ["C"]
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/extras.test b/tests/installation/fixtures/extras.test
index 370fd35a1e6..9ebdd8588fa 100644
--- a/tests/installation/fixtures/extras.test
+++ b/tests/installation/fixtures/extras.test
@@ -37,7 +37,7 @@ foo = ["D"]
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/install-no-dev.test b/tests/installation/fixtures/install-no-dev.test
index 85c74f1c79f..589c20c50f0 100644
--- a/tests/installation/fixtures/install-no-dev.test
+++ b/tests/installation/fixtures/install-no-dev.test
@@ -26,7 +26,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
 "C" = []
diff --git a/tests/installation/fixtures/no-dependencies.test b/tests/installation/fixtures/no-dependencies.test
index 2a0b0975b77..af6ab887d40 100644
--- a/tests/installation/fixtures/no-dependencies.test
+++ b/tests/installation/fixtures/no-dependencies.test
@@ -4,4 +4,4 @@ package = []
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
diff --git a/tests/installation/fixtures/old-lock.test b/tests/installation/fixtures/old-lock.test
new file mode 100644
index 00000000000..e1898fbd3f1
--- /dev/null
+++ b/tests/installation/fixtures/old-lock.test
@@ -0,0 +1,120 @@
+[[package]]
+name = "attrs"
+version = "17.4.0"
+description = "Classes Without Boilerplate"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.extras]
+dev = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface", "sphinx", "zope.interface"]
+docs = ["sphinx", "zope.interface"]
+tests = ["coverage", "hypothesis", "pympler", "pytest", "six", "zope.interface"]
+
+[[package]]
+name = "colorama"
+version = "0.3.9"
+description = "Cross-platform colored terminal text."
+category = "dev"
+marker = "sys_platform == \"win32\""
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "funcsigs"
+version = "1.0.2"
+description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
+category = "dev"
+marker = "python_version < \"3.0\""
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "more-itertools"
+version = "4.1.0"
+description = "More routines for operating on iterables, beyond itertools"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+six = ">=1.0.0,<2.0.0"
+
+[[package]]
+name = "pluggy"
+version = "0.6.0"
+description = "plugin and hook calling mechanisms for python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "py"
+version = "1.5.3"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "pytest"
+version = "3.5.0"
+description = "pytest: simple powerful testing with Python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.dependencies]
+py = ">=1.5.0"
+six = ">=1.10.0"
+attrs = ">=17.4.0"
+more-itertools = ">=4.0.0"
+pluggy = ">=0.5,<0.7"
+funcsigs = {"version" = "*", "python" = "<3.0"}
+colorama = "*"
+
+[[package]]
+name = "six"
+version = "1.11.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[metadata]
+python-versions = "*"
+content-hash = "123456789"
+
+[metadata.files]
+attrs = [
+    {file = "attrs-17.4.0-py2.py3-none-any.whl", hash = "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"},
+    {file = "attrs-17.4.0.tar.gz", hash = "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"},
+]
+colorama = [
+    {file = "colorama-0.3.9-py2.py3-none-any.whl", hash = "sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda"},
+    {file = "colorama-0.3.9.tar.gz", hash = "sha256:48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"},
+]
+funcsigs = [
+    {file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"},
+    {file = "funcsigs-1.0.2.tar.gz", hash = "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"},
+]
+more-itertools = [
+    {file = "more-itertools-4.1.0.tar.gz", hash = "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44"},
+    {file = "more_itertools-4.1.0-py2-none-any.whl", hash = "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e"},
+    {file = "more_itertools-4.1.0-py3-none-any.whl", hash = "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea"},
+]
+pluggy = [
+    {file = "pluggy-0.6.0.tar.gz", hash = "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"},
+]
+py = [
+    {file = "py-1.5.3-py2.py3-none-any.whl", hash = "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a"},
+    {file = "py-1.5.3.tar.gz", hash = "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"},
+]
+pytest = [
+    {file = "pytest-3.5.0-py2.py3-none-any.whl", hash = "sha256:6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c"},
+    {file = "pytest-3.5.0.tar.gz", hash = "sha256:fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"},
+]
+six = [
+    {file = "six-1.11.0-py2.py3-none-any.whl", hash = "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"},
+    {file = "six-1.11.0.tar.gz", hash = "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"},
+]
diff --git a/tests/installation/fixtures/remove.test b/tests/installation/fixtures/remove.test
index dcbaaf70c83..ef989e03a56 100644
--- a/tests/installation/fixtures/remove.test
+++ b/tests/installation/fixtures/remove.test
@@ -10,5 +10,5 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
diff --git a/tests/installation/fixtures/update-with-lock.test b/tests/installation/fixtures/update-with-lock.test
index 86b428db85e..f092b94f68d 100644
--- a/tests/installation/fixtures/update-with-lock.test
+++ b/tests/installation/fixtures/update-with-lock.test
@@ -10,5 +10,5 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
diff --git a/tests/installation/fixtures/update-with-locked-extras.test b/tests/installation/fixtures/update-with-locked-extras.test
index 3600479908c..d34686a5a22 100644
--- a/tests/installation/fixtures/update-with-locked-extras.test
+++ b/tests/installation/fixtures/update-with-locked-extras.test
@@ -8,7 +8,7 @@ python-versions = "*"
 
 [package.dependencies]
 "B" = {version = "^1.0", optional = true}
-"C" = {"version" = "^1.0", "python" = ">=2.7,<2.8"}
+"C" = {version = "^1.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""}
 
 [package.extras]
 foo = ["b"]
@@ -26,7 +26,6 @@ name = "C"
 version = "1.1"
 description = ""
 category = "main"
-marker = "python_version >= \"2.7\" and python_version < \"2.8\""
 optional = false
 python-versions = "*"
 
@@ -42,7 +41,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
 "C" = []
diff --git a/tests/installation/fixtures/with-category-change.test b/tests/installation/fixtures/with-category-change.test
index 7aef495be11..198c0d17186 100644
--- a/tests/installation/fixtures/with-category-change.test
+++ b/tests/installation/fixtures/with-category-change.test
@@ -21,6 +21,6 @@ A = "^1.0"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
diff --git a/tests/installation/fixtures/with-conditional-dependency.test b/tests/installation/fixtures/with-conditional-dependency.test
index 95310a611fc..5cf53a08497 100644
--- a/tests/installation/fixtures/with-conditional-dependency.test
+++ b/tests/installation/fixtures/with-conditional-dependency.test
@@ -24,5 +24,5 @@ python = ">=3.6,<4.0"
 python-versions = "~2.7 || ^3.4"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
diff --git a/tests/installation/fixtures/with-dependencies-extras.test b/tests/installation/fixtures/with-dependencies-extras.test
index da6e0ee0a4a..22bb5921115 100644
--- a/tests/installation/fixtures/with-dependencies-extras.test
+++ b/tests/installation/fixtures/with-dependencies-extras.test
@@ -32,7 +32,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
 "C" = []
diff --git a/tests/installation/fixtures/with-dependencies.test b/tests/installation/fixtures/with-dependencies.test
index 06cd3f43637..9b07daae56b 100644
--- a/tests/installation/fixtures/with-dependencies.test
+++ b/tests/installation/fixtures/with-dependencies.test
@@ -18,6 +18,6 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
diff --git a/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test b/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test
index 79f81a084b5..1d747a6a1aa 100644
--- a/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test
+++ b/tests/installation/fixtures/with-directory-dependency-poetry-transitive.test
@@ -1,6 +1,49 @@
 [[package]]
 category = "main"
 description = ""
+name = "demo"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "0.1.0"
+
+[package.dependencies]
+pendulum = ">=1.4.4"
+
+[package.extras]
+bar = ["tomlkit"]
+foo = ["cleo"]
+
+[package.source]
+reference = ""
+type = "file"
+url = "../../distributions/demo-0.1.0-py2.py3-none-any.whl"
+
+[[package]]
+category = "main"
+description = "This is a description"
+develop = true
+name = "inner-directory-project"
+optional = false
+python-versions = "*"
+version = "1.2.4"
+
+[package.source]
+reference = ""
+type = "directory"
+url = "../project_with_transitive_file_dependencies/inner-directory-project"
+
+[[package]]
+category = "main"
+description = ""
+name = "pendulum"
+optional = false
+python-versions = "*"
+version = "1.4.4"
+
+[[package]]
+category = "main"
+description = "This is a description"
+develop = true
 name = "project-with-extras"
 optional = false
 python-versions = "*"
@@ -13,28 +56,54 @@ extras_b = ["cachy (>=0.2.0)"]
 [package.source]
 reference = ""
 type = "directory"
-url = "tests/fixtures/directory/project_with_transitive_directory_dependencies/../../project_with_extras"
+url = "../project_with_extras"
 
 [[package]]
 category = "main"
-description = ""
+description = "This is a description"
+develop = true
 name = "project-with-transitive-directory-dependencies"
 optional = false
 python-versions = "*"
 version = "1.2.3"
 
 [package.dependencies]
-project-with-extras = "*"
+project-with-extras = "1.2.3"
+project-with-transitive-file-dependencies = "1.2.3"
+
+[package.source]
+reference = ""
+type = "directory"
+url = "project_with_transitive_directory_dependencies"
+
+[[package]]
+category = "main"
+description = "This is a description"
+develop = true
+name = "project-with-transitive-file-dependencies"
+optional = false
+python-versions = "*"
+version = "1.2.3"
+
+[package.dependencies]
+demo = "0.1.0"
+inner-directory-project = "1.2.4"
 
 [package.source]
 reference = ""
 type = "directory"
-url = "tests/fixtures/directory/project_with_transitive_directory_dependencies"
+url = "project_with_transitive_file_dependencies"
 
 [metadata]
 content-hash = "123456789"
 python-versions = "*"
 
-[metadata.hashes]
+[metadata.files]
+demo = [
+    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
+]
+inner-directory-project = []
+pendulum = []
 project-with-extras = []
 project-with-transitive-directory-dependencies = []
+project-with-transitive-file-dependencies = []
diff --git a/tests/installation/fixtures/with-directory-dependency-poetry.test b/tests/installation/fixtures/with-directory-dependency-poetry.test
index 8ee68c8cc97..59972e48be9 100644
--- a/tests/installation/fixtures/with-directory-dependency-poetry.test
+++ b/tests/installation/fixtures/with-directory-dependency-poetry.test
@@ -8,14 +8,15 @@ version = "1.4.4"
 
 [[package]]
 category = "main"
-description = ""
+description = "This is a description"
+develop = true
 name = "project-with-extras"
 optional = false
 python-versions = "*"
 version = "1.2.3"
 
 [package.dependencies]
-pendulum = {version = ">=1.4.4", optional = true}
+pendulum = {version = ">=1.4.4", optional = true, markers = "extra == \"extras_a\""}
 
 [package.extras]
 extras_a = ["pendulum (>=1.4.4)"]
@@ -30,6 +31,6 @@ url = "tests/fixtures/project_with_extras"
 content-hash = "123456789"
 python-versions = "*"
 
-[metadata.hashes]
+[metadata.files]
 project-with-extras = []
 pendulum = []
diff --git a/tests/installation/fixtures/with-directory-dependency-setuptools.test b/tests/installation/fixtures/with-directory-dependency-setuptools.test
index d06295ad425..b9a97381503 100644
--- a/tests/installation/fixtures/with-directory-dependency-setuptools.test
+++ b/tests/installation/fixtures/with-directory-dependency-setuptools.test
@@ -9,6 +9,7 @@ python-versions = "*"
 [[package]]
 name = "my-package"
 version = "0.1.2"
+develop = true
 description = "Demo project."
 category = "main"
 optional = false
@@ -35,7 +36,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 cachy = []
 my-package = []
 pendulum = []
diff --git a/tests/installation/fixtures/with-duplicate-dependencies-update.test b/tests/installation/fixtures/with-duplicate-dependencies-update.test
index 4ad09e3d317..93f9afcd7e0 100644
--- a/tests/installation/fixtures/with-duplicate-dependencies-update.test
+++ b/tests/installation/fixtures/with-duplicate-dependencies-update.test
@@ -32,7 +32,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-duplicate-dependencies.test b/tests/installation/fixtures/with-duplicate-dependencies.test
index 6d82f608ed1..32748b13e48 100644
--- a/tests/installation/fixtures/with-duplicate-dependencies.test
+++ b/tests/installation/fixtures/with-duplicate-dependencies.test
@@ -8,8 +8,8 @@ python-versions = "*"
 
 [package.dependencies]
 B = [
-    {"version" = "^1.0", "python" = "<4.0"},
-    {"version" = "^2.0", "python" = ">=4.0"},
+    {version = "^1.0", markers = "python_version < \"4.0\""},
+    {version = "^2.0", markers = "python_version >= \"4.0\""},
 ]
 
 [[package]]
@@ -17,7 +17,6 @@ name = "B"
 version = "1.0"
 description = ""
 category = "main"
-marker = "python_version < \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -29,7 +28,6 @@ name = "B"
 version = "2.0"
 description = ""
 category = "main"
-marker = "python_version >= \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -41,7 +39,6 @@ name = "C"
 version = "1.2"
 description = ""
 category = "main"
-marker = "python_version < \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -50,7 +47,6 @@ name = "C"
 version = "1.5"
 description = ""
 category = "main"
-marker = "python_version >= \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -58,7 +54,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-file-dependency-transitive.test b/tests/installation/fixtures/with-file-dependency-transitive.test
index bbb4d47f9a4..a78dc8eca5b 100644
--- a/tests/installation/fixtures/with-file-dependency-transitive.test
+++ b/tests/installation/fixtures/with-file-dependency-transitive.test
@@ -16,7 +16,21 @@ foo = ["cleo"]
 [package.source]
 reference = ""
 type = "file"
-url = "tests/fixtures/directory/project_with_transitive_file_dependencies/../../distributions/demo-0.1.0-py2.py3-none-any.whl"
+url = "../distributions/demo-0.1.0-py2.py3-none-any.whl"
+
+[[package]]
+category = "main"
+description = "This is a description"
+develop = true
+name = "inner-directory-project"
+optional = false
+python-versions = "*"
+version = "1.2.4"
+
+[package.source]
+reference = ""
+type = "directory"
+url = "project_with_transitive_file_dependencies/inner-directory-project"
 
 [[package]]
 category = "main"
@@ -28,25 +42,30 @@ version = "1.4.4"
 
 [[package]]
 category = "main"
-description = ""
+description = "This is a description"
+develop = true
 name = "project-with-transitive-file-dependencies"
 optional = false
 python-versions = "*"
 version = "1.2.3"
 
 [package.dependencies]
-demo = "*"
+demo = "0.1.0"
+inner-directory-project = "1.2.4"
 
 [package.source]
 reference = ""
 type = "directory"
-url = "tests/fixtures/directory/project_with_transitive_file_dependencies"
+url = "project_with_transitive_file_dependencies"
 
 [metadata]
 content-hash = "123456789"
 python-versions = "*"
 
-[metadata.hashes]
-demo = ["70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"]
+[metadata.files]
+demo = [
+    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
+]
+inner-directory-project = []
 pendulum = []
 project-with-transitive-file-dependencies = []
diff --git a/tests/installation/fixtures/with-file-dependency.test b/tests/installation/fixtures/with-file-dependency.test
index bf1d2643018..da10f203e46 100644
--- a/tests/installation/fixtures/with-file-dependency.test
+++ b/tests/installation/fixtures/with-file-dependency.test
@@ -30,6 +30,8 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
-demo = ["70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"]
+[metadata.files]
+demo = [
+    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:70e704135718fffbcbf61ed1fc45933cfd86951a744b681000eaaa75da31f17a"},
+]
 pendulum = []
diff --git a/tests/installation/fixtures/with-multiple-updates.test b/tests/installation/fixtures/with-multiple-updates.test
index 008e5d32933..678e2ae8b2c 100644
--- a/tests/installation/fixtures/with-multiple-updates.test
+++ b/tests/installation/fixtures/with-multiple-updates.test
@@ -1,6 +1,6 @@
 [[package]]
 name = "A"
-version = "1.0"
+version = "1.1"
 description = ""
 category = "main"
 optional = false
@@ -9,25 +9,17 @@ python-versions = "*"
 [package.dependencies]
 B = ">=1.0.1"
 C = [
-    {version = "^1.0", python = ">=2.7,<2.8"},
-    {version = "^2.0", python = ">=3.4,<4.0"},
+    {version = "^1.0", markers = "python_version >= \"2.7\" and python_version < \"2.8\""},
+    {version = "^2.0", markers = "python_version >= \"3.4\" and python_version < \"4.0\""},
 ]
 
-[[package]]
-name = "B"
-version = "1.0.1"
-description = ""
-category = "main"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
-
 [[package]]
 name = "B"
 version = "1.1.0"
 description = ""
 category = "main"
 optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
+python-versions = "*"
 
 [[package]]
 name = "C"
@@ -35,7 +27,6 @@ version = "1.0"
 description = ""
 category = "main"
 optional = false
-marker = "python_version >= \"2.7\" and python_version < \"2.8\""
 python-versions = "*"
 
 [[package]]
@@ -44,14 +35,13 @@ version = "2.0"
 description = ""
 category = "main"
 optional = false
-marker = "python_version >= \"3.4\" and python_version < \"4.0\""
 python-versions = "*"
 
 [metadata]
 python-versions = "~2.7 || ^3.4"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-optional-dependencies.test b/tests/installation/fixtures/with-optional-dependencies.test
index 29bc66482b9..48d6b095861 100644
--- a/tests/installation/fixtures/with-optional-dependencies.test
+++ b/tests/installation/fixtures/with-optional-dependencies.test
@@ -11,7 +11,6 @@ name = "C"
 version = "1.3"
 description = ""
 category = "main"
-marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -23,7 +22,6 @@ name = "D"
 version = "1.4"
 description = ""
 category = "main"
-marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"4.0\""
 optional = false
 python-versions = "*"
 
@@ -34,7 +32,7 @@ foo = ["A"]
 python-versions = "~2.7 || ^3.4"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 C = []
 D = []
diff --git a/tests/installation/fixtures/with-platform-dependencies.test b/tests/installation/fixtures/with-platform-dependencies.test
index 861647a5c88..bc91c988bd6 100644
--- a/tests/installation/fixtures/with-platform-dependencies.test
+++ b/tests/installation/fixtures/with-platform-dependencies.test
@@ -11,7 +11,6 @@ name = "B"
 version = "1.1"
 description = ""
 category = "main"
-marker = "sys_platform == \"custom\""
 optional = false
 python-versions = "*"
 
@@ -20,7 +19,6 @@ name = "C"
 version = "1.3"
 description = ""
 category = "main"
-marker = "sys_platform == \"darwin\""
 optional = false
 python-versions = "*"
 
@@ -32,7 +30,6 @@ name = "D"
 version = "1.4"
 description = ""
 category = "main"
-marker = "sys_platform == \"darwin\""
 optional = false
 python-versions = "*"
 
@@ -43,7 +40,7 @@ foo = ["A"]
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-prereleases.test b/tests/installation/fixtures/with-prereleases.test
index 8f9c1f76a37..855dbd7f616 100644
--- a/tests/installation/fixtures/with-prereleases.test
+++ b/tests/installation/fixtures/with-prereleases.test
@@ -18,6 +18,6 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 "A" = []
 "B" = []
diff --git a/tests/installation/fixtures/with-pypi-repository.test b/tests/installation/fixtures/with-pypi-repository.test
index 736195aaabf..00b63c43c3a 100644
--- a/tests/installation/fixtures/with-pypi-repository.test
+++ b/tests/installation/fixtures/with-pypi-repository.test
@@ -16,7 +16,6 @@ name = "colorama"
 version = "0.3.9"
 description = "Cross-platform colored terminal text."
 category = "dev"
-marker = "sys_platform == \"win32\""
 optional = false
 python-versions = "*"
 
@@ -25,7 +24,6 @@ name = "funcsigs"
 version = "1.0.2"
 description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
 category = "dev"
-marker = "python_version < \"3.0\""
 optional = false
 python-versions = "*"
 
@@ -67,12 +65,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 [package.dependencies]
 py = ">=1.5.0"
 six = ">=1.10.0"
-setuptools = "*"
 attrs = ">=17.4.0"
 more-itertools = ">=4.0.0"
 pluggy = ">=0.5,<0.7"
-funcsigs = {"version" = "*", "python" = "<3.0"}
-colorama = "*"
+funcsigs = {"version" = "*", "markers" = "python_version < \"3.0\""}
+colorama = {"version" = "*", "markers" = "sys_platform == \"win32\""}
 
 [[package]]
 name = "six"
@@ -86,12 +83,36 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
-attrs = ["1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9", "a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"]
-colorama = ["463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda", "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"]
-funcsigs = ["330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca", "a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"]
-more-itertools = ["0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea", "11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e", "c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44"]
-pluggy = ["7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"]
-py = ["29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881", "983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a"]
-pytest = ["6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c", "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"]
-six = ["70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", "832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"]
+[metadata.files]
+attrs = [
+    {file = "attrs-17.4.0-py2.py3-none-any.whl", hash = "sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450"},
+    {file = "attrs-17.4.0.tar.gz", hash = "sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9"},
+]
+colorama = [
+    {file = "colorama-0.3.9-py2.py3-none-any.whl", hash = "sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda"},
+    {file = "colorama-0.3.9.tar.gz", hash = "sha256:48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1"},
+]
+funcsigs = [
+    {file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"},
+    {file = "funcsigs-1.0.2.tar.gz", hash = "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"},
+]
+more-itertools = [
+    {file = "more-itertools-4.1.0.tar.gz", hash = "sha256:c9ce7eccdcb901a2c75d326ea134e0886abfbea5f93e91cc95de9507c0816c44"},
+    {file = "more_itertools-4.1.0-py2-none-any.whl", hash = "sha256:11a625025954c20145b37ff6309cd54e39ca94f72f6bb9576d1195db6fa2442e"},
+    {file = "more_itertools-4.1.0-py3-none-any.whl", hash = "sha256:0dd8f72eeab0d2c3bd489025bb2f6a1b8342f9b198f6fc37b52d15cfa4531fea"},
+]
+pluggy = [
+    {file = "pluggy-0.6.0.tar.gz", hash = "sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"},
+]
+py = [
+    {file = "py-1.5.3-py2.py3-none-any.whl", hash = "sha256:983f77f3331356039fdd792e9220b7b8ee1aa6bd2b25f567a963ff1de5a64f6a"},
+    {file = "py-1.5.3.tar.gz", hash = "sha256:29c9fab495d7528e80ba1e343b958684f4ace687327e6f789a94bf3d1915f881"},
+]
+pytest = [
+    {file = "pytest-3.5.0-py2.py3-none-any.whl", hash = "sha256:6266f87ab64692112e5477eba395cfedda53b1933ccd29478e671e73b420c19c"},
+    {file = "pytest-3.5.0.tar.gz", hash = "sha256:fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1"},
+]
+six = [
+    {file = "six-1.11.0-py2.py3-none-any.whl", hash = "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"},
+    {file = "six-1.11.0.tar.gz", hash = "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"},
+]
diff --git a/tests/installation/fixtures/with-python-versions.test b/tests/installation/fixtures/with-python-versions.test
index aec050e5a09..49a53211d06 100644
--- a/tests/installation/fixtures/with-python-versions.test
+++ b/tests/installation/fixtures/with-python-versions.test
@@ -26,7 +26,7 @@ python-versions = "~2.7 || ^3.3"
 python-versions = "~2.7 || ^3.4"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-sub-dependencies.test b/tests/installation/fixtures/with-sub-dependencies.test
index 2b1dc490767..306bf818685 100644
--- a/tests/installation/fixtures/with-sub-dependencies.test
+++ b/tests/installation/fixtures/with-sub-dependencies.test
@@ -40,7 +40,7 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 A = []
 B = []
 C = []
diff --git a/tests/installation/fixtures/with-url-dependency.test b/tests/installation/fixtures/with-url-dependency.test
index c61ac815ad4..25c2cff6ce7 100644
--- a/tests/installation/fixtures/with-url-dependency.test
+++ b/tests/installation/fixtures/with-url-dependency.test
@@ -9,7 +9,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 [package.source]
 type = "url"
 reference = ""
-url = "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl"
+url = "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
 
 [package.dependencies]
 pendulum = ">=1.4.4"
@@ -30,6 +30,6 @@ python-versions = "*"
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
+[metadata.files]
 demo = []
 pendulum = []
diff --git a/tests/installation/fixtures/with-wheel-dependency-no-requires-dist.test b/tests/installation/fixtures/with-wheel-dependency-no-requires-dist.test
index 00c9186257f..36741ded5e8 100644
--- a/tests/installation/fixtures/with-wheel-dependency-no-requires-dist.test
+++ b/tests/installation/fixtures/with-wheel-dependency-no-requires-dist.test
@@ -15,5 +15,7 @@ url = "tests/fixtures/wheel_with_no_requires_dist/demo-0.1.0-py2.py3-none-any.wh
 python-versions = "*"
 content-hash = "123456789"
 
-[metadata.hashes]
-demo = ["c25eb81459126848a1788eb3520d1a32014eb51ce3d3bae88c56bfdde4ce02db"]
+[metadata.files]
+demo = [
+    {file = "demo-0.1.0-py2.py3-none-any.whl", hash = "sha256:c25eb81459126848a1788eb3520d1a32014eb51ce3d3bae88c56bfdde4ce02db"},
+]
diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py
index c8e9ce140c0..a3a472cfc1b 100644
--- a/tests/installation/test_installer.py
+++ b/tests/installation/test_installer.py
@@ -6,18 +6,18 @@
 
 from clikit.io import NullIO
 
+from poetry.core.packages import ProjectPackage
 from poetry.installation import Installer as BaseInstaller
 from poetry.installation.noop_installer import NoopInstaller
 from poetry.packages import Locker as BaseLocker
-from poetry.packages import ProjectPackage
 from poetry.repositories import Pool
 from poetry.repositories import Repository
 from poetry.repositories.installed_repository import InstalledRepository
-from poetry.utils._compat import Path
 from poetry.utils._compat import PY2
-from poetry.utils.toml_file import TomlFile
+from poetry.utils._compat import Path
+from poetry.utils.env import MockEnv
 from poetry.utils.env import NullEnv
-
+from poetry.utils.toml_file import TomlFile
 from tests.helpers import get_dependency
 from tests.helpers import get_package
 from tests.repositories.test_legacy_repository import (
@@ -26,6 +26,9 @@
 from tests.repositories.test_pypi_repository import MockRepository
 
 
+fixtures_dir = Path("tests/fixtures")
+
+
 class Installer(BaseInstaller):
     def _get_installer(self):
         return NoopInstaller()
@@ -293,6 +296,59 @@ def test_run_install_no_dev(installer, locker, repo, package, installed):
     assert len(removals) == 1
 
 
+def test_run_install_remove_untracked(installer, locker, repo, package, installed):
+    locker.locked(True)
+    locker.mock_lock_data(
+        {
+            "package": [
+                {
+                    "name": "a",
+                    "version": "1.0",
+                    "category": "main",
+                    "optional": False,
+                    "platform": "*",
+                    "python-versions": "*",
+                    "checksum": [],
+                }
+            ],
+            "metadata": {
+                "python-versions": "*",
+                "platform": "*",
+                "content-hash": "123456789",
+                "hashes": {"a": []},
+            },
+        }
+    )
+    package_a = get_package("a", "1.0")
+    package_b = get_package("b", "1.1")
+    package_c = get_package("c", "1.2")
+    package_pip = get_package("pip", "20.0.0")
+    repo.add_package(package_a)
+    repo.add_package(package_b)
+    repo.add_package(package_c)
+    repo.add_package(package_pip)
+
+    installed.add_package(package_a)
+    installed.add_package(package_b)
+    installed.add_package(package_c)
+    installed.add_package(package_pip)  # Always required and never removed.
+    installed.add_package(package)  # Root package never removed.
+
+    package.add_dependency("A", "~1.0")
+
+    installer.dev_mode(True).remove_untracked(True)
+    installer.run()
+
+    installs = installer.installer.installs
+    assert len(installs) == 0
+
+    updates = installer.installer.updates
+    assert len(updates) == 0
+
+    removals = installer.installer.removals
+    assert set(r.name for r in removals) == {"b", "c"}
+
+
 def test_run_whitelist_add(installer, locker, repo, package):
     locker.locked(True)
     locker.mock_lock_data(
@@ -663,7 +719,7 @@ def test_installer_with_pypi_repository(package, locker, installed):
 
 
 def test_run_installs_with_local_file(installer, locker, repo, package):
-    file_path = Path("tests/fixtures/distributions/demo-0.1.0-py2.py3-none-any.whl")
+    file_path = fixtures_dir / "distributions/demo-0.1.0-py2.py3-none-any.whl"
     package.add_dependency("demo", {"file": str(file_path)})
 
     repo.add_package(get_package("pendulum", "1.4.4"))
@@ -678,8 +734,8 @@ def test_run_installs_with_local_file(installer, locker, repo, package):
 
 
 def test_run_installs_wheel_with_no_requires_dist(installer, locker, repo, package):
-    file_path = Path(
-        "tests/fixtures/wheel_with_no_requires_dist/demo-0.1.0-py2.py3-none-any.whl"
+    file_path = (
+        fixtures_dir / "wheel_with_no_requires_dist/demo-0.1.0-py2.py3-none-any.whl"
     )
     package.add_dependency("demo", {"file": str(file_path)})
 
@@ -695,7 +751,7 @@ def test_run_installs_wheel_with_no_requires_dist(installer, locker, repo, packa
 def test_run_installs_with_local_poetry_directory_and_extras(
     installer, locker, repo, package, tmpdir
 ):
-    file_path = Path("tests/fixtures/project_with_extras")
+    file_path = fixtures_dir / "project_with_extras"
     package.add_dependency(
         "project-with-extras", {"path": str(file_path), "extras": ["extras_a"]}
     )
@@ -714,11 +770,13 @@ def test_run_installs_with_local_poetry_directory_and_extras(
 def test_run_installs_with_local_poetry_directory_transitive(
     installer, locker, repo, package, tmpdir
 ):
-    file_path = Path(
-        "tests/fixtures/directory/project_with_transitive_directory_dependencies/"
+    package.root_dir = fixtures_dir.joinpath("directory")
+    directory = fixtures_dir.joinpath("directory").joinpath(
+        "project_with_transitive_directory_dependencies"
     )
     package.add_dependency(
-        "project-with-transitive-directory-dependencies", {"path": str(file_path)}
+        "project-with-transitive-directory-dependencies",
+        {"path": str(directory.relative_to(fixtures_dir.joinpath("directory")))},
     )
 
     repo.add_package(get_package("pendulum", "1.4.4"))
@@ -730,17 +788,19 @@ def test_run_installs_with_local_poetry_directory_transitive(
 
     assert locker.written_data == expected
 
-    assert len(installer.installer.installs) == 2
+    assert len(installer.installer.installs) == 6
 
 
 def test_run_installs_with_local_poetry_file_transitive(
     installer, locker, repo, package, tmpdir
 ):
-    file_path = Path(
-        "tests/fixtures/directory/project_with_transitive_file_dependencies/"
+    package.root_dir = fixtures_dir.joinpath("directory")
+    directory = fixtures_dir.joinpath("directory").joinpath(
+        "project_with_transitive_file_dependencies"
     )
     package.add_dependency(
-        "project-with-transitive-file-dependencies", {"path": str(file_path)}
+        "project-with-transitive-file-dependencies",
+        {"path": str(directory.relative_to(fixtures_dir.joinpath("directory")))},
     )
 
     repo.add_package(get_package("pendulum", "1.4.4"))
@@ -752,13 +812,13 @@ def test_run_installs_with_local_poetry_file_transitive(
 
     assert locker.written_data == expected
 
-    assert len(installer.installer.installs) == 3
+    assert len(installer.installer.installs) == 4
 
 
 def test_run_installs_with_local_setuptools_directory(
     installer, locker, repo, package, tmpdir
 ):
-    file_path = Path("tests/fixtures/project_with_setup/")
+    file_path = fixtures_dir / "project_with_setup/"
     package.add_dependency("my-package", {"path": str(file_path)})
 
     repo.add_package(get_package("pendulum", "1.4.4"))
@@ -1183,8 +1243,8 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
                     "checksum": [],
                     "dependencies": {
                         "B": [
-                            {"version": "^1.0", "python": "<4.0"},
-                            {"version": "^2.0", "python": ">=4.0"},
+                            {"version": "^1.0", "python": "<2.7"},
+                            {"version": "^2.0", "python": ">=2.7"},
                         ]
                     },
                 },
@@ -1197,7 +1257,7 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
                     "python-versions": "*",
                     "checksum": [],
                     "dependencies": {"C": "1.2"},
-                    "requirements": {"python": "<4.0"},
+                    "requirements": {"python": "<2.7"},
                 },
                 {
                     "name": "B",
@@ -1208,7 +1268,7 @@ def test_run_install_duplicate_dependencies_different_constraints_with_lock_upda
                     "python-versions": "*",
                     "checksum": [],
                     "dependencies": {"C": "1.5"},
-                    "requirements": {"python": ">=4.0"},
+                    "requirements": {"python": ">=2.7"},
                 },
                 {
                     "name": "C",
@@ -1461,15 +1521,15 @@ def test_update_multiple_times_with_split_dependencies_is_idempotent(
     package.python_versions = "~2.7 || ^3.4"
     package.add_dependency("A", "^1.0")
 
-    a = get_package("A", "1.0")
-    a.add_dependency("B", ">=1.0.1")
-    a.add_dependency("C", {"version": "^1.0", "python": "~2.7"})
-    a.add_dependency("C", {"version": "^2.0", "python": "^3.4"})
+    a10 = get_package("A", "1.0")
+    a11 = get_package("A", "1.1")
+    a11.add_dependency("B", ">=1.0.1")
+    a11.add_dependency("C", {"version": "^1.0", "python": "~2.7"})
+    a11.add_dependency("C", {"version": "^2.0", "python": "^3.4"})
     b101 = get_package("B", "1.0.1")
-    b101.python_versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
     b110 = get_package("B", "1.1.0")
-    b110.python_versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
-    repo.add_package(a)
+    repo.add_package(a10)
+    repo.add_package(a11)
     repo.add_package(b101)
     repo.add_package(b110)
     repo.add_package(get_package("C", "1.0"))
@@ -1517,7 +1577,7 @@ def test_installer_can_install_dependencies_from_forced_source(
 
 
 def test_run_installs_with_url_file(installer, locker, repo, package):
-    url = "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl"
+    url = "https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
     package.add_dependency("demo", {"url": url})
 
     repo.add_package(get_package("pendulum", "1.4.4"))
@@ -1529,3 +1589,78 @@ def test_run_installs_with_url_file(installer, locker, repo, package):
     assert locker.written_data == expected
 
     assert len(installer.installer.installs) == 2
+
+
+def test_installer_uses_prereleases_if_they_are_compatible(
+    installer, locker, package, repo
+):
+    package.python_versions = "~2.7 || ^3.4"
+    package.add_dependency(
+        "prerelease", {"git": "https://github.com/demo/prerelease.git"}
+    )
+
+    package_b = get_package("b", "2.0.0")
+    package_b.add_dependency("prerelease", ">=0.19")
+
+    repo.add_package(package_b)
+
+    installer.run()
+
+    del installer.installer.installs[:]
+    locker.locked(True)
+    locker.mock_lock_data(locker.written_data)
+
+    package.add_dependency("b", "^2.0.0")
+
+    installer.whitelist(["b"])
+    installer.update(True)
+    installer.run()
+
+    assert len(installer.installer.installs) == 2
+
+
+def test_installer_can_handle_old_lock_files(
+    installer, locker, package, repo, installed
+):
+    pool = Pool()
+    pool.add_repository(MockRepository())
+
+    package.add_dependency("pytest", "^3.5", category="dev")
+
+    locker.mock_lock_data(fixture("with-pypi-repository"))
+
+    installer = Installer(
+        NullIO(), MockEnv(), package, locker, pool, installed=installed
+    )
+
+    installer.run()
+
+    assert 6 == len(installer.installer.installs)
+
+    installer = Installer(
+        NullIO(),
+        MockEnv(version_info=(2, 7, 18)),
+        package,
+        locker,
+        pool,
+        installed=installed,
+    )
+
+    installer.run()
+
+    # funcsigs will be added
+    assert 7 == len(installer.installer.installs)
+
+    installer = Installer(
+        NullIO(),
+        MockEnv(version_info=(2, 7, 18), platform="win32"),
+        package,
+        locker,
+        pool,
+        installed=installed,
+    )
+
+    installer.run()
+
+    # colorama will be added
+    assert 8 == len(installer.installer.installs)
diff --git a/tests/installation/test_pip_installer.py b/tests/installation/test_pip_installer.py
index 210f0afb0fa..8f7d3975a61 100644
--- a/tests/installation/test_pip_installer.py
+++ b/tests/installation/test_pip_installer.py
@@ -1,10 +1,13 @@
+import shutil
+
 import pytest
 
+from poetry.core.packages.package import Package
 from poetry.installation.pip_installer import PipInstaller
 from poetry.io.null_io import NullIO
-from poetry.packages.package import Package
 from poetry.repositories.legacy_repository import LegacyRepository
 from poetry.repositories.pool import Pool
+from poetry.utils._compat import Path
 from poetry.utils.env import NullEnv
 
 
@@ -29,9 +32,12 @@ def installer(pool):
 
 def test_requirement(installer):
     package = Package("ipython", "7.5.0")
-    package.hashes = [
-        "md5:dbdc53e3918f28fa335a173432402a00",
-        "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+    package.files = [
+        {"file": "foo-0.1.0.tar.gz", "hash": "md5:dbdc53e3918f28fa335a173432402a00"},
+        {
+            "file": "foo.0.1.0.whl",
+            "hash": "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+        },
     ]
 
     result = installer.requirement(package, formatted=True)
@@ -86,9 +92,104 @@ def test_install_with_non_pypi_default_repository(pool, installer):
     installer.install(bar)
 
 
+def test_install_with_cert():
+    ca_path = "path/to/cert.pem"
+    pool = Pool()
+
+    default = LegacyRepository("default", "https://foo.bar", cert=Path(ca_path))
+
+    pool.add_repository(default, default=True)
+
+    null_env = NullEnv()
+
+    installer = PipInstaller(null_env, NullIO(), pool)
+
+    foo = Package("foo", "0.0.0")
+    foo.source_type = "legacy"
+    foo.source_reference = default._name
+    foo.source_url = default._url
+
+    installer.install(foo)
+
+    assert len(null_env.executed) == 1
+    cmd = null_env.executed[0]
+    assert "--cert" in cmd
+    cert_index = cmd.index("--cert")
+    # Need to do the str(Path()) bit because Windows paths get modified by Path
+    assert cmd[cert_index + 1] == str(Path(ca_path))
+
+
+def test_install_with_client_cert():
+    client_path = "path/to/client.pem"
+    pool = Pool()
+
+    default = LegacyRepository(
+        "default", "https://foo.bar", client_cert=Path(client_path)
+    )
+
+    pool.add_repository(default, default=True)
+
+    null_env = NullEnv()
+
+    installer = PipInstaller(null_env, NullIO(), pool)
+
+    foo = Package("foo", "0.0.0")
+    foo.source_type = "legacy"
+    foo.source_reference = default._name
+    foo.source_url = default._url
+
+    installer.install(foo)
+
+    assert len(null_env.executed) == 1
+    cmd = null_env.executed[0]
+    assert "--client-cert" in cmd
+    cert_index = cmd.index("--client-cert")
+    # Need to do the str(Path()) bit because Windows paths get modified by Path
+    assert cmd[cert_index + 1] == str(Path(client_path))
+
+
 def test_requirement_git_develop_true(installer, package_git):
     package_git.develop = True
     result = installer.requirement(package_git)
     expected = ["-e", "git+git@github.com:demo/demo.git@master#egg=demo"]
 
     assert expected == result
+
+
+def test_uninstall_git_package_nspkg_pth_cleanup(mocker, tmp_venv, pool):
+    # this test scenario requires a real installation using the pip installer
+    installer = PipInstaller(tmp_venv, NullIO(), pool)
+
+    # use a namepspace package
+    package = Package("namespace-package-one", "1.0.0")
+    package.source_type = "git"
+    package.source_url = "https://github.com/demo/namespace-package-one.git"
+    package.source_reference = "master"
+    package.develop = True
+
+    # we do this here because the virtual env might not be usable if failure case is triggered
+    pth_file_candidate = tmp_venv.site_packages / "{}-nspkg.pth".format(package.name)
+
+    # in order to reproduce the scenario where the git source is removed prior to proper
+    # clean up of nspkg.pth file, we need to make sure the fixture is copied and not
+    # symlinked into the git src directory
+    def copy_only(source, dest):
+        if dest.exists():
+            dest.unlink()
+
+        if source.is_dir():
+            shutil.copytree(str(source), str(dest))
+        else:
+            shutil.copyfile(str(source), str(dest))
+
+    mocker.patch("tests.helpers.copy_or_symlink", new=copy_only)
+
+    # install package and then remove it
+    installer.install(package)
+    installer.remove(package)
+
+    assert not Path(pth_file_candidate).exists()
+
+    # any command in the virtual environment should trigger the error message
+    output = tmp_venv.run("python", "-m", "site")
+    assert "Error processing line 1 of {}".format(pth_file_candidate) not in output
diff --git a/tests/json/test_poetry_schema.py b/tests/json/test_poetry_schema.py
deleted file mode 100644
index 3086242cf25..00000000000
--- a/tests/json/test_poetry_schema.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import pytest
-
-from poetry.json import validate_object
-
-
-@pytest.fixture
-def base_object():
-    return {
-        "name": "myapp",
-        "version": "1.0.0",
-        "description": "Some description.",
-        "dependencies": {"python": "^3.6"},
-        "dev-dependencies": {},
-    }
-
-
-def test_path_dependencies(base_object):
-    base_object["dependencies"].update({"foo": {"path": "../foo"}})
-    base_object["dev-dependencies"].update({"foo": {"path": "../foo"}})
-
-    assert len(validate_object(base_object, "poetry-schema")) == 0
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/pyproject.toml b/tests/masonry/builders/fixtures/case_sensitive_exclusions/pyproject.toml
deleted file mode 100644
index fa1867eb1d5..00000000000
--- a/tests/masonry/builders/fixtures/case_sensitive_exclusions/pyproject.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-exclude = [
-    "**/SecondBar.py",
-    "my_package/FooBar/*",
-    "my_package/Foo/Bar.py",
-    "my_package/Foo/lowercasebar.py",
-    "my_package/bar/foo.py",
-    "my_package/bar/CapitalFoo.py"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-pendulum = { version = "^1.4", optional = true }
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
-extra-script = {callable = "my_package.extra:main", extras = ["time"]}
diff --git a/tests/masonry/builders/fixtures/complete/LICENSE b/tests/masonry/builders/fixtures/complete/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/complete/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/complete/my_package/__init__.py b/tests/masonry/builders/fixtures/complete/my_package/__init__.py
deleted file mode 100644
index 10aa336ce07..00000000000
--- a/tests/masonry/builders/fixtures/complete/my_package/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "1.2.3"
diff --git a/tests/masonry/builders/fixtures/complete/my_package/sub_pkg2/data2/data.json b/tests/masonry/builders/fixtures/complete/my_package/sub_pkg2/data2/data.json
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/complete/pyproject.toml b/tests/masonry/builders/fixtures/complete/pyproject.toml
deleted file mode 100644
index 5f5cc220509..00000000000
--- a/tests/masonry/builders/fixtures/complete/pyproject.toml
+++ /dev/null
@@ -1,53 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-maintainers = [
-    "People Everywhere "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-exclude = [
-    "**/*.xml"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-[tool.poetry.dependencies.pendulum]
-version = "^1.4"
-markers= 'python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5"'
-optional = true
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
-extra-script = {callable = "my_package.extra:main", extras = ["time"]}
-
-[tool.poetry.urls]
-"Issue Tracker" = "https://github.com/sdispater/poetry/issues"
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/LICENSE b/tests/masonry/builders/fixtures/default_with_excluded_data/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/default_with_excluded_data/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/data1.txt b/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/data1.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/sub_data/data2.txt b/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/sub_data/data2.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/sub_data/data3.txt b/tests/masonry/builders/fixtures/default_with_excluded_data/my_package/data/sub_data/data3.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data/pyproject.toml b/tests/masonry/builders/fixtures/default_with_excluded_data/pyproject.toml
deleted file mode 100644
index 87a519305d8..00000000000
--- a/tests/masonry/builders/fixtures/default_with_excluded_data/pyproject.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-pendulum = { version = "^1.4", optional = true }
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/LICENSE b/tests/masonry/builders/fixtures/default_with_excluded_data_toml/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/data1.txt b/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/data1.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/sub_data/data2.txt b/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/sub_data/data2.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/sub_data/data3.txt b/tests/masonry/builders/fixtures/default_with_excluded_data_toml/my_package/data/sub_data/data3.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/pyproject.toml b/tests/masonry/builders/fixtures/default_with_excluded_data_toml/pyproject.toml
deleted file mode 100644
index 80c284ecee1..00000000000
--- a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/pyproject.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-exclude = ["my_package/data/data1.txt"]
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-pendulum = { version = "^1.4", optional = true }
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/LICENSE b/tests/masonry/builders/fixtures/exclude_nested_data_toml/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/exclude_nested_data_toml/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/README.rst b/tests/masonry/builders/fixtures/exclude_nested_data_toml/README.rst
deleted file mode 100644
index f7fe15470f9..00000000000
--- a/tests/masonry/builders/fixtures/exclude_nested_data_toml/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-My Package
-==========
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/data1.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/data1.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/sub_data/data2.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/sub_data/data2.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/sub_data/data3.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/data/sub_data/data3.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item1/itemdata1.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item1/itemdata1.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item1/subitem/subitemdata.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item1/subitem/subitemdata.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item2/itemdata2.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/item2/itemdata2.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/publicdata.txt b/tests/masonry/builders/fixtures/exclude_nested_data_toml/my_package/puplic/publicdata.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/exclude_nested_data_toml/pyproject.toml b/tests/masonry/builders/fixtures/exclude_nested_data_toml/pyproject.toml
deleted file mode 100644
index 21efcba30eb..00000000000
--- a/tests/masonry/builders/fixtures/exclude_nested_data_toml/pyproject.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-exclude = ["my_package/data/", "**/*/item*"]
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-pendulum = { version = "^1.4", optional = true }
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
diff --git a/tests/masonry/builders/fixtures/default_with_excluded_data_toml/README.rst b/tests/masonry/builders/fixtures/excluded_subpackage/README.rst
similarity index 100%
rename from tests/masonry/builders/fixtures/default_with_excluded_data_toml/README.rst
rename to tests/masonry/builders/fixtures/excluded_subpackage/README.rst
diff --git a/tests/masonry/builders/fixtures/excluded_subpackage/example/__init__.py b/tests/masonry/builders/fixtures/excluded_subpackage/example/__init__.py
new file mode 100644
index 00000000000..3dc1f76bc69
--- /dev/null
+++ b/tests/masonry/builders/fixtures/excluded_subpackage/example/__init__.py
@@ -0,0 +1 @@
+__version__ = "0.1.0"
diff --git a/tests/masonry/builders/fixtures/source_package/src/package_src/__init__.py b/tests/masonry/builders/fixtures/excluded_subpackage/example/test/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/source_package/src/package_src/__init__.py
rename to tests/masonry/builders/fixtures/excluded_subpackage/example/test/__init__.py
diff --git a/tests/masonry/builders/fixtures/excluded_subpackage/example/test/excluded.py b/tests/masonry/builders/fixtures/excluded_subpackage/example/test/excluded.py
new file mode 100644
index 00000000000..bf6e1f8962f
--- /dev/null
+++ b/tests/masonry/builders/fixtures/excluded_subpackage/example/test/excluded.py
@@ -0,0 +1,5 @@
+from .. import __version__
+
+
+def test_version():
+    assert __version__ == "0.1.0"
diff --git a/tests/masonry/builders/fixtures/excluded_subpackage/pyproject.toml b/tests/masonry/builders/fixtures/excluded_subpackage/pyproject.toml
new file mode 100644
index 00000000000..3852bb831fa
--- /dev/null
+++ b/tests/masonry/builders/fixtures/excluded_subpackage/pyproject.toml
@@ -0,0 +1,18 @@
+[tool.poetry]
+name = "example"
+version = "0.1.0"
+description = ""
+authors = ["Sébastien Eustace "]
+exclude = [
+    "**/test/**/*",
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+
+[tool.poetry.dev-dependencies]
+pytest = "^3.0"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"
diff --git a/tests/masonry/builders/fixtures/extended/README.rst b/tests/masonry/builders/fixtures/extended/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/extended/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/extended/build.py b/tests/masonry/builders/fixtures/extended/build.py
deleted file mode 100644
index f4b97a23d49..00000000000
--- a/tests/masonry/builders/fixtures/extended/build.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from distutils.core import Extension
-
-
-extensions = [Extension("extended.extended", ["extended/extended.c"])]
-
-
-def build(setup_kwargs):
-    setup_kwargs.update({"ext_modules": extensions})
diff --git a/tests/masonry/builders/fixtures/extended/extended/extended.c b/tests/masonry/builders/fixtures/extended/extended/extended.c
deleted file mode 100644
index 25a028eb11e..00000000000
--- a/tests/masonry/builders/fixtures/extended/extended/extended.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include 
-
-
-static PyObject *hello(PyObject *self) {
-    return PyUnicode_FromString("Hello");
-}
-
-
-static PyMethodDef module_methods[] = {
-    {
-        "hello",
-        (PyCFunction) hello,
-        NULL,
-        PyDoc_STR("Say hello.")
-    },
-    {NULL}
-};
-
-#if PY_MAJOR_VERSION >= 3
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "extended",
-    NULL,
-    -1,
-    module_methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-#endif
-
-PyMODINIT_FUNC
-#if PY_MAJOR_VERSION >= 3
-PyInit_extended(void)
-#else
-init_extended(void)
-#endif
-{
-    PyObject *module;
-
-#if PY_MAJOR_VERSION >= 3
-    module = PyModule_Create(&moduledef);
-#else
-    module = Py_InitModule3("extended", module_methods, NULL);
-#endif
-
-    if (module == NULL)
-#if PY_MAJOR_VERSION >= 3
-        return NULL;
-#else
-        return;
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-    return module;
-#endif
-}
diff --git a/tests/masonry/builders/fixtures/extended/pyproject.toml b/tests/masonry/builders/fixtures/extended/pyproject.toml
deleted file mode 100644
index d37694aed1e..00000000000
--- a/tests/masonry/builders/fixtures/extended/pyproject.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[tool.poetry]
-name = "extended"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-build = "build.py"
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/LICENSE b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/README.rst b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/README.rst
deleted file mode 100644
index f7fe15470f9..00000000000
--- a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-My Package
-==========
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Bar/foo/bar/Foo.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Bar/foo/bar/Foo.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/Bar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/Bar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/IncludedBar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/IncludedBar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/SecondBar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/SecondBar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/lowercasebar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/Foo/lowercasebar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/FooBar/Bar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/FooBar/Bar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/FooBar/lowercasebar.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/FooBar/lowercasebar.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/__init__.py b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/__init__.py
deleted file mode 100644
index 10aa336ce07..00000000000
--- a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/my_package/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "1.2.3"
diff --git a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/pyproject.toml b/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/pyproject.toml
deleted file mode 100644
index 221991373c6..00000000000
--- a/tests/masonry/builders/fixtures/invalid_case_sensitive_exclusions/pyproject.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[tool.poetry]
-name = "my-package"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-exclude = [
-    "my_package/Bar/*/bar/*.py"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-cleo = "^0.6"
-cachy = { version = "^0.2.0", extras = ["msgpack"] }
-
-pendulum = { version = "^1.4", optional = true }
-
-[tool.poetry.dev-dependencies]
-pytest = "~3.4"
-
-[tool.poetry.extras]
-time = ["pendulum"]
-
-[tool.poetry.scripts]
-my-script = "my_package:main"
-my-2nd-script = "my_package:main2"
-extra-script = {callable = "my_package.extra:main", extras = ["time"]}
diff --git a/tests/masonry/builders/fixtures/localversionlabel/localversionlabel.py b/tests/masonry/builders/fixtures/localversionlabel/localversionlabel.py
deleted file mode 100644
index 0fea9e94e1b..00000000000
--- a/tests/masonry/builders/fixtures/localversionlabel/localversionlabel.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Test fixture for https://github.com/sdispater/poetry/issues/756"""
diff --git a/tests/masonry/builders/fixtures/localversionlabel/pyproject.toml b/tests/masonry/builders/fixtures/localversionlabel/pyproject.toml
deleted file mode 100644
index 0fc59378be8..00000000000
--- a/tests/masonry/builders/fixtures/localversionlabel/pyproject.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[tool.poetry]
-name = "localversionlabel"
-description = "Local Version Label"
-version = "0.1-beta.1+gitbranch-buildno-1"
-authors = []
-
diff --git a/tests/masonry/builders/fixtures/module1/README.rst b/tests/masonry/builders/fixtures/module1/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/module1/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/module1/module1.py b/tests/masonry/builders/fixtures/module1/module1.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/module1/module1.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/FooBar/Bar.py b/tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/FooBar/Bar.py
rename to tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/module.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/module.pyi
new file mode 100644
index 00000000000..d79e6e39ee0
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/module.pyi
@@ -0,0 +1,4 @@
+"""Example module"""
+from typing import Tuple
+
+version_info = Tuple[int, int, int]
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/FooBar/lowercasebar.py b/tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/subpkg/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/FooBar/lowercasebar.py
rename to tests/masonry/builders/fixtures/pep_561_stub_only/pkg-stubs/subpkg/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only/pyproject.toml b/tests/masonry/builders/fixtures/pep_561_stub_only/pyproject.toml
new file mode 100644
index 00000000000..36a077afd95
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only/pyproject.toml
@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "pep-561-stubs"
+version = "0.1"
+description = "PEP 561 stub package example"
+authors = [
+    "Oleg Höfling "
+]
+license = "MIT"
+packages = [
+    {include = "pkg-stubs"}
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/bar/CapitalFoo.py b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/bar/CapitalFoo.py
rename to tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi
new file mode 100644
index 00000000000..d79e6e39ee0
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi
@@ -0,0 +1,4 @@
+"""Example module"""
+from typing import Tuple
+
+version_info = Tuple[int, int, int]
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed
new file mode 100644
index 00000000000..b648ac92333
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed
@@ -0,0 +1 @@
+partial
diff --git a/tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/bar/foo.py b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/subpkg/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/case_sensitive_exclusions/my_package/bar/foo.py
rename to tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/subpkg/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml
new file mode 100644
index 00000000000..db202c04a1c
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml
@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "pep-561-stubs"
+version = "0.1"
+description = "PEP 561 stub package example with the py.typed marker file"
+authors = [
+    "Oleg Höfling "
+]
+license = "MIT"
+packages = [
+    {include = "pkg-stubs"}
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_src/pyproject.toml b/tests/masonry/builders/fixtures/pep_561_stub_only_src/pyproject.toml
new file mode 100644
index 00000000000..666b2b24f6d
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_src/pyproject.toml
@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "pep-561-stubs"
+version = "0.1"
+description = "PEP 561 stub package example with an src layout"
+authors = [
+    "Oleg Höfling "
+]
+license = "MIT"
+packages = [
+    {include = "pkg-stubs", from = "src"}
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
diff --git a/tests/masonry/builders/fixtures/complete/my_package/data1/test.json b/tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/complete/my_package/data1/test.json
rename to tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/module.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/module.pyi
new file mode 100644
index 00000000000..d79e6e39ee0
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/module.pyi
@@ -0,0 +1,4 @@
+"""Example module"""
+from typing import Tuple
+
+version_info = Tuple[int, int, int]
diff --git a/tests/masonry/builders/fixtures/complete/my_package/sub_pkg1/extra_file.xml b/tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/subpkg/__init__.pyi
similarity index 100%
rename from tests/masonry/builders/fixtures/complete/my_package/sub_pkg1/extra_file.xml
rename to tests/masonry/builders/fixtures/pep_561_stub_only_src/src/pkg-stubs/subpkg/__init__.pyi
diff --git a/tests/masonry/builders/fixtures/prerelease/README.rst b/tests/masonry/builders/fixtures/prerelease/README.rst
deleted file mode 100644
index 77d54395b7d..00000000000
--- a/tests/masonry/builders/fixtures/prerelease/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Prerelease
-==========
diff --git a/tests/masonry/builders/fixtures/prerelease/prerelease.py b/tests/masonry/builders/fixtures/prerelease/prerelease.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/prerelease/prerelease.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/prerelease/pyproject.toml b/tests/masonry/builders/fixtures/prerelease/pyproject.toml
deleted file mode 100644
index bdba2d84f42..00000000000
--- a/tests/masonry/builders/fixtures/prerelease/pyproject.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[tool.poetry]
-name = "prerelease"
-version = "0.1-beta.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
diff --git a/tests/masonry/builders/fixtures/simple_version/README.rst b/tests/masonry/builders/fixtures/simple_version/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/simple_version/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/simple_version/pyproject.toml b/tests/masonry/builders/fixtures/simple_version/pyproject.toml
deleted file mode 100644
index 4a8767b9009..00000000000
--- a/tests/masonry/builders/fixtures/simple_version/pyproject.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[tool.poetry]
-name = "simple-version"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-
-readme = "README.rst"
-
-
-[tool.poetry.dependencies]
-python = "3.6"
diff --git a/tests/masonry/builders/fixtures/simple_version/simple_version.py b/tests/masonry/builders/fixtures/simple_version/simple_version.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/simple_version/simple_version.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/single_python/README.rst b/tests/masonry/builders/fixtures/single_python/README.rst
deleted file mode 100644
index 265d70d6a73..00000000000
--- a/tests/masonry/builders/fixtures/single_python/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Single Python
-=============
diff --git a/tests/masonry/builders/fixtures/single_python/pyproject.toml b/tests/masonry/builders/fixtures/single_python/pyproject.toml
deleted file mode 100644
index 998be123802..00000000000
--- a/tests/masonry/builders/fixtures/single_python/pyproject.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[tool.poetry]
-name = "single-python"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-
-[tool.poetry.dependencies]
-python = "2.7.15"
diff --git a/tests/masonry/builders/fixtures/single_python/single_python.py b/tests/masonry/builders/fixtures/single_python/single_python.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/single_python/single_python.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/source_file/README.rst b/tests/masonry/builders/fixtures/source_file/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/source_file/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/source_file/pyproject.toml b/tests/masonry/builders/fixtures/source_file/pyproject.toml
deleted file mode 100644
index b265944caab..00000000000
--- a/tests/masonry/builders/fixtures/source_file/pyproject.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[tool.poetry]
-name = "module-src"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-
-[tool.poetry.dependencies]
-python = "*"
diff --git a/tests/masonry/builders/fixtures/source_file/src/module_src.py b/tests/masonry/builders/fixtures/source_file/src/module_src.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/source_file/src/module_src.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/source_package/README.rst b/tests/masonry/builders/fixtures/source_package/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/source_package/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/source_package/pyproject.toml b/tests/masonry/builders/fixtures/source_package/pyproject.toml
deleted file mode 100644
index 08ebd1d0820..00000000000
--- a/tests/masonry/builders/fixtures/source_package/pyproject.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[tool.poetry]
-name = "package-src"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-[tool.poetry.dependencies]
-python = "*"
diff --git a/tests/masonry/builders/fixtures/source_package/src/package_src/module.py b/tests/masonry/builders/fixtures/source_package/src/package_src/module.py
deleted file mode 100644
index 7ef41c5d4ea..00000000000
--- a/tests/masonry/builders/fixtures/source_package/src/package_src/module.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Example module"""
-
-__version__ = "0.1"
diff --git a/tests/masonry/builders/fixtures/src_extended/README.rst b/tests/masonry/builders/fixtures/src_extended/README.rst
deleted file mode 100644
index a7508bd515e..00000000000
--- a/tests/masonry/builders/fixtures/src_extended/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Module 1
-========
diff --git a/tests/masonry/builders/fixtures/src_extended/build.py b/tests/masonry/builders/fixtures/src_extended/build.py
deleted file mode 100644
index 3c5eff4061c..00000000000
--- a/tests/masonry/builders/fixtures/src_extended/build.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from distutils.core import Extension
-
-
-extensions = [Extension("extended.extended", ["src/extended/extended.c"])]
-
-
-def build(setup_kwargs):
-    setup_kwargs.update({"ext_modules": extensions})
diff --git a/tests/masonry/builders/fixtures/src_extended/pyproject.toml b/tests/masonry/builders/fixtures/src_extended/pyproject.toml
deleted file mode 100644
index d37694aed1e..00000000000
--- a/tests/masonry/builders/fixtures/src_extended/pyproject.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[tool.poetry]
-name = "extended"
-version = "0.1"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-readme = "README.rst"
-
-homepage = "https://poetry.eustace.io/"
-
-build = "build.py"
diff --git a/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c b/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c
deleted file mode 100644
index 25a028eb11e..00000000000
--- a/tests/masonry/builders/fixtures/src_extended/src/extended/extended.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include 
-
-
-static PyObject *hello(PyObject *self) {
-    return PyUnicode_FromString("Hello");
-}
-
-
-static PyMethodDef module_methods[] = {
-    {
-        "hello",
-        (PyCFunction) hello,
-        NULL,
-        PyDoc_STR("Say hello.")
-    },
-    {NULL}
-};
-
-#if PY_MAJOR_VERSION >= 3
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    "extended",
-    NULL,
-    -1,
-    module_methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-};
-#endif
-
-PyMODINIT_FUNC
-#if PY_MAJOR_VERSION >= 3
-PyInit_extended(void)
-#else
-init_extended(void)
-#endif
-{
-    PyObject *module;
-
-#if PY_MAJOR_VERSION >= 3
-    module = PyModule_Create(&moduledef);
-#else
-    module = Py_InitModule3("extended", module_methods, NULL);
-#endif
-
-    if (module == NULL)
-#if PY_MAJOR_VERSION >= 3
-        return NULL;
-#else
-        return;
-#endif
-
-#if PY_MAJOR_VERSION >= 3
-    return module;
-#endif
-}
diff --git a/tests/masonry/builders/fixtures/with-include/LICENSE b/tests/masonry/builders/fixtures/with-include/LICENSE
deleted file mode 100644
index 44cf2b30e68..00000000000
--- a/tests/masonry/builders/fixtures/with-include/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018 Sébastien Eustace
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/masonry/builders/fixtures/with-include/README.rst b/tests/masonry/builders/fixtures/with-include/README.rst
deleted file mode 100644
index f7fe15470f9..00000000000
--- a/tests/masonry/builders/fixtures/with-include/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-My Package
-==========
diff --git a/tests/masonry/builders/fixtures/with-include/extra_dir/__init__.py b/tests/masonry/builders/fixtures/with-include/extra_dir/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with-include/extra_dir/sub_pkg/__init__.py b/tests/masonry/builders/fixtures/with-include/extra_dir/sub_pkg/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with-include/for_wheel_only/__init__.py b/tests/masonry/builders/fixtures/with-include/for_wheel_only/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with-include/package_with_include/__init__.py b/tests/masonry/builders/fixtures/with-include/package_with_include/__init__.py
deleted file mode 100644
index 10aa336ce07..00000000000
--- a/tests/masonry/builders/fixtures/with-include/package_with_include/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "1.2.3"
diff --git a/tests/masonry/builders/fixtures/with-include/src/src_package/__init__.py b/tests/masonry/builders/fixtures/with-include/src/src_package/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with-include/tests/__init__.py b/tests/masonry/builders/fixtures/with-include/tests/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with_url_dependency/pyproject.toml b/tests/masonry/builders/fixtures/with_url_dependency/pyproject.toml
deleted file mode 100644
index 9db0956d95b..00000000000
--- a/tests/masonry/builders/fixtures/with_url_dependency/pyproject.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[tool.poetry]
-name = "with-url-dependency"
-version = "1.2.3"
-description = "Some description."
-authors = [
-    "Sébastien Eustace "
-]
-license = "MIT"
-
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
-
-keywords = ["packaging", "dependency", "poetry"]
-
-classifiers = [
-    "Topic :: Software Development :: Build Tools",
-    "Topic :: Software Development :: Libraries :: Python Modules"
-]
-
-# Requirements
-[tool.poetry.dependencies]
-python = "^3.6"
-demo = { url = "https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl" }
diff --git a/tests/masonry/builders/fixtures/with_url_dependency/with_url_dependency/__init__.py b/tests/masonry/builders/fixtures/with_url_dependency/with_url_dependency/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/fixtures/with_vcs_dependency/with_vcs_dependency/__init__.py b/tests/masonry/builders/fixtures/with_vcs_dependency/with_vcs_dependency/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/builders/test_builder.py b/tests/masonry/builders/test_builder.py
deleted file mode 100644
index b393022c3ab..00000000000
--- a/tests/masonry/builders/test_builder.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-from clikit.io import NullIO
-from email.parser import Parser
-
-from poetry.factory import Factory
-from poetry.masonry.builders.builder import Builder
-from poetry.utils._compat import Path
-from poetry.utils.env import NullEnv
-
-
-def test_builder_find_excluded_files(mocker):
-    p = mocker.patch("poetry.vcs.git.Git.get_ignored_files")
-    p.return_value = []
-
-    builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete"),
-        NullEnv(),
-        NullIO(),
-    )
-
-    assert builder.find_excluded_files() == {"my_package/sub_pkg1/extra_file.xml"}
-
-
-def test_builder_find_case_sensitive_excluded_files(mocker):
-    p = mocker.patch("poetry.vcs.git.Git.get_ignored_files")
-    p.return_value = []
-
-    builder = Builder(
-        Factory().create_poetry(
-            Path(__file__).parent / "fixtures" / "case_sensitive_exclusions"
-        ),
-        NullEnv(),
-        NullIO(),
-    )
-
-    assert builder.find_excluded_files() == {
-        "my_package/FooBar/Bar.py",
-        "my_package/FooBar/lowercasebar.py",
-        "my_package/Foo/SecondBar.py",
-        "my_package/Foo/Bar.py",
-        "my_package/Foo/lowercasebar.py",
-        "my_package/bar/foo.py",
-        "my_package/bar/CapitalFoo.py",
-    }
-
-
-def test_builder_find_invalid_case_sensitive_excluded_files(mocker):
-    p = mocker.patch("poetry.vcs.git.Git.get_ignored_files")
-    p.return_value = []
-
-    builder = Builder(
-        Factory().create_poetry(
-            Path(__file__).parent / "fixtures" / "invalid_case_sensitive_exclusions"
-        ),
-        NullEnv(),
-        NullIO(),
-    )
-
-    assert {"my_package/Bar/foo/bar/Foo.py"} == builder.find_excluded_files()
-
-
-def test_get_metadata_content():
-    builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "complete"),
-        NullEnv(),
-        NullIO(),
-    )
-
-    metadata = builder.get_metadata_content()
-
-    p = Parser()
-    parsed = p.parsestr(metadata)
-
-    assert parsed["Metadata-Version"] == "2.1"
-    assert parsed["Name"] == "my-package"
-    assert parsed["Version"] == "1.2.3"
-    assert parsed["Summary"] == "Some description."
-    assert parsed["Author"] == "Sébastien Eustace"
-    assert parsed["Author-email"] == "sebastien@eustace.io"
-    assert parsed["Keywords"] == "packaging,dependency,poetry"
-    assert parsed["Requires-Python"] == ">=3.6,<4.0"
-    assert parsed["License"] == "MIT"
-    assert parsed["Home-page"] == "https://poetry.eustace.io/"
-
-    classifiers = parsed.get_all("Classifier")
-    assert classifiers == [
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Topic :: Software Development :: Build Tools",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ]
-
-    extras = parsed.get_all("Provides-Extra")
-    assert extras == ["time"]
-
-    requires = parsed.get_all("Requires-Dist")
-    assert requires == [
-        "cachy[msgpack] (>=0.2.0,<0.3.0)",
-        "cleo (>=0.6,<0.7)",
-        'pendulum (>=1.4,<2.0); (python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5") and (extra == "time")',
-    ]
-
-    urls = parsed.get_all("Project-URL")
-    assert urls == [
-        "Documentation, https://poetry.eustace.io/docs",
-        "Issue Tracker, https://github.com/sdispater/poetry/issues",
-        "Repository, https://github.com/sdispater/poetry",
-    ]
-
-
-def test_metadata_homepage_default():
-    builder = Builder(
-        Factory().create_poetry(Path(__file__).parent / "fixtures" / "simple_version"),
-        NullEnv(),
-        NullIO(),
-    )
-
-    metadata = Parser().parsestr(builder.get_metadata_content())
-
-    assert metadata["Home-page"] is None
-
-
-def test_metadata_with_vcs_dependencies():
-    builder = Builder(
-        Factory().create_poetry(
-            Path(__file__).parent / "fixtures" / "with_vcs_dependency"
-        ),
-        NullEnv(),
-        NullIO(),
-    )
-
-    metadata = Parser().parsestr(builder.get_metadata_content())
-
-    requires_dist = metadata["Requires-Dist"]
-
-    assert "cleo @ git+https://github.com/sdispater/cleo.git@master" == requires_dist
-
-
-def test_metadata_with_url_dependencies():
-    builder = Builder(
-        Factory().create_poetry(
-            Path(__file__).parent / "fixtures" / "with_url_dependency"
-        ),
-        NullEnv(),
-        NullIO(),
-    )
-
-    metadata = Parser().parsestr(builder.get_metadata_content())
-
-    requires_dist = metadata["Requires-Dist"]
-
-    assert (
-        "demo @ https://poetry.eustace.io/distributions/demo-0.1.0-py2.py3-none-any.whl"
-        == requires_dist
-    )
diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py
deleted file mode 100644
index 09771125b94..00000000000
--- a/tests/masonry/builders/test_complete.py
+++ /dev/null
@@ -1,476 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import ast
-import os
-import pytest
-import re
-import shutil
-import sys
-import tarfile
-import zipfile
-import tempfile
-
-from clikit.io import NullIO
-
-from poetry import __version__
-from poetry.factory import Factory
-from poetry.masonry.builders import CompleteBuilder
-from poetry.utils._compat import Path
-from poetry.utils._compat import decode
-from poetry.utils.env import NullEnv
-
-fixtures_dir = Path(__file__).parent / "fixtures"
-
-
-@pytest.fixture(autouse=True)
-def setup():
-    clear_samples_dist()
-
-    yield
-
-    clear_samples_dist()
-
-
-def clear_samples_dist():
-    for dist in fixtures_dir.glob("**/dist"):
-        if dist.is_dir():
-            shutil.rmtree(str(dist))
-
-
-@pytest.mark.skipif(
-    sys.platform == "win32" and sys.version_info <= (3, 6),
-    reason="Disable test on Windows for Python <=3.6",
-)
-def test_wheel_c_extension():
-    module_path = fixtures_dir / "extended"
-    builder = CompleteBuilder(
-        Factory().create_poetry(module_path), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    sdist = fixtures_dir / "extended" / "dist" / "extended-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "extended-0.1/build.py" in tar.getnames()
-        assert "extended-0.1/extended/extended.c" in tar.getnames()
-
-    whl = list((module_path / "dist").glob("extended-0.1-cp*-cp*-*.whl"))[0]
-
-    assert whl.exists()
-
-    zip = zipfile.ZipFile(str(whl))
-
-    has_compiled_extension = False
-    for name in zip.namelist():
-        if name.startswith("extended/extended") and name.endswith((".so", ".pyd")):
-            has_compiled_extension = True
-
-    assert has_compiled_extension
-
-    try:
-        wheel_data = decode(zip.read("extended-0.1.dist-info/WHEEL"))
-
-        assert (
-            re.match(
-                """(?m)^\
-Wheel-Version: 1.0
-Generator: poetry {}
-Root-Is-Purelib: false
-Tag: cp[23]\\d-cp[23]\\dmu?-.+
-$""".format(
-                    __version__
-                ),
-                wheel_data,
-            )
-            is not None
-        )
-
-        records = decode(zip.read("extended-0.1.dist-info/RECORD"))
-
-        assert re.search(r"\s+extended/extended.*\.(so|pyd)", records) is not None
-    finally:
-        zip.close()
-
-
-@pytest.mark.skipif(
-    sys.platform == "win32" and sys.version_info <= (3, 6),
-    reason="Disable test on Windows for Python <=3.6",
-)
-def test_wheel_c_extension_src_layout():
-    module_path = fixtures_dir / "src_extended"
-    builder = CompleteBuilder(
-        Factory().create_poetry(module_path), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    sdist = fixtures_dir / "src_extended" / "dist" / "extended-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "extended-0.1/build.py" in tar.getnames()
-        assert "extended-0.1/src/extended/extended.c" in tar.getnames()
-
-    whl = list((module_path / "dist").glob("extended-0.1-cp*-cp*-*.whl"))[0]
-
-    assert whl.exists()
-
-    zip = zipfile.ZipFile(str(whl))
-
-    has_compiled_extension = False
-    for name in zip.namelist():
-        if name.startswith("extended/extended") and name.endswith((".so", ".pyd")):
-            has_compiled_extension = True
-
-    assert has_compiled_extension
-
-    try:
-        wheel_data = decode(zip.read("extended-0.1.dist-info/WHEEL"))
-
-        assert (
-            re.match(
-                """(?m)^\
-Wheel-Version: 1.0
-Generator: poetry {}
-Root-Is-Purelib: false
-Tag: cp[23]\\d-cp[23]\\dmu?-.+
-$""".format(
-                    __version__
-                ),
-                wheel_data,
-            )
-            is not None
-        )
-
-        records = decode(zip.read("extended-0.1.dist-info/RECORD"))
-
-        assert re.search(r"\s+extended/extended.*\.(so|pyd)", records) is not None
-    finally:
-        zip.close()
-
-
-def test_complete():
-    module_path = fixtures_dir / "complete"
-    builder = CompleteBuilder(
-        Factory().create_poetry(module_path), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    whl = module_path / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-    if sys.platform != "win32":
-        assert (os.stat(str(whl)).st_mode & 0o777) == 0o644
-
-    zip = zipfile.ZipFile(str(whl))
-
-    try:
-        assert "my_package/sub_pgk1/extra_file.xml" not in zip.namelist()
-
-        entry_points = zip.read("my_package-1.2.3.dist-info/entry_points.txt")
-
-        assert (
-            decode(entry_points.decode())
-            == """\
-[console_scripts]
-extra-script=my_package.extra:main[time]
-my-2nd-script=my_package:main2
-my-script=my_package:main
-
-"""
-        )
-        wheel_data = decode(zip.read("my_package-1.2.3.dist-info/WHEEL"))
-
-        assert (
-            wheel_data
-            == """\
-Wheel-Version: 1.0
-Generator: poetry {}
-Root-Is-Purelib: true
-Tag: py3-none-any
-""".format(
-                __version__
-            )
-        )
-        wheel_data = decode(zip.read("my_package-1.2.3.dist-info/METADATA"))
-
-        assert (
-            wheel_data
-            == """\
-Metadata-Version: 2.1
-Name: my-package
-Version: 1.2.3
-Summary: Some description.
-Home-page: https://poetry.eustace.io/
-License: MIT
-Keywords: packaging,dependency,poetry
-Author: Sébastien Eustace
-Author-email: sebastien@eustace.io
-Maintainer: People Everywhere
-Maintainer-email: people@everywhere.com
-Requires-Python: >=3.6,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Provides-Extra: time
-Requires-Dist: cachy[msgpack] (>=0.2.0,<0.3.0)
-Requires-Dist: cleo (>=0.6,<0.7)
-Requires-Dist: pendulum (>=1.4,<2.0); (python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5") and (extra == "time")
-Project-URL: Documentation, https://poetry.eustace.io/docs
-Project-URL: Issue Tracker, https://github.com/sdispater/poetry/issues
-Project-URL: Repository, https://github.com/sdispater/poetry
-Description-Content-Type: text/x-rst
-
-My Package
-==========
-
-"""
-        )
-    finally:
-        zip.close()
-
-
-def test_complete_no_vcs():
-    # Copy the complete fixtures dir to a temporary directory
-    module_path = fixtures_dir / "complete"
-    temporary_dir = Path(tempfile.mkdtemp()) / "complete"
-
-    shutil.copytree(module_path.as_posix(), temporary_dir.as_posix())
-
-    builder = CompleteBuilder(
-        Factory().create_poetry(temporary_dir), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    whl = temporary_dir / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-
-    zip = zipfile.ZipFile(str(whl))
-
-    # Check the zipped file to be sure that included and excluded files are
-    # correctly taken account of without vcs
-    expected_name_list = [
-        "my_package/__init__.py",
-        "my_package/data1/test.json",
-        "my_package/sub_pkg1/__init__.py",
-        "my_package/sub_pkg2/__init__.py",
-        "my_package/sub_pkg2/data2/data.json",
-        "my_package-1.2.3.dist-info/entry_points.txt",
-        "my_package-1.2.3.dist-info/LICENSE",
-        "my_package-1.2.3.dist-info/WHEEL",
-        "my_package-1.2.3.dist-info/METADATA",
-        "my_package-1.2.3.dist-info/RECORD",
-    ]
-
-    assert sorted(zip.namelist()) == sorted(expected_name_list)
-
-    try:
-        entry_points = zip.read("my_package-1.2.3.dist-info/entry_points.txt")
-
-        assert (
-            decode(entry_points.decode())
-            == """\
-[console_scripts]
-extra-script=my_package.extra:main[time]
-my-2nd-script=my_package:main2
-my-script=my_package:main
-
-"""
-        )
-        wheel_data = decode(zip.read("my_package-1.2.3.dist-info/WHEEL"))
-
-        assert (
-            wheel_data
-            == """\
-Wheel-Version: 1.0
-Generator: poetry {}
-Root-Is-Purelib: true
-Tag: py3-none-any
-""".format(
-                __version__
-            )
-        )
-        wheel_data = decode(zip.read("my_package-1.2.3.dist-info/METADATA"))
-
-        assert (
-            wheel_data
-            == """\
-Metadata-Version: 2.1
-Name: my-package
-Version: 1.2.3
-Summary: Some description.
-Home-page: https://poetry.eustace.io/
-License: MIT
-Keywords: packaging,dependency,poetry
-Author: Sébastien Eustace
-Author-email: sebastien@eustace.io
-Maintainer: People Everywhere
-Maintainer-email: people@everywhere.com
-Requires-Python: >=3.6,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Provides-Extra: time
-Requires-Dist: cachy[msgpack] (>=0.2.0,<0.3.0)
-Requires-Dist: cleo (>=0.6,<0.7)
-Requires-Dist: pendulum (>=1.4,<2.0); (python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5") and (extra == "time")
-Project-URL: Documentation, https://poetry.eustace.io/docs
-Project-URL: Issue Tracker, https://github.com/sdispater/poetry/issues
-Project-URL: Repository, https://github.com/sdispater/poetry
-Description-Content-Type: text/x-rst
-
-My Package
-==========
-
-"""
-        )
-    finally:
-        zip.close()
-
-
-def test_module_src():
-    module_path = fixtures_dir / "source_file"
-    builder = CompleteBuilder(
-        Factory().create_poetry(module_path), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    sdist = module_path / "dist" / "module-src-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "module-src-0.1/src/module_src.py" in tar.getnames()
-
-    whl = module_path / "dist" / "module_src-0.1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-    zip = zipfile.ZipFile(str(whl))
-
-    try:
-        assert "module_src.py" in zip.namelist()
-    finally:
-        zip.close()
-
-
-def test_package_src():
-    module_path = fixtures_dir / "source_package"
-    builder = CompleteBuilder(
-        Factory().create_poetry(module_path), NullEnv(execute=True), NullIO()
-    )
-    builder.build()
-
-    sdist = module_path / "dist" / "package-src-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "package-src-0.1/src/package_src/module.py" in tar.getnames()
-
-    whl = module_path / "dist" / "package_src-0.1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-    zip = zipfile.ZipFile(str(whl))
-
-    try:
-        assert "package_src/__init__.py" in zip.namelist()
-        assert "package_src/module.py" in zip.namelist()
-    finally:
-        zip.close()
-
-
-def test_package_with_include(mocker):
-    module_path = fixtures_dir / "with-include"
-
-    # Patch git module to return specific excluded files
-    p = mocker.patch("poetry.vcs.git.Git.get_ignored_files")
-    p.return_value = [
-        str(
-            Path(__file__).parent
-            / "fixtures"
-            / "with-include"
-            / "extra_dir"
-            / "vcs_excluded.txt"
-        ),
-        str(
-            Path(__file__).parent
-            / "fixtures"
-            / "with-include"
-            / "extra_dir"
-            / "sub_pkg"
-            / "vcs_excluded.txt"
-        ),
-    ]
-    builder = CompleteBuilder(Factory().create_poetry(module_path), NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "with-include" / "dist" / "with-include-1.2.3.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        names = tar.getnames()
-        assert len(names) == len(set(names))
-        assert "with-include-1.2.3/LICENSE" in names
-        assert "with-include-1.2.3/README.rst" in names
-        assert "with-include-1.2.3/extra_dir/__init__.py" in names
-        assert "with-include-1.2.3/extra_dir/vcs_excluded.txt" in names
-        assert "with-include-1.2.3/extra_dir/sub_pkg/__init__.py" in names
-        assert "with-include-1.2.3/extra_dir/sub_pkg/vcs_excluded.txt" not in names
-        assert "with-include-1.2.3/my_module.py" in names
-        assert "with-include-1.2.3/notes.txt" in names
-        assert "with-include-1.2.3/package_with_include/__init__.py" in names
-        assert "with-include-1.2.3/tests/__init__.py" in names
-        assert "with-include-1.2.3/pyproject.toml" in names
-        assert "with-include-1.2.3/setup.py" in names
-        assert "with-include-1.2.3/PKG-INFO" in names
-        assert "with-include-1.2.3/for_wheel_only/__init__.py" not in names
-        assert "with-include-1.2.3/src/src_package/__init__.py" in names
-
-        setup = tar.extractfile("with-include-1.2.3/setup.py").read()
-        setup_ast = ast.parse(setup)
-
-        setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
-        ns = {}
-        exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
-        assert ns["package_dir"] == {"": "src"}
-        assert ns["packages"] == [
-            "extra_dir",
-            "extra_dir.sub_pkg",
-            "package_with_include",
-            "src_package",
-            "tests",
-        ]
-        assert ns["package_data"] == {"": ["*"]}
-        assert ns["modules"] == ["my_module"]
-
-    whl = module_path / "dist" / "with_include-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        names = z.namelist()
-        assert len(names) == len(set(names))
-        assert "with_include-1.2.3.dist-info/LICENSE" in names
-        assert "extra_dir/__init__.py" in names
-        assert "extra_dir/vcs_excluded.txt" in names
-        assert "extra_dir/sub_pkg/__init__.py" in names
-        assert "extra_dir/sub_pkg/vcs_excluded.txt" not in names
-        assert "for_wheel_only/__init__.py" in names
-        assert "my_module.py" in names
-        assert "notes.txt" in names
-        assert "package_with_include/__init__.py" in names
-        assert "tests/__init__.py" not in names
-        assert "src_package/__init__.py" in names
diff --git a/tests/masonry/builders/test_editable.py b/tests/masonry/builders/test_editable.py
deleted file mode 100644
index a909b3e2504..00000000000
--- a/tests/masonry/builders/test_editable.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from clikit.io import NullIO
-
-from poetry.factory import Factory
-from poetry.masonry.builders import EditableBuilder
-from poetry.utils._compat import Path
-from poetry.utils.env import MockEnv
-
-fixtures_dir = Path(__file__).parent / "fixtures"
-
-
-def test_build_should_delegate_to_pip_for_non_pure_python_packages(tmp_dir, mocker):
-    move = mocker.patch("shutil.move")
-    tmp_dir = Path(tmp_dir)
-    env = MockEnv(path=tmp_dir, pip_version="18.1", execute=False)
-    env.site_packages.mkdir(parents=True)
-    module_path = fixtures_dir / "extended"
-
-    builder = EditableBuilder(Factory().create_poetry(module_path), env, NullIO())
-    builder.build()
-
-    expected = [["python", "-m", "pip", "install", "-e", str(module_path)]]
-    assert expected == env.executed
-
-    assert 0 == move.call_count
-
-
-def test_build_should_temporarily_remove_the_pyproject_file(tmp_dir, mocker):
-    move = mocker.patch("shutil.move")
-    tmp_dir = Path(tmp_dir)
-    env = MockEnv(path=tmp_dir, pip_version="19.1", execute=False)
-    env.site_packages.mkdir(parents=True)
-    module_path = fixtures_dir / "extended"
-
-    builder = EditableBuilder(Factory().create_poetry(module_path), env, NullIO())
-    builder.build()
-
-    expected = [["python", "-m", "pip", "install", "-e", str(module_path)]]
-    assert expected == env.executed
-
-    assert 2 == move.call_count
-
-    expected_calls = [
-        mocker.call(
-            str(module_path / "pyproject.toml"), str(module_path / "pyproject.tmp")
-        ),
-        mocker.call(
-            str(module_path / "pyproject.tmp"), str(module_path / "pyproject.toml")
-        ),
-    ]
-
-    assert expected_calls == move.call_args_list
diff --git a/tests/masonry/builders/test_editable_builder.py b/tests/masonry/builders/test_editable_builder.py
new file mode 100644
index 00000000000..a7f0ae8f73d
--- /dev/null
+++ b/tests/masonry/builders/test_editable_builder.py
@@ -0,0 +1,161 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import shutil
+
+import pytest
+
+from poetry.factory import Factory
+from poetry.io.null_io import NullIO
+from poetry.masonry.builders.editable import EditableBuilder
+from poetry.utils._compat import Path
+from poetry.utils.env import EnvManager
+from poetry.utils.env import MockEnv
+from poetry.utils.env import VirtualEnv
+
+
+@pytest.fixture()
+def simple_poetry():
+    poetry = Factory().create_poetry(
+        Path(__file__).parent.parent.parent / "fixtures" / "simple_project"
+    )
+
+    return poetry
+
+
+@pytest.fixture()
+def extended_poetry():
+    poetry = Factory().create_poetry(
+        Path(__file__).parent.parent.parent / "fixtures" / "extended_project"
+    )
+
+    return poetry
+
+
+@pytest.fixture()
+def env_manager(simple_poetry):
+    return EnvManager(simple_poetry)
+
+
+@pytest.fixture
+def tmp_venv(tmp_dir, env_manager):
+    venv_path = Path(tmp_dir) / "venv"
+
+    env_manager.build_venv(str(venv_path))
+
+    venv = VirtualEnv(venv_path)
+    yield venv
+
+    shutil.rmtree(str(venv.path))
+
+
+def test_builder_installs_proper_files_for_standard_packages(simple_poetry, tmp_venv):
+    builder = EditableBuilder(simple_poetry, tmp_venv, NullIO())
+
+    builder.build()
+
+    assert tmp_venv._bin_dir.joinpath("foo").exists()
+    assert tmp_venv.site_packages.joinpath("simple_project.pth").exists()
+    assert (
+        str(simple_poetry.file.parent.resolve())
+        == tmp_venv.site_packages.joinpath("simple_project.pth").read_text()
+    )
+
+    dist_info = tmp_venv.site_packages.joinpath("simple_project-1.2.3.dist-info")
+    assert dist_info.exists()
+    assert dist_info.joinpath("INSTALLER").exists()
+    assert dist_info.joinpath("METADATA").exists()
+    assert dist_info.joinpath("RECORD").exists()
+    assert dist_info.joinpath("entry_points.txt").exists()
+
+    assert "poetry" == dist_info.joinpath("INSTALLER").read_text()
+    assert (
+        "[console_scripts]\nbaz=bar:baz.boom.bim\nfoo=foo:bar\n\n"
+        == dist_info.joinpath("entry_points.txt").read_text()
+    )
+
+    metadata = """\
+Metadata-Version: 2.1
+Name: simple-project
+Version: 1.2.3
+Summary: Some description.
+Home-page: https://python-poetry.org
+License: MIT
+Keywords: packaging,dependency,poetry
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Project-URL: Documentation, https://python-poetry.org/docs
+Project-URL: Repository, https://github.com/python-poetry/poetry
+Description-Content-Type: text/x-rst
+
+My Package
+==========
+
+"""
+    assert metadata == dist_info.joinpath("METADATA").read_text(encoding="utf-8")
+
+    records = dist_info.joinpath("RECORD").read_text()
+    assert str(tmp_venv.site_packages.joinpath("simple_project.pth")) in records
+    assert str(tmp_venv._bin_dir.joinpath("foo")) in records
+    assert str(tmp_venv._bin_dir.joinpath("baz")) in records
+    assert str(dist_info.joinpath("METADATA")) in records
+    assert str(dist_info.joinpath("INSTALLER")) in records
+    assert str(dist_info.joinpath("entry_points.txt")) in records
+    assert str(dist_info.joinpath("RECORD")) in records
+
+    baz_script = """\
+#!{python}
+from bar import baz.boom
+
+if __name__ == '__main__':
+    baz.boom.bim()
+""".format(
+        python=tmp_venv._bin("python")
+    )
+
+    assert baz_script == tmp_venv._bin_dir.joinpath("baz").read_text()
+
+    foo_script = """\
+#!{python}
+from foo import bar
+
+if __name__ == '__main__':
+    bar()
+""".format(
+        python=tmp_venv._bin("python")
+    )
+
+    assert foo_script == tmp_venv._bin_dir.joinpath("foo").read_text()
+
+
+def test_builder_falls_back_on_setup_and_pip_for_packages_with_build_scripts(
+    extended_poetry,
+):
+    env = MockEnv(path=Path("/foo"))
+    builder = EditableBuilder(extended_poetry, env, NullIO())
+
+    builder.build()
+
+    assert [
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "-e",
+            str(extended_poetry.file.parent),
+            "--no-deps",
+        ]
+    ] == env.executed
diff --git a/tests/masonry/builders/test_sdist.py b/tests/masonry/builders/test_sdist.py
deleted file mode 100644
index b67dc5ee229..00000000000
--- a/tests/masonry/builders/test_sdist.py
+++ /dev/null
@@ -1,464 +0,0 @@
-# -*- coding: utf-8 -*-
-import ast
-import pytest
-import shutil
-import tarfile
-
-from email.parser import Parser
-
-from clikit.io import NullIO
-
-from poetry.factory import Factory
-from poetry.masonry.builders.sdist import SdistBuilder
-from poetry.masonry.utils.package_include import PackageInclude
-from poetry.packages import Package
-from poetry.packages.vcs_dependency import VCSDependency
-from poetry.utils._compat import Path
-from poetry.utils._compat import to_str
-from poetry.utils.env import NullEnv
-
-from tests.helpers import get_dependency
-
-
-fixtures_dir = Path(__file__).parent / "fixtures"
-
-
-@pytest.fixture(autouse=True)
-def setup():
-    clear_samples_dist()
-
-    yield
-
-    clear_samples_dist()
-
-
-def clear_samples_dist():
-    for dist in fixtures_dir.glob("**/dist"):
-        if dist.is_dir():
-            shutil.rmtree(str(dist))
-
-
-def project(name):
-    return Path(__file__).parent / "fixtures" / name
-
-
-def test_convert_dependencies():
-    package = Package("foo", "1.2.3")
-    result = SdistBuilder.convert_dependencies(
-        package,
-        [
-            get_dependency("A", "^1.0"),
-            get_dependency("B", "~1.0"),
-            get_dependency("C", "1.2.3"),
-            VCSDependency("D", "git", "https://github.com/sdispater/d.git"),
-        ],
-    )
-    main = [
-        "A>=1.0,<2.0",
-        "B>=1.0,<1.1",
-        "C==1.2.3",
-        "D @ git+https://github.com/sdispater/d.git@master",
-    ]
-    extras = {}
-
-    assert result == (main, extras)
-
-    package = Package("foo", "1.2.3")
-    package.extras = {"bar": [get_dependency("A")]}
-
-    result = SdistBuilder.convert_dependencies(
-        package,
-        [
-            get_dependency("A", ">=1.2", optional=True),
-            get_dependency("B", "~1.0"),
-            get_dependency("C", "1.2.3"),
-        ],
-    )
-    main = ["B>=1.0,<1.1", "C==1.2.3"]
-    extras = {"bar": ["A>=1.2"]}
-
-    assert result == (main, extras)
-
-    c = get_dependency("C", "1.2.3")
-    c.python_versions = "~2.7 || ^3.6"
-    d = get_dependency("D", "3.4.5", optional=True)
-    d.python_versions = "~2.7 || ^3.4"
-
-    package.extras = {"baz": [get_dependency("D")]}
-
-    result = SdistBuilder.convert_dependencies(
-        package,
-        [
-            get_dependency("A", ">=1.2", optional=True),
-            get_dependency("B", "~1.0"),
-            c,
-            d,
-        ],
-    )
-    main = ["B>=1.0,<1.1"]
-
-    extra_python = (
-        ':python_version >= "2.7" and python_version < "2.8" '
-        'or python_version >= "3.6" and python_version < "4.0"'
-    )
-    extra_d_dependency = (
-        'baz:python_version >= "2.7" and python_version < "2.8" '
-        'or python_version >= "3.4" and python_version < "4.0"'
-    )
-    extras = {extra_python: ["C==1.2.3"], extra_d_dependency: ["D==3.4.5"]}
-
-    assert result == (main, extras)
-
-
-def test_make_setup():
-    poetry = Factory().create_poetry(project("complete"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    setup = builder.build_setup()
-    setup_ast = ast.parse(setup)
-
-    setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
-    ns = {}
-    exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
-    assert ns["packages"] == [
-        "my_package",
-        "my_package.sub_pkg1",
-        "my_package.sub_pkg2",
-    ]
-    assert ns["install_requires"] == ["cachy[msgpack]>=0.2.0,<0.3.0", "cleo>=0.6,<0.7"]
-    assert ns["entry_points"] == {
-        "console_scripts": [
-            "extra-script = my_package.extra:main[time]",
-            "my-2nd-script = my_package:main2",
-            "my-script = my_package:main",
-        ]
-    }
-    assert ns["extras_require"] == {
-        'time:python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5"': [
-            "pendulum>=1.4,<2.0"
-        ]
-    }
-
-
-def test_make_pkg_info(mocker):
-    get_metadata_content = mocker.patch(
-        "poetry.masonry.builders.builder.Builder.get_metadata_content"
-    )
-    poetry = Factory().create_poetry(project("complete"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build_pkg_info()
-
-    assert get_metadata_content.called
-
-
-def test_make_pkg_info_any_python():
-    poetry = Factory().create_poetry(project("module1"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    pkg_info = builder.build_pkg_info()
-    p = Parser()
-    parsed = p.parsestr(to_str(pkg_info))
-
-    assert "Requires-Python" not in parsed
-
-
-def test_find_files_to_add():
-    poetry = Factory().create_poetry(project("complete"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    result = builder.find_files_to_add()
-
-    assert sorted(result) == sorted(
-        [
-            Path("LICENSE"),
-            Path("README.rst"),
-            Path("my_package/__init__.py"),
-            Path("my_package/data1/test.json"),
-            Path("my_package/sub_pkg1/__init__.py"),
-            Path("my_package/sub_pkg2/__init__.py"),
-            Path("my_package/sub_pkg2/data2/data.json"),
-            Path("pyproject.toml"),
-        ]
-    )
-
-
-def test_make_pkg_info_multi_constraints_dependency():
-    poetry = Factory().create_poetry(
-        Path(__file__).parent.parent.parent
-        / "fixtures"
-        / "project_with_multi_constraints_dependency"
-    )
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    pkg_info = builder.build_pkg_info()
-    p = Parser()
-    parsed = p.parsestr(to_str(pkg_info))
-
-    requires = parsed.get_all("Requires-Dist")
-    assert requires == [
-        'pendulum (>=1.5,<2.0); python_version < "3.4"',
-        'pendulum (>=2.0,<3.0); python_version >= "3.4" and python_version < "4.0"',
-    ]
-
-
-def test_find_packages():
-    poetry = Factory().create_poetry(project("complete"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-
-    base = project("complete")
-    include = PackageInclude(base, "my_package")
-
-    pkg_dir, packages, pkg_data = builder.find_packages(include)
-
-    assert pkg_dir is None
-    assert packages == ["my_package", "my_package.sub_pkg1", "my_package.sub_pkg2"]
-    assert pkg_data == {
-        "": ["*"],
-        "my_package": ["data1/*"],
-        "my_package.sub_pkg2": ["data2/*"],
-    }
-
-    poetry = Factory().create_poetry(project("source_package"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-
-    base = project("source_package")
-    include = PackageInclude(base, "package_src", source="src")
-
-    pkg_dir, packages, pkg_data = builder.find_packages(include)
-
-    assert pkg_dir == str(base / "src")
-    assert packages == ["package_src"]
-    assert pkg_data == {"": ["*"]}
-
-
-def test_package():
-    poetry = Factory().create_poetry(project("complete"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "complete" / "dist" / "my-package-1.2.3.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "my-package-1.2.3/LICENSE" in tar.getnames()
-
-
-def test_module():
-    poetry = Factory().create_poetry(project("module1"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "module1" / "dist" / "module1-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "module1-0.1/module1.py" in tar.getnames()
-
-
-def test_prelease():
-    poetry = Factory().create_poetry(project("prerelease"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "prerelease" / "dist" / "prerelease-0.1b1.tar.gz"
-
-    assert sdist.exists()
-
-
-def test_with_c_extensions():
-    poetry = Factory().create_poetry(project("extended"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "extended" / "dist" / "extended-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "extended-0.1/build.py" in tar.getnames()
-        assert "extended-0.1/extended/extended.c" in tar.getnames()
-
-
-def test_with_c_extensions_src_layout():
-    poetry = Factory().create_poetry(project("src_extended"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = fixtures_dir / "src_extended" / "dist" / "extended-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "extended-0.1/build.py" in tar.getnames()
-        assert "extended-0.1/src/extended/extended.c" in tar.getnames()
-
-
-def test_with_src_module_file():
-    poetry = Factory().create_poetry(project("source_file"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-
-    # Check setup.py
-    setup = builder.build_setup()
-    setup_ast = ast.parse(setup)
-
-    setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
-    ns = {}
-    exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
-    assert ns["package_dir"] == {"": "src"}
-    assert ns["modules"] == ["module_src"]
-
-    builder.build()
-
-    sdist = fixtures_dir / "source_file" / "dist" / "module-src-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "module-src-0.1/src/module_src.py" in tar.getnames()
-
-
-def test_with_src_module_dir():
-    poetry = Factory().create_poetry(project("source_package"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-
-    # Check setup.py
-    setup = builder.build_setup()
-    setup_ast = ast.parse(setup)
-
-    setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
-    ns = {}
-    exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
-    assert ns["package_dir"] == {"": "src"}
-    assert ns["packages"] == ["package_src"]
-
-    builder.build()
-
-    sdist = fixtures_dir / "source_package" / "dist" / "package-src-0.1.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        assert "package-src-0.1/src/package_src/__init__.py" in tar.getnames()
-        assert "package-src-0.1/src/package_src/module.py" in tar.getnames()
-
-
-def test_default_with_excluded_data(mocker):
-    # Patch git module to return specific excluded files
-    p = mocker.patch("poetry.vcs.git.Git.get_ignored_files")
-    p.return_value = [
-        (
-            (
-                Path(__file__).parent
-                / "fixtures"
-                / "default_with_excluded_data"
-                / "my_package"
-                / "data"
-                / "sub_data"
-                / "data2.txt"
-            )
-            .relative_to(project("default_with_excluded_data"))
-            .as_posix()
-        )
-    ]
-    poetry = Factory().create_poetry(project("default_with_excluded_data"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-
-    # Check setup.py
-    setup = builder.build_setup()
-    setup_ast = ast.parse(setup)
-
-    setup_ast.body = [n for n in setup_ast.body if isinstance(n, ast.Assign)]
-    ns = {}
-    exec(compile(setup_ast, filename="setup.py", mode="exec"), ns)
-    assert "package_dir" not in ns
-    assert ns["packages"] == ["my_package"]
-    assert ns["package_data"] == {
-        "": ["*"],
-        "my_package": ["data/*", "data/sub_data/data3.txt"],
-    }
-
-    builder.build()
-
-    sdist = (
-        fixtures_dir / "default_with_excluded_data" / "dist" / "my-package-1.2.3.tar.gz"
-    )
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        names = tar.getnames()
-        assert len(names) == len(set(names))
-        assert "my-package-1.2.3/LICENSE" in names
-        assert "my-package-1.2.3/README.rst" in names
-        assert "my-package-1.2.3/my_package/__init__.py" in names
-        assert "my-package-1.2.3/my_package/data/data1.txt" in names
-        assert "my-package-1.2.3/pyproject.toml" in names
-        assert "my-package-1.2.3/setup.py" in names
-        assert "my-package-1.2.3/PKG-INFO" in names
-
-
-def test_src_excluded_nested_data():
-    module_path = fixtures_dir / "exclude_nested_data_toml"
-    poetry = Factory().create_poetry(module_path)
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    builder.build()
-
-    sdist = module_path / "dist" / "my-package-1.2.3.tar.gz"
-
-    assert sdist.exists()
-
-    with tarfile.open(str(sdist), "r") as tar:
-        names = tar.getnames()
-        assert len(names) == len(set(names))
-        assert "my-package-1.2.3/LICENSE" in names
-        assert "my-package-1.2.3/README.rst" in names
-        assert "my-package-1.2.3/pyproject.toml" in names
-        assert "my-package-1.2.3/setup.py" in names
-        assert "my-package-1.2.3/PKG-INFO" in names
-        assert "my-package-1.2.3/my_package/__init__.py" in names
-        assert "my-package-1.2.3/my_package/data/sub_data/data2.txt" not in names
-        assert "my-package-1.2.3/my_package/data/sub_data/data3.txt" not in names
-        assert "my-package-1.2.3/my_package/data/data1.txt" not in names
-        assert "my-package-1.2.3/my_package/puplic/publicdata.txt" in names
-        assert "my-package-1.2.3/my_package/public/item1/itemdata1.txt" not in names
-        assert (
-            "my-package-1.2.3/my_package/public/item1/subitem/subitemdata.txt"
-            not in names
-        )
-        assert "my-package-1.2.3/my_package/public/item2/itemdata2.txt" not in names
-
-
-def test_proper_python_requires_if_two_digits_precision_version_specified():
-    poetry = Factory().create_poetry(project("simple_version"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    pkg_info = builder.build_pkg_info()
-    p = Parser()
-    parsed = p.parsestr(to_str(pkg_info))
-
-    assert parsed["Requires-Python"] == ">=3.6,<3.7"
-
-
-def test_proper_python_requires_if_three_digits_precision_version_specified():
-    poetry = Factory().create_poetry(project("single_python"))
-
-    builder = SdistBuilder(poetry, NullEnv(), NullIO())
-    pkg_info = builder.build_pkg_info()
-    p = Parser()
-    parsed = p.parsestr(to_str(pkg_info))
-
-    assert parsed["Requires-Python"] == "==2.7.15"
diff --git a/tests/masonry/builders/test_wheel.py b/tests/masonry/builders/test_wheel.py
deleted file mode 100644
index 33c50a5d6a7..00000000000
--- a/tests/masonry/builders/test_wheel.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-import pytest
-import shutil
-import zipfile
-
-from clikit.io import NullIO
-
-from poetry.factory import Factory
-from poetry.masonry.builders import WheelBuilder
-from poetry.utils._compat import Path
-from poetry.utils.env import NullEnv
-
-
-fixtures_dir = Path(__file__).parent / "fixtures"
-
-
-@pytest.fixture(autouse=True)
-def setup():
-    clear_samples_dist()
-
-    yield
-
-    clear_samples_dist()
-
-
-def clear_samples_dist():
-    for dist in fixtures_dir.glob("**/dist"):
-        if dist.is_dir():
-            shutil.rmtree(str(dist))
-
-
-def test_wheel_module():
-    module_path = fixtures_dir / "module1"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "module1-0.1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "module1.py" in z.namelist()
-
-
-def test_wheel_package():
-    module_path = fixtures_dir / "complete"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "my_package/sub_pkg1/__init__.py" in z.namelist()
-
-
-def test_wheel_prerelease():
-    module_path = fixtures_dir / "prerelease"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "prerelease-0.1b1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-
-def test_wheel_excluded_data():
-    module_path = fixtures_dir / "default_with_excluded_data_toml"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "my_package/__init__.py" in z.namelist()
-        assert "my_package/data/sub_data/data2.txt" in z.namelist()
-        assert "my_package/data/sub_data/data3.txt" in z.namelist()
-        assert "my_package/data/data1.txt" not in z.namelist()
-
-
-def test_wheel_excluded_nested_data():
-    module_path = fixtures_dir / "exclude_nested_data_toml"
-    poetry = Factory().create_poetry(module_path)
-    WheelBuilder.make(poetry, NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "my_package/__init__.py" in z.namelist()
-        assert "my_package/data/sub_data/data2.txt" not in z.namelist()
-        assert "my_package/data/sub_data/data3.txt" not in z.namelist()
-        assert "my_package/data/data1.txt" not in z.namelist()
-        assert "my_package/puplic/publicdata.txt" in z.namelist()
-        assert "my_package/public/item1/itemdata1.txt" not in z.namelist()
-        assert "my_package/public/item1/subitem/subitemdata.txt" not in z.namelist()
-        assert "my_package/public/item2/itemdata2.txt" not in z.namelist()
-
-
-def test_wheel_localversionlabel():
-    module_path = fixtures_dir / "localversionlabel"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-    local_version_string = "localversionlabel-0.1b1+gitbranch.buildno.1"
-    whl = module_path / "dist" / (local_version_string + "-py2.py3-none-any.whl")
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert local_version_string + ".dist-info/METADATA" in z.namelist()
-
-
-def test_wheel_package_src():
-    module_path = fixtures_dir / "source_package"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "package_src-0.1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "package_src/__init__.py" in z.namelist()
-        assert "package_src/module.py" in z.namelist()
-
-
-def test_wheel_module_src():
-    module_path = fixtures_dir / "source_file"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "module_src-0.1-py2.py3-none-any.whl"
-
-    assert whl.exists()
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert "module_src.py" in z.namelist()
-
-
-def test_dist_info_file_permissions():
-    module_path = fixtures_dir / "complete"
-    WheelBuilder.make(Factory().create_poetry(module_path), NullEnv(), NullIO())
-
-    whl = module_path / "dist" / "my_package-1.2.3-py3-none-any.whl"
-
-    with zipfile.ZipFile(str(whl)) as z:
-        assert (
-            z.getinfo("my_package-1.2.3.dist-info/WHEEL").external_attr == 0o644 << 16
-        )
-        assert (
-            z.getinfo("my_package-1.2.3.dist-info/METADATA").external_attr
-            == 0o644 << 16
-        )
-        assert (
-            z.getinfo("my_package-1.2.3.dist-info/RECORD").external_attr == 0o644 << 16
-        )
-        assert (
-            z.getinfo("my_package-1.2.3.dist-info/entry_points.txt").external_attr
-            == 0o644 << 16
-        )
diff --git a/tests/masonry/publishing/__init__.py b/tests/masonry/publishing/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/masonry/publishing/test_publisher.py b/tests/masonry/publishing/test_publisher.py
deleted file mode 100644
index e98e5e1312b..00000000000
--- a/tests/masonry/publishing/test_publisher.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import pytest
-
-from poetry.factory import Factory
-from poetry.io.null_io import NullIO
-from poetry.masonry.publishing.publisher import Publisher
-
-
-def test_publish_publishes_to_pypi_by_default(fixture_dir, mocker, config):
-    uploader_auth = mocker.patch("poetry.masonry.publishing.uploader.Uploader.auth")
-    uploader_upload = mocker.patch("poetry.masonry.publishing.uploader.Uploader.upload")
-    poetry = Factory().create_poetry(fixture_dir("sample_project"))
-    poetry._config = config
-    poetry.config.merge(
-        {"http-basic": {"pypi": {"username": "foo", "password": "bar"}}}
-    )
-    publisher = Publisher(poetry, NullIO())
-
-    publisher.publish(None, None, None)
-
-    assert [("foo", "bar")] == uploader_auth.call_args
-    assert [("https://upload.pypi.org/legacy/",)] == uploader_upload.call_args
-
-
-def test_publish_can_publish_to_given_repository(fixture_dir, mocker, config):
-    uploader_auth = mocker.patch("poetry.masonry.publishing.uploader.Uploader.auth")
-    uploader_upload = mocker.patch("poetry.masonry.publishing.uploader.Uploader.upload")
-    poetry = Factory().create_poetry(fixture_dir("sample_project"))
-    poetry._config = config
-    poetry.config.merge(
-        {
-            "repositories": {"my-repo": {"url": "http://foo.bar"}},
-            "http-basic": {"my-repo": {"username": "foo", "password": "bar"}},
-        }
-    )
-    publisher = Publisher(poetry, NullIO())
-
-    publisher.publish("my-repo", None, None)
-
-    assert [("foo", "bar")] == uploader_auth.call_args
-    assert [("http://foo.bar",)] == uploader_upload.call_args
-
-
-def test_publish_raises_error_for_undefined_repository(fixture_dir, mocker, config):
-    poetry = Factory().create_poetry(fixture_dir("sample_project"))
-    poetry._config = config
-    poetry.config.merge(
-        {"http-basic": {"my-repo": {"username": "foo", "password": "bar"}}}
-    )
-    publisher = Publisher(poetry, NullIO())
-
-    with pytest.raises(RuntimeError):
-        publisher.publish("my-repo", None, None)
-
-
-def test_publish_uses_token_if_it_exists(fixture_dir, mocker, config):
-    uploader_auth = mocker.patch("poetry.masonry.publishing.uploader.Uploader.auth")
-    uploader_upload = mocker.patch("poetry.masonry.publishing.uploader.Uploader.upload")
-    poetry = Factory().create_poetry(fixture_dir("sample_project"))
-    poetry._config = config
-    poetry.config.merge({"pypi-token": {"pypi": "my-token"}})
-    publisher = Publisher(poetry, NullIO())
-
-    publisher.publish(None, None, None)
-
-    assert [("__token__", "my-token")] == uploader_auth.call_args
-    assert [("https://upload.pypi.org/legacy/",)] == uploader_upload.call_args
diff --git a/tests/masonry/test_api.py b/tests/masonry/test_api.py
deleted file mode 100644
index ddbecb0e258..00000000000
--- a/tests/masonry/test_api.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import os
-import tarfile
-import zipfile
-
-from contextlib import contextmanager
-
-from poetry import __version__
-from poetry.masonry import api
-from poetry.utils._compat import Path
-from poetry.utils._compat import decode
-from poetry.utils.helpers import temporary_directory
-
-
-@contextmanager
-def cwd(directory):
-    prev = os.getcwd()
-    os.chdir(str(directory))
-    try:
-        yield
-    finally:
-        os.chdir(prev)
-
-
-fixtures = os.path.join(os.path.dirname(__file__), "builders", "fixtures")
-
-
-def test_get_requires_for_build_wheel():
-    expected = ["cleo>=0.6.0,<0.7.0", "cachy[msgpack]>=0.2.0,<0.3.0"]
-    with cwd(os.path.join(fixtures, "complete")):
-        api.get_requires_for_build_wheel() == expected
-
-
-def test_get_requires_for_build_sdist():
-    expected = ["cleo>=0.6.0,<0.7.0", "cachy[msgpack]>=0.2.0,<0.3.0"]
-    with cwd(os.path.join(fixtures, "complete")):
-        api.get_requires_for_build_sdist() == expected
-
-
-def test_build_wheel():
-    with temporary_directory() as tmp_dir, cwd(os.path.join(fixtures, "complete")):
-        filename = api.build_wheel(tmp_dir)
-
-        with zipfile.ZipFile(str(os.path.join(tmp_dir, filename))) as zip:
-            namelist = zip.namelist()
-
-            assert "my_package-1.2.3.dist-info/entry_points.txt" in namelist
-            assert "my_package-1.2.3.dist-info/WHEEL" in namelist
-            assert "my_package-1.2.3.dist-info/METADATA" in namelist
-
-
-def test_build_sdist():
-    with temporary_directory() as tmp_dir, cwd(os.path.join(fixtures, "complete")):
-        filename = api.build_sdist(tmp_dir)
-
-        with tarfile.open(str(os.path.join(tmp_dir, filename))) as tar:
-            namelist = tar.getnames()
-
-            assert "my-package-1.2.3/LICENSE" in namelist
-
-
-def test_prepare_metadata_for_build_wheel():
-    entry_points = """\
-[console_scripts]
-extra-script=my_package.extra:main[time]
-my-2nd-script=my_package:main2
-my-script=my_package:main
-
-"""
-    wheel_data = """\
-Wheel-Version: 1.0
-Generator: poetry {}
-Root-Is-Purelib: true
-Tag: py3-none-any
-""".format(
-        __version__
-    )
-    metadata = """\
-Metadata-Version: 2.1
-Name: my-package
-Version: 1.2.3
-Summary: Some description.
-Home-page: https://poetry.eustace.io/
-License: MIT
-Keywords: packaging,dependency,poetry
-Author: Sébastien Eustace
-Author-email: sebastien@eustace.io
-Maintainer: People Everywhere
-Maintainer-email: people@everywhere.com
-Requires-Python: >=3.6,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Provides-Extra: time
-Requires-Dist: cachy[msgpack] (>=0.2.0,<0.3.0)
-Requires-Dist: cleo (>=0.6,<0.7)
-Requires-Dist: pendulum (>=1.4,<2.0); (python_version ~= "2.7" and sys_platform == "win32" or python_version in "3.4 3.5") and (extra == "time")
-Project-URL: Documentation, https://poetry.eustace.io/docs
-Project-URL: Issue Tracker, https://github.com/sdispater/poetry/issues
-Project-URL: Repository, https://github.com/sdispater/poetry
-Description-Content-Type: text/x-rst
-
-My Package
-==========
-
-"""
-    with temporary_directory() as tmp_dir, cwd(os.path.join(fixtures, "complete")):
-        dirname = api.prepare_metadata_for_build_wheel(tmp_dir)
-
-        assert "my_package-1.2.3.dist-info" == dirname
-
-        dist_info = Path(tmp_dir, dirname)
-
-        assert (dist_info / "entry_points.txt").exists()
-        assert (dist_info / "WHEEL").exists()
-        assert (dist_info / "METADATA").exists()
-
-        with (dist_info / "entry_points.txt").open(encoding="utf-8") as f:
-            assert entry_points == decode(f.read())
-
-        with (dist_info / "WHEEL").open(encoding="utf-8") as f:
-            assert wheel_data == decode(f.read())
-
-        with (dist_info / "METADATA").open(encoding="utf-8") as f:
-            assert metadata == decode(f.read())
diff --git a/tests/mixology/helpers.py b/tests/mixology/helpers.py
index 9cddd16fae9..05ab493f79a 100644
--- a/tests/mixology/helpers.py
+++ b/tests/mixology/helpers.py
@@ -1,7 +1,7 @@
-from poetry.packages import DependencyPackage
-from poetry.packages import Package
+from poetry.core.packages import Package
 from poetry.mixology.failure import SolveFailure
 from poetry.mixology.version_solver import VersionSolver
+from poetry.packages import DependencyPackage
 
 
 def add_to_repo(repository, name, version, deps=None, python=None):
diff --git a/tests/mixology/version_solver/conftest.py b/tests/mixology/version_solver/conftest.py
index fad53468f38..0b605d31f6b 100644
--- a/tests/mixology/version_solver/conftest.py
+++ b/tests/mixology/version_solver/conftest.py
@@ -1,11 +1,11 @@
 import pytest
 
 from clikit.io import NullIO
-from poetry.packages.project_package import ProjectPackage
-from poetry.repositories import Pool
-from poetry.repositories import Repository
 
+from poetry.core.packages.project_package import ProjectPackage
 from poetry.puzzle.provider import Provider
+from poetry.repositories import Pool
+from poetry.repositories import Repository
 
 
 @pytest.fixture
diff --git a/tests/mixology/version_solver/test_python_constraint.py b/tests/mixology/version_solver/test_python_constraint.py
index 3e7b16bae01..910d51be784 100644
--- a/tests/mixology/version_solver/test_python_constraint.py
+++ b/tests/mixology/version_solver/test_python_constraint.py
@@ -8,7 +8,9 @@ def test_dependency_does_not_match_root_python_constraint(root, provider, repo):
 
     add_to_repo(repo, "foo", "1.0.0", python="<3.5")
 
-    error = """The current project must support the following Python versions: ^3.6
+    error = """The current project's Python requirement (^3.6) \
+is not compatible with some of the required packages Python requirement:
+  - foo requires Python <3.5
 
 Because no versions of foo match !=1.0.0
  and foo (1.0.0) requires Python <3.5, foo is forbidden.
diff --git a/tests/mixology/version_solver/test_with_lock.py b/tests/mixology/version_solver/test_with_lock.py
index 105749cf1fd..db60544f193 100644
--- a/tests/mixology/version_solver/test_with_lock.py
+++ b/tests/mixology/version_solver/test_with_lock.py
@@ -1,5 +1,4 @@
 from ...helpers import get_package
-
 from ..helpers import add_to_repo
 from ..helpers import check_solver_result
 
diff --git a/tests/packages/constraints/__init__.py b/tests/packages/constraints/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/packages/constraints/test_constraint.py b/tests/packages/constraints/test_constraint.py
deleted file mode 100644
index 1c55b63489e..00000000000
--- a/tests/packages/constraints/test_constraint.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from poetry.packages.constraints.constraint import Constraint
-from poetry.packages.constraints.empty_constraint import EmptyConstraint
-from poetry.packages.constraints.multi_constraint import MultiConstraint
-from poetry.packages.constraints.union_constraint import UnionConstraint
-
-
-def test_allows():
-    c = Constraint("win32")
-
-    assert c.allows(Constraint("win32"))
-    assert not c.allows(Constraint("linux"))
-
-    c = Constraint("win32", "!=")
-
-    assert not c.allows(Constraint("win32"))
-    assert c.allows(Constraint("linux"))
-
-
-def test_allows_any():
-    c = Constraint("win32")
-
-    assert c.allows_any(Constraint("win32"))
-    assert not c.allows_any(Constraint("linux"))
-    assert c.allows_any(UnionConstraint(Constraint("win32"), Constraint("linux")))
-    assert c.allows_any(Constraint("linux", "!="))
-
-    c = Constraint("win32", "!=")
-
-    assert not c.allows_any(Constraint("win32"))
-    assert c.allows_any(Constraint("linux"))
-    assert c.allows_any(UnionConstraint(Constraint("win32"), Constraint("linux")))
-    assert c.allows_any(Constraint("linux", "!="))
-
-
-def test_allows_all():
-    c = Constraint("win32")
-
-    assert c.allows_all(Constraint("win32"))
-    assert not c.allows_all(Constraint("linux"))
-    assert not c.allows_all(Constraint("linux", "!="))
-    assert not c.allows_all(UnionConstraint(Constraint("win32"), Constraint("linux")))
-
-
-def test_intersect():
-    c = Constraint("win32")
-
-    intersection = c.intersect(Constraint("linux"))
-    assert intersection == EmptyConstraint()
-
-    intersection = c.intersect(
-        UnionConstraint(Constraint("win32"), Constraint("linux"))
-    )
-    assert intersection == Constraint("win32")
-
-    intersection = c.intersect(
-        UnionConstraint(Constraint("linux"), Constraint("linux2"))
-    )
-    assert intersection == EmptyConstraint()
-
-    intersection = c.intersect(Constraint("linux", "!="))
-    assert intersection == c
-
-    c = Constraint("win32", "!=")
-
-    intersection = c.intersect(Constraint("linux", "!="))
-    assert intersection == MultiConstraint(
-        Constraint("win32", "!="), Constraint("linux", "!=")
-    )
-
-
-def test_union():
-    c = Constraint("win32")
-
-    union = c.union(Constraint("linux"))
-    assert union == UnionConstraint(Constraint("win32"), Constraint("linux"))
-
-    union = c.union(UnionConstraint(Constraint("win32"), Constraint("linux")))
-    assert union == UnionConstraint(Constraint("win32"), Constraint("linux"))
-
-    union = c.union(UnionConstraint(Constraint("linux"), Constraint("linux2")))
-    assert union == UnionConstraint(
-        Constraint("win32"), Constraint("linux"), Constraint("linux2")
-    )
-
-
-def test_difference():
-    c = Constraint("win32")
-
-    assert c.difference(Constraint("win32")).is_empty()
-    assert c.difference(Constraint("linux")) == c
diff --git a/tests/packages/constraints/test_main.py b/tests/packages/constraints/test_main.py
deleted file mode 100644
index d9354e6910f..00000000000
--- a/tests/packages/constraints/test_main.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import pytest
-
-from poetry.packages.constraints import parse_constraint
-from poetry.packages.constraints.any_constraint import AnyConstraint
-from poetry.packages.constraints.constraint import Constraint
-from poetry.packages.constraints.multi_constraint import MultiConstraint
-from poetry.packages.constraints.union_constraint import UnionConstraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("*", AnyConstraint()),
-        ("win32", Constraint("win32", "=")),
-        ("=win32", Constraint("win32", "=")),
-        ("==win32", Constraint("win32", "=")),
-        ("!=win32", Constraint("win32", "!=")),
-        ("!= win32", Constraint("win32", "!=")),
-    ],
-)
-def test_parse_constraint(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        (
-            "!=win32,!=linux",
-            MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!=")),
-        ),
-        (
-            "!=win32,!=linux,!=linux2",
-            MultiConstraint(
-                Constraint("win32", "!="),
-                Constraint("linux", "!="),
-                Constraint("linux2", "!="),
-            ),
-        ),
-    ],
-)
-def test_parse_constraint_multi(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("win32 || linux", UnionConstraint(Constraint("win32"), Constraint("linux"))),
-        (
-            "win32 || !=linux2",
-            UnionConstraint(Constraint("win32"), Constraint("linux2", "!=")),
-        ),
-    ],
-)
-def test_parse_constraint_multi(input, constraint):
-    assert parse_constraint(input) == constraint
diff --git a/tests/packages/constraints/test_multi_constraint.py b/tests/packages/constraints/test_multi_constraint.py
deleted file mode 100644
index 38f57fa902a..00000000000
--- a/tests/packages/constraints/test_multi_constraint.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from poetry.packages.constraints.constraint import Constraint
-from poetry.packages.constraints.multi_constraint import MultiConstraint
-
-
-def test_allows():
-    c = MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!="))
-
-    assert not c.allows(Constraint("win32"))
-    assert not c.allows(Constraint("linux"))
-    assert c.allows(Constraint("darwin"))
-
-
-def test_allows_any():
-    c = MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!="))
-
-    assert c.allows_any(Constraint("darwin"))
-    assert c.allows_any(Constraint("darwin", "!="))
-    assert not c.allows_any(Constraint("win32"))
-    assert c.allows_any(c)
-    assert c.allows_any(
-        MultiConstraint(Constraint("win32", "!="), Constraint("darwin", "!="))
-    )
-
-
-def test_allows_all():
-    c = MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!="))
-
-    assert c.allows_all(Constraint("darwin"))
-    assert c.allows_all(Constraint("darwin", "!="))
-    assert not c.allows_all(Constraint("win32"))
-    assert c.allows_all(c)
-    assert not c.allows_all(
-        MultiConstraint(Constraint("win32", "!="), Constraint("darwin", "!="))
-    )
-
-
-def test_intersect():
-    c = MultiConstraint(Constraint("win32", "!="), Constraint("linux", "!="))
-
-    intersection = c.intersect(Constraint("win32", "!="))
-    assert intersection == Constraint("win32", "!=")
diff --git a/tests/packages/constraints/test_union_constraint.py b/tests/packages/constraints/test_union_constraint.py
deleted file mode 100644
index 2d6ad77185c..00000000000
--- a/tests/packages/constraints/test_union_constraint.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from poetry.packages.constraints.constraint import Constraint
-from poetry.packages.constraints.union_constraint import UnionConstraint
-
-
-def test_allows():
-    c = UnionConstraint(Constraint("win32"), Constraint("linux"))
-
-    assert c.allows(Constraint("win32"))
-    assert c.allows(Constraint("linux"))
-    assert not c.allows(Constraint("darwin"))
-
-
-def test_allows_any():
-    c = UnionConstraint(Constraint("win32"), Constraint("linux"))
-
-    assert c.allows_any(c)
-    assert c.allows_any(UnionConstraint(Constraint("win32"), Constraint("darwin")))
-    assert not c.allows_any(UnionConstraint(Constraint("linux2"), Constraint("darwin")))
-    assert c.allows_any(Constraint("win32"))
-    assert not c.allows_any(Constraint("darwin"))
-
-
-def test_allows_all():
-    c = UnionConstraint(Constraint("win32"), Constraint("linux"))
-
-    assert c.allows_all(c)
-    assert not c.allows_all(UnionConstraint(Constraint("win32"), Constraint("darwin")))
-    assert not c.allows_all(UnionConstraint(Constraint("linux2"), Constraint("darwin")))
-    assert c.allows_all(Constraint("win32"))
-    assert not c.allows_all(Constraint("darwin"))
diff --git a/tests/packages/test_dependency.py b/tests/packages/test_dependency.py
deleted file mode 100644
index d6d415a08c4..00000000000
--- a/tests/packages/test_dependency.py
+++ /dev/null
@@ -1,104 +0,0 @@
-from poetry.packages import Dependency
-from poetry.packages import Package
-
-
-def test_accepts():
-    dependency = Dependency("A", "^1.0")
-    package = Package("A", "1.4")
-
-    assert dependency.accepts(package)
-
-
-def test_accepts_prerelease():
-    dependency = Dependency("A", "^1.0", allows_prereleases=True)
-    package = Package("A", "1.4-beta.1")
-
-    assert dependency.accepts(package)
-
-
-def test_accepts_python_versions():
-    dependency = Dependency("A", "^1.0")
-    dependency.python_versions = "^3.6"
-    package = Package("A", "1.4")
-    package.python_versions = "~3.6"
-
-    assert dependency.accepts(package)
-
-
-def test_accepts_fails_with_different_names():
-    dependency = Dependency("A", "^1.0")
-    package = Package("B", "1.4")
-
-    assert not dependency.accepts(package)
-
-
-def test_accepts_fails_with_version_mismatch():
-    dependency = Dependency("A", "~1.0")
-    package = Package("B", "1.4")
-
-    assert not dependency.accepts(package)
-
-
-def test_accepts_fails_with_prerelease_mismatch():
-    dependency = Dependency("A", "^1.0")
-    package = Package("B", "1.4-beta.1")
-
-    assert not dependency.accepts(package)
-
-
-def test_accepts_fails_with_python_versions_mismatch():
-    dependency = Dependency("A", "^1.0")
-    dependency.python_versions = "^3.6"
-    package = Package("B", "1.4")
-    package.python_versions = "~3.5"
-
-    assert not dependency.accepts(package)
-
-
-def test_to_pep_508():
-    dependency = Dependency("Django", "^1.23")
-
-    result = dependency.to_pep_508()
-    assert result == "Django (>=1.23,<2.0)"
-
-    dependency = Dependency("Django", "^1.23")
-    dependency.python_versions = "~2.7 || ^3.6"
-
-    result = dependency.to_pep_508()
-    assert (
-        result == "Django (>=1.23,<2.0); "
-        'python_version >= "2.7" and python_version < "2.8" '
-        'or python_version >= "3.6" and python_version < "4.0"'
-    )
-
-
-def test_to_pep_508_wilcard():
-    dependency = Dependency("Django", "*")
-
-    result = dependency.to_pep_508()
-    assert result == "Django"
-
-
-def test_to_pep_508_in_extras():
-    dependency = Dependency("Django", "^1.23")
-    dependency.in_extras.append("foo")
-
-    result = dependency.to_pep_508()
-    assert result == 'Django (>=1.23,<2.0); extra == "foo"'
-
-    dependency.in_extras.append("bar")
-
-    result = dependency.to_pep_508()
-    assert result == 'Django (>=1.23,<2.0); extra == "foo" or extra == "bar"'
-
-    dependency.python_versions = "~2.7 || ^3.6"
-
-    result = dependency.to_pep_508()
-    assert result == (
-        "Django (>=1.23,<2.0); "
-        "("
-        'python_version >= "2.7" and python_version < "2.8" '
-        'or python_version >= "3.6" and python_version < "4.0"'
-        ") "
-        'and (extra == "foo" or extra == "bar")'
-    )
diff --git a/tests/packages/test_directory_dependency.py b/tests/packages/test_directory_dependency.py
deleted file mode 100644
index 2f87690421b..00000000000
--- a/tests/packages/test_directory_dependency.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import pytest
-
-from poetry.packages.directory_dependency import DirectoryDependency
-from poetry.utils._compat import Path
-from poetry.utils.env import EnvCommandError
-from poetry.utils.env import MockEnv as BaseMockEnv
-
-from subprocess import CalledProcessError
-
-
-class MockEnv(BaseMockEnv):
-    def run(self, bin, *args):
-        raise EnvCommandError(CalledProcessError(1, "python", output=""))
-
-
-DIST_PATH = Path(__file__).parent.parent / "fixtures" / "git" / "github.com" / "demo"
-
-
-def test_directory_dependency_must_exist():
-    with pytest.raises(ValueError):
-        DirectoryDependency("demo", DIST_PATH / "invalid")
diff --git a/tests/packages/test_file_dependency.py b/tests/packages/test_file_dependency.py
deleted file mode 100644
index 1cade9f8a3c..00000000000
--- a/tests/packages/test_file_dependency.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import pytest
-
-from poetry.packages import FileDependency
-from poetry.utils._compat import Path
-
-DIST_PATH = Path(__file__).parent.parent / "fixtures" / "distributions"
-
-
-def test_file_dependency_wrong_path():
-    with pytest.raises(ValueError):
-        FileDependency("demo", DIST_PATH / "demo-0.2.0.tar.gz")
-
-
-def test_file_dependency_dir():
-    with pytest.raises(ValueError):
-        FileDependency("demo", DIST_PATH)
diff --git a/tests/packages/test_locker.py b/tests/packages/test_locker.py
index ea7a30bdbd5..bf1daf0adb3 100644
--- a/tests/packages/test_locker.py
+++ b/tests/packages/test_locker.py
@@ -1,11 +1,12 @@
-import pytest
 import tempfile
 
+import pytest
 import tomlkit
 
+from poetry.core.packages.project_package import ProjectPackage
 from poetry.packages.locker import Locker
-from poetry.packages.project_package import ProjectPackage
 
+from ..helpers import get_dependency
 from ..helpers import get_package
 
 
@@ -26,7 +27,7 @@ def root():
 def test_lock_file_data_is_ordered(locker, root):
     package_a = get_package("A", "1.0.0")
     package_a.add_dependency("B", "^1.0")
-    package_a.hashes = ["456", "123"]
+    package_a.files = [{"file": "foo", "hash": "456"}, {"file": "bar", "hash": "123"}]
     packages = [package_a, get_package("B", "1.2")]
 
     locker.set_lock_data(root, packages)
@@ -57,8 +58,11 @@ def test_lock_file_data_is_ordered(locker, root):
 content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
 python-versions = "*"
 
-[metadata.hashes]
-A = ["123", "456"]
+[metadata.files]
+A = [
+    {file = "bar", hash = "123"},
+    {file = "foo", hash = "456"},
+]
 B = []
 """
 
@@ -91,7 +95,7 @@ def test_locker_properly_loads_extras(locker):
 content-hash = "c3d07fca33fba542ef2b2a4d75bf5b48d892d21a830e2ad9c952ba5123a52f77"
 python-versions = "~2.7 || ^3.4"
 
-[metadata.hashes]
+[metadata.files]
 cachecontrol = []
 """
 
@@ -130,8 +134,149 @@ def test_lock_packages_with_null_description(locker, root):
 content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
 python-versions = "*"
 
-[metadata.hashes]
+[metadata.files]
+A = []
+"""
+
+    assert expected == content
+
+
+def test_lock_file_should_not_have_mixed_types(locker, root):
+    package_a = get_package("A", "1.0.0")
+    package_a.add_dependency("B", "^1.0.0")
+    package_a.add_dependency("B", {"version": ">=1.0.0", "optional": True})
+    package_a.requires[-1].activate()
+    package_a.extras["foo"] = [get_dependency("B", ">=1.0.0")]
+
+    locker.set_lock_data(root, [package_a])
+
+    expected = """[[package]]
+category = "main"
+description = ""
+name = "A"
+optional = false
+python-versions = "*"
+version = "1.0.0"
+
+[package.dependencies]
+[[package.dependencies.B]]
+version = "^1.0.0"
+
+[[package.dependencies.B]]
+optional = true
+version = ">=1.0.0"
+
+[package.extras]
+foo = ["B (>=1.0.0)"]
+
+[metadata]
+content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
+python-versions = "*"
+
+[metadata.files]
+A = []
+"""
+
+    with locker.lock.open(encoding="utf-8") as f:
+        content = f.read()
+
+    assert expected == content
+
+
+def test_reading_lock_file_should_raise_an_error_on_invalid_data(locker):
+    content = u"""[[package]]
+category = "main"
+description = ""
+name = "A"
+optional = false
+python-versions = "*"
+version = "1.0.0"
+
+[package.extras]
+foo = ["bar"]
+
+[package.extras]
+foo = ["bar"]
+
+[metadata]
+content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
+python-versions = "*"
+
+[metadata.files]
 A = []
 """
+    with locker.lock.open("w", encoding="utf-8") as f:
+        f.write(content)
+
+    with pytest.raises(RuntimeError) as e:
+        _ = locker.lock_data
+
+    assert "Unable to read the lock file" in str(e.value)
+
+
+def test_locking_legacy_repository_package_should_include_source_section(root, locker):
+    package_a = get_package("A", "1.0.0")
+    package_a.source_url = "https://foo.bar"
+    package_a.source_reference = "legacy"
+    packages = [package_a]
+
+    locker.set_lock_data(root, packages)
+
+    with locker.lock.open(encoding="utf-8") as f:
+        content = f.read()
+
+    expected = """[[package]]
+category = "main"
+description = ""
+name = "A"
+optional = false
+python-versions = "*"
+version = "1.0.0"
+
+[package.source]
+reference = "legacy"
+url = "https://foo.bar"
+
+[metadata]
+content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
+python-versions = "*"
+
+[metadata.files]
+A = []
+"""
+
+    assert expected == content
+
+
+def test_extras_dependencies_are_ordered(locker, root):
+    package_a = get_package("A", "1.0.0")
+    package_a.add_dependency(
+        "B", {"version": "^1.0.0", "optional": True, "extras": ["c", "a", "b"]}
+    )
+    package_a.requires[-1].activate()
+
+    locker.set_lock_data(root, [package_a])
+
+    expected = """[[package]]
+category = "main"
+description = ""
+name = "A"
+optional = false
+python-versions = "*"
+version = "1.0.0"
+
+[package.dependencies]
+B = {version = "^1.0.0", extras = ["a", "b", "c"], optional = true}
+
+[metadata]
+content-hash = "115cf985d932e9bf5f540555bbdd75decbb62cac81e399375fc19f6277f8c1d8"
+python-versions = "*"
+
+[metadata.files]
+A = []
+"""
+
+    with locker.lock.open(encoding="utf-8") as f:
+        content = f.read()
 
     assert expected == content
diff --git a/tests/packages/test_main.py b/tests/packages/test_main.py
deleted file mode 100644
index aa0200f8249..00000000000
--- a/tests/packages/test_main.py
+++ /dev/null
@@ -1,171 +0,0 @@
-from poetry.packages import dependency_from_pep_508
-
-
-def test_dependency_from_pep_508():
-    name = "requests"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == name
-    assert str(dep.constraint) == "*"
-
-
-def test_dependency_from_pep_508_with_version():
-    name = "requests==2.18.0"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-
-
-def test_dependency_from_pep_508_with_parens():
-    name = "requests (==2.18.0)"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-
-
-def test_dependency_from_pep_508_with_constraint():
-    name = "requests>=2.12.0,!=2.17.*,<3.0"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == ">=2.12.0,<2.17.0 || >=2.18.0,<3.0"
-
-
-def test_dependency_from_pep_508_with_extras():
-    name = 'requests==2.18.0; extra == "foo" or extra == "bar"'
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.in_extras == ["foo", "bar"]
-    assert str(dep.marker) == 'extra == "foo" or extra == "bar"'
-
-
-def test_dependency_from_pep_508_with_python_version():
-    name = 'requests (==2.18.0); python_version == "2.7" or python_version == "2.6"'
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.extras == []
-    assert dep.python_versions == "~2.7 || ~2.6"
-    assert str(dep.marker) == 'python_version == "2.7" or python_version == "2.6"'
-
-
-def test_dependency_from_pep_508_with_single_python_version():
-    name = 'requests (==2.18.0); python_version == "2.7"'
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.extras == []
-    assert dep.python_versions == "~2.7"
-    assert str(dep.marker) == 'python_version == "2.7"'
-
-
-def test_dependency_from_pep_508_with_platform():
-    name = 'requests (==2.18.0); sys_platform == "win32" or sys_platform == "darwin"'
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.extras == []
-    assert dep.python_versions == "*"
-    assert str(dep.marker) == 'sys_platform == "win32" or sys_platform == "darwin"'
-
-
-def test_dependency_from_pep_508_complex():
-    name = (
-        "requests (==2.18.0); "
-        'python_version >= "2.7" and python_version != "3.2" '
-        'and (sys_platform == "win32" or sys_platform == "darwin") '
-        'and extra == "foo"'
-    )
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.in_extras == ["foo"]
-    assert dep.python_versions == ">=2.7 !=3.2.*"
-    assert str(dep.marker) == (
-        'python_version >= "2.7" and python_version != "3.2" '
-        'and (sys_platform == "win32" or sys_platform == "darwin") '
-        'and extra == "foo"'
-    )
-
-
-def test_dependency_python_version_in():
-    name = "requests (==2.18.0); python_version in '3.3 3.4 3.5'"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.python_versions == "3.3.* || 3.4.* || 3.5.*"
-    assert str(dep.marker) == 'python_version in "3.3 3.4 3.5"'
-
-
-def test_dependency_python_version_in_comma():
-    name = "requests (==2.18.0); python_version in '3.3, 3.4, 3.5'"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.python_versions == "3.3.* || 3.4.* || 3.5.*"
-    assert str(dep.marker) == 'python_version in "3.3, 3.4, 3.5"'
-
-
-def test_dependency_platform_in():
-    name = "requests (==2.18.0); sys_platform in 'win32 darwin'"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert str(dep.marker) == 'sys_platform in "win32 darwin"'
-
-
-def test_dependency_with_extra():
-    name = "requests[security] (==2.18.0)"
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-
-    assert len(dep.extras) == 1
-    assert dep.extras[0] == "security"
-
-
-def test_dependency_from_pep_508_with_python_version_union_of_multi():
-    name = (
-        "requests (==2.18.0); "
-        '(python_version >= "2.7" and python_version < "2.8") '
-        'or (python_version >= "3.4" and python_version < "3.5")'
-    )
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "requests"
-    assert str(dep.constraint) == "2.18.0"
-    assert dep.extras == []
-    assert dep.python_versions == ">=2.7 <2.8 || >=3.4 <3.5"
-    assert str(dep.marker) == (
-        'python_version >= "2.7" and python_version < "2.8" '
-        'or python_version >= "3.4" and python_version < "3.5"'
-    )
-
-
-def test_dependency_from_pep_508_with_not_in_op_marker():
-    name = (
-        "jinja2 (>=2.7,<2.8)"
-        '; python_version not in "3.0,3.1,3.2" and extra == "export"'
-    )
-
-    dep = dependency_from_pep_508(name)
-
-    assert dep.name == "jinja2"
-    assert str(dep.constraint) == ">=2.7,<2.8"
-    assert dep.in_extras == ["export"]
-    assert dep.python_versions == "!=3.0.*, !=3.1.*, !=3.2.*"
-    assert (
-        str(dep.marker) == 'python_version not in "3.0,3.1,3.2" and extra == "export"'
-    )
diff --git a/tests/packages/test_package.py b/tests/packages/test_package.py
deleted file mode 100644
index 61e9060af52..00000000000
--- a/tests/packages/test_package.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from poetry.packages import Package
-
-
-def test_package_authors():
-    package = Package("foo", "0.1.0")
-
-    package.authors.append("Sébastien Eustace ")
-    assert package.author_name == "Sébastien Eustace"
-    assert package.author_email == "sebastien@eustace.io"
-
-    package.authors.insert(0, "John Doe")
-    assert package.author_name == "John Doe"
-    assert package.author_email is None
diff --git a/tests/packages/test_vcs_dependency.py b/tests/packages/test_vcs_dependency.py
deleted file mode 100644
index 9872a443a7c..00000000000
--- a/tests/packages/test_vcs_dependency.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from poetry.packages.vcs_dependency import VCSDependency
-
-
-def test_to_pep_508():
-    dependency = VCSDependency(
-        "poetry", "git", "https://github.com/sdispater/poetry.git"
-    )
-
-    expected = "poetry @ git+https://github.com/sdispater/poetry.git@master"
-
-    assert expected == dependency.to_pep_508()
-
-
-def test_to_pep_508_with_extras():
-    dependency = VCSDependency(
-        "poetry", "git", "https://github.com/sdispater/poetry.git"
-    )
-    dependency.extras.append("foo")
-
-    expected = "poetry[foo] @ git+https://github.com/sdispater/poetry.git@master"
-
-    assert expected == dependency.to_pep_508()
-
-
-def test_to_pep_508_in_extras():
-    dependency = VCSDependency(
-        "poetry", "git", "https://github.com/sdispater/poetry.git"
-    )
-    dependency.in_extras.append("foo")
-
-    expected = (
-        'poetry @ git+https://github.com/sdispater/poetry.git@master ; extra == "foo"'
-    )
-    assert expected == dependency.to_pep_508()
-
-    dependency = VCSDependency(
-        "poetry", "git", "https://github.com/sdispater/poetry.git"
-    )
-    dependency.in_extras.append("foo")
-    dependency.extras.append("bar")
-
-    expected = 'poetry[bar] @ git+https://github.com/sdispater/poetry.git@master ; extra == "foo"'
-
-    assert expected == dependency.to_pep_508()
-
-    dependency = VCSDependency(
-        "poetry", "git", "https://github.com/sdispater/poetry.git", "b;ar;"
-    )
-    dependency.in_extras.append("foo;")
-
-    expected = (
-        'poetry @ git+https://github.com/sdispater/poetry.git@b;ar; ; extra == "foo;"'
-    )
-
-    assert expected == dependency.to_pep_508()
diff --git a/tests/packages/utils/__init__.py b/tests/packages/utils/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/packages/utils/test_utils.py b/tests/packages/utils/test_utils.py
deleted file mode 100644
index bf1abe262ba..00000000000
--- a/tests/packages/utils/test_utils.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from poetry.packages.utils.utils import convert_markers
-from poetry.version.markers import parse_marker
-
-
-def test_convert_markers():
-    marker = parse_marker(
-        'sys_platform == "win32" and python_version < "3.6" '
-        'or sys_platform == "win32" and python_version < "3.6" and python_version >= "3.3" '
-        'or sys_platform == "win32" and python_version < "3.3"'
-    )
-
-    converted = convert_markers(marker)
-
-    assert converted["python_version"] == [
-        [("<", "3.6")],
-        [("<", "3.6"), (">=", "3.3")],
-        [("<", "3.3")],
-    ]
-
-    marker = parse_marker('python_version == "2.7" or python_version == "2.6"')
-    converted = convert_markers(marker)
-
-    assert converted["python_version"] == [[("==", "2.7")], [("==", "2.6")]]
diff --git a/tests/masonry/builders/fixtures/src_extended/src/extended/__init__.py b/tests/publishing/__init__.py
similarity index 100%
rename from tests/masonry/builders/fixtures/src_extended/src/extended/__init__.py
rename to tests/publishing/__init__.py
diff --git a/tests/publishing/test_publisher.py b/tests/publishing/test_publisher.py
new file mode 100644
index 00000000000..da376120645
--- /dev/null
+++ b/tests/publishing/test_publisher.py
@@ -0,0 +1,141 @@
+import os
+
+import pytest
+
+from poetry.factory import Factory
+from poetry.io.null_io import NullIO
+from poetry.publishing.publisher import Publisher
+from poetry.utils._compat import Path
+
+
+def test_publish_publishes_to_pypi_by_default(fixture_dir, mocker, config):
+    uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge(
+        {"http-basic": {"pypi": {"username": "foo", "password": "bar"}}}
+    )
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish(None, None, None)
+
+    assert [("foo", "bar")] == uploader_auth.call_args
+    assert [
+        ("https://upload.pypi.org/legacy/",),
+        {"cert": None, "client_cert": None, "dry_run": False},
+    ] == uploader_upload.call_args
+
+
+def test_publish_can_publish_to_given_repository(fixture_dir, mocker, config):
+    uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge(
+        {
+            "repositories": {"my-repo": {"url": "http://foo.bar"}},
+            "http-basic": {"my-repo": {"username": "foo", "password": "bar"}},
+        }
+    )
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish("my-repo", None, None)
+
+    assert [("foo", "bar")] == uploader_auth.call_args
+    assert [
+        ("http://foo.bar",),
+        {"cert": None, "client_cert": None, "dry_run": False},
+    ] == uploader_upload.call_args
+
+
+def test_publish_raises_error_for_undefined_repository(fixture_dir, mocker, config):
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge(
+        {"http-basic": {"my-repo": {"username": "foo", "password": "bar"}}}
+    )
+    publisher = Publisher(poetry, NullIO())
+
+    with pytest.raises(RuntimeError):
+        publisher.publish("my-repo", None, None)
+
+
+def test_publish_uses_token_if_it_exists(fixture_dir, mocker, config):
+    uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge({"pypi-token": {"pypi": "my-token"}})
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish(None, None, None)
+
+    assert [("__token__", "my-token")] == uploader_auth.call_args
+    assert [
+        ("https://upload.pypi.org/legacy/",),
+        {"cert": None, "client_cert": None, "dry_run": False},
+    ] == uploader_upload.call_args
+
+
+def test_publish_uses_cert(fixture_dir, mocker, config):
+    cert = "path/to/ca.pem"
+    uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge(
+        {
+            "repositories": {"foo": {"url": "https://foo.bar"}},
+            "http-basic": {"foo": {"username": "foo", "password": "bar"}},
+            "certificates": {"foo": {"cert": cert}},
+        }
+    )
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish("foo", None, None)
+
+    assert [("foo", "bar")] == uploader_auth.call_args
+    assert [
+        ("https://foo.bar",),
+        {"cert": Path(cert), "client_cert": None, "dry_run": False},
+    ] == uploader_upload.call_args
+
+
+def test_publish_uses_client_cert(fixture_dir, mocker, config):
+    client_cert = "path/to/client.pem"
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    poetry._config = config
+    poetry.config.merge(
+        {
+            "repositories": {"foo": {"url": "https://foo.bar"}},
+            "certificates": {"foo": {"client-cert": client_cert}},
+        }
+    )
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish("foo", None, None)
+
+    assert [
+        ("https://foo.bar",),
+        {"cert": None, "client_cert": Path(client_cert), "dry_run": False},
+    ] == uploader_upload.call_args
+
+
+def test_publish_read_from_environment_variable(fixture_dir, environ, mocker, config):
+    os.environ["POETRY_REPOSITORIES_FOO_URL"] = "https://foo.bar"
+    os.environ["POETRY_HTTP_BASIC_FOO_USERNAME"] = "bar"
+    os.environ["POETRY_HTTP_BASIC_FOO_PASSWORD"] = "baz"
+    uploader_auth = mocker.patch("poetry.publishing.uploader.Uploader.auth")
+    uploader_upload = mocker.patch("poetry.publishing.uploader.Uploader.upload")
+    poetry = Factory().create_poetry(fixture_dir("sample_project"))
+    publisher = Publisher(poetry, NullIO())
+
+    publisher.publish("foo", None, None)
+
+    assert [("bar", "baz")] == uploader_auth.call_args
+    assert [
+        ("https://foo.bar",),
+        {"cert": None, "client_cert": None, "dry_run": False},
+    ] == uploader_upload.call_args
diff --git a/tests/masonry/publishing/test_uploader.py b/tests/publishing/test_uploader.py
similarity index 83%
rename from tests/masonry/publishing/test_uploader.py
rename to tests/publishing/test_uploader.py
index e9c5cc3c9f0..8c46057bf17 100644
--- a/tests/masonry/publishing/test_uploader.py
+++ b/tests/publishing/test_uploader.py
@@ -2,12 +2,12 @@
 
 from poetry.factory import Factory
 from poetry.io.null_io import NullIO
-from poetry.masonry.publishing.uploader import UploadError
-from poetry.masonry.publishing.uploader import Uploader
+from poetry.publishing.uploader import Uploader
+from poetry.publishing.uploader import UploadError
 from poetry.utils._compat import Path
 
 
-fixtures_dir = Path(__file__).parent.parent.parent / "fixtures"
+fixtures_dir = Path(__file__).parent.parent / "fixtures"
 
 
 def project(name):
@@ -35,7 +35,7 @@ def test_uploader_properly_handles_403_errors(http):
 
 
 def test_uploader_registers_for_appropriate_400_errors(mocker, http):
-    register = mocker.patch("poetry.masonry.publishing.uploader.Uploader._register")
+    register = mocker.patch("poetry.publishing.uploader.Uploader._register")
     http.register_uri(
         http.POST, "https://foo.com", status=400, body="No package was ever registered"
     )
diff --git a/tests/puzzle/conftest.py b/tests/puzzle/conftest.py
index 32b75305cbf..e3812530bf5 100644
--- a/tests/puzzle/conftest.py
+++ b/tests/puzzle/conftest.py
@@ -1,13 +1,15 @@
-import pytest
 import shutil
 
+import pytest
+
+from poetry.utils._compat import Path
+
+
 try:
     import urllib.parse as urlparse
 except ImportError:
     import urlparse
 
-from poetry.utils._compat import Path
-
 
 def mock_clone(self, source, dest):
     # Checking source to determine which folder we need to copy
@@ -28,9 +30,9 @@ def mock_clone(self, source, dest):
 @pytest.fixture(autouse=True)
 def setup(mocker):
     # Patch git module to not actually clone projects
-    mocker.patch("poetry.vcs.git.Git.clone", new=mock_clone)
-    mocker.patch("poetry.vcs.git.Git.checkout", new=lambda *_: None)
-    p = mocker.patch("poetry.vcs.git.Git.rev_parse")
+    mocker.patch("poetry.core.vcs.git.Git.clone", new=mock_clone)
+    mocker.patch("poetry.core.vcs.git.Git.checkout", new=lambda *_: None)
+    p = mocker.patch("poetry.core.vcs.git.Git.rev_parse")
     p.return_value = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
 
     yield
diff --git a/tests/puzzle/test_provider.py b/tests/puzzle/test_provider.py
index 50e56ea773e..c5b0e3bcc07 100644
--- a/tests/puzzle/test_provider.py
+++ b/tests/puzzle/test_provider.py
@@ -1,11 +1,13 @@
+from subprocess import CalledProcessError
+
 import pytest
 
 from clikit.io import NullIO
 
-from poetry.packages import ProjectPackage
-from poetry.packages.directory_dependency import DirectoryDependency
-from poetry.packages.file_dependency import FileDependency
-from poetry.packages.vcs_dependency import VCSDependency
+from poetry.core.packages import ProjectPackage
+from poetry.core.packages.directory_dependency import DirectoryDependency
+from poetry.core.packages.file_dependency import FileDependency
+from poetry.core.packages.vcs_dependency import VCSDependency
 from poetry.puzzle.provider import Provider
 from poetry.repositories.pool import Pool
 from poetry.repositories.repository import Repository
@@ -13,11 +15,8 @@
 from poetry.utils._compat import Path
 from poetry.utils.env import EnvCommandError
 from poetry.utils.env import MockEnv as BaseMockEnv
-
 from tests.helpers import get_dependency
 
-from subprocess import CalledProcessError
-
 
 class MockEnv(BaseMockEnv):
     def run(self, bin, *args):
@@ -118,7 +117,10 @@ def test_search_for_vcs_read_setup_with_extras(provider, mocker):
 
 
 def test_search_for_vcs_read_setup_raises_error_if_no_version(provider, mocker):
-    mocker.patch("poetry.utils.env.EnvManager.get", return_value=MockEnv())
+    mocker.patch(
+        "poetry.inspection.info.PackageInfo._execute_setup",
+        side_effect=EnvCommandError(CalledProcessError(1, "python", output="")),
+    )
 
     dependency = VCSDependency("demo", "git", "https://github.com/demo/no-version.git")
 
@@ -175,6 +177,43 @@ def test_search_for_directory_setup_egg_info_with_extras(provider):
     }
 
 
+@pytest.mark.parametrize("directory", ["demo", "non-canonical-name"])
+def test_search_for_directory_setup_with_base(provider, directory):
+    dependency = DirectoryDependency(
+        "demo",
+        Path(__file__).parent.parent
+        / "fixtures"
+        / "git"
+        / "github.com"
+        / "demo"
+        / directory,
+        base=Path(__file__).parent.parent
+        / "fixtures"
+        / "git"
+        / "github.com"
+        / "demo"
+        / directory,
+    )
+
+    package = provider.search_for_directory(dependency)[0]
+
+    assert package.name == "demo"
+    assert package.version.text == "0.1.2"
+    assert package.requires == [get_dependency("pendulum", ">=1.4.4")]
+    assert package.extras == {
+        "foo": [get_dependency("cleo")],
+        "bar": [get_dependency("tomlkit")],
+    }
+    assert package.root_dir == (
+        Path(__file__).parent.parent
+        / "fixtures"
+        / "git"
+        / "github.com"
+        / "demo"
+        / directory
+    )
+
+
 @pytest.mark.skipif(not PY35, reason="AST parsing does not work for Python <3.4")
 def test_search_for_directory_setup_read_setup(provider, mocker):
     mocker.patch("poetry.utils.env.EnvManager.get", return_value=MockEnv())
diff --git a/tests/puzzle/test_solver.py b/tests/puzzle/test_solver.py
index cd765c54fb4..0e1202964e8 100644
--- a/tests/puzzle/test_solver.py
+++ b/tests/puzzle/test_solver.py
@@ -2,16 +2,15 @@
 
 from clikit.io import NullIO
 
-from poetry.packages import dependency_from_pep_508
-from poetry.packages import ProjectPackage
+from poetry.core.packages import ProjectPackage
+from poetry.core.packages import dependency_from_pep_508
+from poetry.core.version.markers import parse_marker
+from poetry.puzzle import Solver
+from poetry.puzzle.exceptions import SolverProblemError
 from poetry.repositories.installed_repository import InstalledRepository
 from poetry.repositories.pool import Pool
 from poetry.repositories.repository import Repository
-from poetry.puzzle import Solver
-from poetry.puzzle.exceptions import SolverProblemError
 from poetry.utils._compat import Path
-from poetry.version.markers import parse_marker
-
 from tests.helpers import get_dependency
 from tests.helpers import get_package
 from tests.repositories.test_legacy_repository import (
@@ -408,8 +407,10 @@ def test_solver_returns_extras_if_requested(solver, repo, package):
     package_b = get_package("B", "1.0")
     package_c = get_package("C", "1.0")
 
-    package_b.extras = {"foo": [get_dependency("C", "^1.0")]}
-    package_b.add_dependency("C", {"version": "^1.0", "optional": True})
+    dep = get_dependency("C", "^1.0", optional=True)
+    dep.marker = parse_marker("extra == 'foo'")
+    package_b.extras = {"foo": [dep]}
+    package_b.requires.append(dep)
 
     repo.add_package(package_a)
     repo.add_package(package_b)
@@ -426,11 +427,14 @@ def test_solver_returns_extras_if_requested(solver, repo, package):
         ],
     )
 
+    assert ops[-1].package.marker.is_any()
+    assert ops[0].package.marker.is_any()
+
 
 def test_solver_returns_prereleases_if_requested(solver, repo, package):
     package.add_dependency("A")
     package.add_dependency("B")
-    package.add_dependency("C", {"version": "*", "allows-prereleases": True})
+    package.add_dependency("C", {"version": "*", "allow-prereleases": True})
 
     package_a = get_package("A", "1.0")
     package_b = get_package("B", "1.0")
@@ -555,21 +559,6 @@ def test_solver_sub_dependencies_with_requirements_complex(solver, repo, package
         ],
     )
 
-    op = ops[3]  # d
-    assert str(op.package.marker) == 'python_version < "4.0"'
-
-    op = ops[0]  # e
-    assert str(op.package.marker) == (
-        'python_version < "4.0" and sys_platform == "win32" '
-        'or python_version < "5.0" and sys_platform == "win32"'
-    )
-
-    op = ops[1]  # f
-    assert str(op.package.marker) == 'python_version < "5.0"'
-
-    op = ops[4]  # a
-    assert str(op.package.marker) == 'python_version < "5.0"'
-
 
 def test_solver_sub_dependencies_with_not_supported_python_version(
     solver, repo, package
@@ -769,11 +758,6 @@ def test_solver_duplicate_dependencies_same_constraint(solver, repo, package):
         ],
     )
 
-    op = ops[0]
-    assert (
-        str(op.package.marker) == 'python_version == "2.7" or python_version >= "3.4"'
-    )
-
 
 def test_solver_duplicate_dependencies_different_constraints(solver, repo, package):
     package.add_dependency("A")
@@ -800,12 +784,6 @@ def test_solver_duplicate_dependencies_different_constraints(solver, repo, packa
         ],
     )
 
-    op = ops[0]
-    assert str(op.package.marker) == 'python_version < "3.4"'
-
-    op = ops[1]
-    assert str(op.package.marker) == 'python_version >= "3.4"'
-
 
 def test_solver_duplicate_dependencies_different_constraints_same_requirements(
     solver, repo, package
@@ -868,12 +846,6 @@ def test_solver_duplicate_dependencies_sub_dependencies(solver, repo, package):
         ],
     )
 
-    op = ops[2]
-    assert str(op.package.marker) == 'python_version < "3.4"'
-
-    op = ops[3]
-    assert str(op.package.marker) == 'python_version >= "3.4"'
-
 
 def test_solver_fails_if_dependency_name_does_not_match_package(solver, repo, package):
     package.add_dependency("my-demo", {"git": "https://github.com/demo/demo.git"})
@@ -928,6 +900,11 @@ def test_solver_can_resolve_git_dependencies(solver, repo, package):
         ],
     )
 
+    op = ops[1]
+
+    assert op.package.source_type == "git"
+    assert op.package.source_reference.startswith("9cf87a2")
+
 
 def test_solver_can_resolve_git_dependencies_with_extras(solver, repo, package):
     pendulum = get_package("pendulum", "2.0.3")
@@ -951,6 +928,37 @@ def test_solver_can_resolve_git_dependencies_with_extras(solver, repo, package):
     )
 
 
+@pytest.mark.parametrize(
+    "ref",
+    [{"branch": "a-branch"}, {"tag": "a-tag"}, {"rev": "9cf8"}],
+    ids=["branch", "tag", "rev"],
+)
+def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref):
+    pendulum = get_package("pendulum", "2.0.3")
+    cleo = get_package("cleo", "1.0.0")
+    repo.add_package(pendulum)
+    repo.add_package(cleo)
+
+    git_config = {"git": "https://github.com/demo/demo.git"}
+    git_config.update(ref)
+    package.add_dependency("demo", git_config)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [
+            {"job": "install", "package": pendulum},
+            {"job": "install", "package": get_package("demo", "0.1.2")},
+        ],
+    )
+
+    op = ops[1]
+
+    assert op.package.source_type == "git"
+    assert op.package.source_reference.startswith("9cf87a2")
+
+
 def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible(
     solver, repo, package
 ):
@@ -966,11 +974,6 @@ def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requir
 
     check_solver_result(ops, [{"job": "install", "package": package_a}])
 
-    assert (
-        str(ops[0].package.marker)
-        == 'python_version >= "3.6" and python_version < "4.0"'
-    )
-
 
 def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible_multiple(
     solver, repo, package
@@ -999,11 +1002,6 @@ def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requir
         ],
     )
 
-    assert str(ops[0].package.marker) == (
-        'python_version >= "3.6" and python_version < "4.0" '
-        'or python_version >= "3.5.3" and python_version < "4.0.0"'
-    )
-
 
 def test_solver_triggers_conflict_for_dependency_python_not_fully_compatible_with_package_python(
     solver, repo, package
@@ -1020,9 +1018,6 @@ def test_solver_triggers_conflict_for_dependency_python_not_fully_compatible_wit
         solver.solve()
 
 
-@pytest.mark.skip(
-    "This is not working at the moment due to limitations in the resolver"
-)
 def test_solver_finds_compatible_package_for_dependency_python_not_fully_compatible_with_package_python(
     solver, repo, package
 ):
@@ -1042,44 +1037,6 @@ def test_solver_finds_compatible_package_for_dependency_python_not_fully_compati
 
     check_solver_result(ops, [{"job": "install", "package": package_a100}])
 
-    assert (
-        str(ops[0].package.marker)
-        == 'python_version >= "3.5" and python_version < "4.0"'
-    )
-
-
-def test_solver_sets_appropriate_markers_when_solving(solver, repo, package):
-    dep = dependency_from_pep_508(
-        'B (>=1.0); python_version >= "3.6" and sys_platform != "win32"'
-    )
-
-    package.add_dependency("A", "^1.0")
-
-    package_a = get_package("A", "1.0.0")
-    package_a.requires.append(dep)
-
-    package_b = get_package("B", "1.0.0")
-
-    repo.add_package(package_a)
-    repo.add_package(package_b)
-
-    ops = solver.solve()
-
-    check_solver_result(
-        ops,
-        [
-            {"job": "install", "package": package_b},
-            {"job": "install", "package": package_a},
-        ],
-    )
-
-    assert (
-        str(ops[0].package.marker)
-        == 'python_version >= "3.6" and sys_platform != "win32"'
-    )
-
-    assert str(ops[1].package.marker) == ""
-
 
 def test_solver_does_not_trigger_new_resolution_on_duplicate_dependencies_if_only_extras(
     solver, repo, package
@@ -1113,10 +1070,7 @@ def test_solver_does_not_trigger_new_resolution_on_duplicate_dependencies_if_onl
         ],
     )
 
-    assert str(ops[0].package.marker) in [
-        'extra == "foo" or extra == "bar"',
-        'extra == "bar" or extra == "foo"',
-    ]
+    assert str(ops[0].package.marker) == ""
     assert str(ops[1].package.marker) == ""
 
 
@@ -1649,8 +1603,7 @@ def test_solver_chooses_from_correct_repository_if_forced(
         ops, [{"job": "install", "package": get_package("tomlkit", "0.5.2")}]
     )
 
-    assert "legacy" == ops[0].package.source_type
-    assert "http://foo.bar" == ops[0].package.source_url
+    assert "http://legacy.foo.bar" == ops[0].package.source_url
 
 
 def test_solver_chooses_from_correct_repository_if_forced_and_transitive_dependency(
@@ -1678,8 +1631,7 @@ def test_solver_chooses_from_correct_repository_if_forced_and_transitive_depende
         ],
     )
 
-    assert "legacy" == ops[0].package.source_type
-    assert "http://foo.bar" == ops[0].package.source_url
+    assert "http://legacy.foo.bar" == ops[0].package.source_url
 
     assert "" == ops[1].package.source_type
     assert "" == ops[1].package.source_url
@@ -1708,12 +1660,10 @@ def test_solver_does_not_choose_from_secondary_repository_by_default(
         ],
     )
 
-    assert "legacy" == ops[0].package.source_type
-    assert "http://foo.bar" == ops[0].package.source_url
+    assert "http://legacy.foo.bar" == ops[0].package.source_url
     assert "" == ops[1].package.source_type
     assert "" == ops[1].package.source_url
-    assert "legacy" == ops[2].package.source_type
-    assert "http://foo.bar" == ops[2].package.source_url
+    assert "http://legacy.foo.bar" == ops[2].package.source_url
 
 
 def test_solver_chooses_from_secondary_if_explicit(package, installed, locked, io):
@@ -1737,8 +1687,7 @@ def test_solver_chooses_from_secondary_if_explicit(package, installed, locked, i
         ],
     )
 
-    assert "legacy" == ops[0].package.source_type
-    assert "http://foo.bar" == ops[0].package.source_url
+    assert "http://legacy.foo.bar" == ops[0].package.source_url
     assert "" == ops[1].package.source_type
     assert "" == ops[1].package.source_url
     assert "" == ops[2].package.source_type
@@ -1775,3 +1724,282 @@ def test_solver_discards_packages_with_empty_markers(
             {"job": "install", "package": package_a},
         ],
     )
+
+
+def test_solver_does_not_raise_conflict_for_conditional_dev_dependencies(
+    solver, repo, package
+):
+    package.python_versions = "~2.7 || ^3.5"
+    package.add_dependency("A", {"version": "^1.0", "python": "~2.7"}, category="dev")
+    package.add_dependency("A", {"version": "^2.0", "python": "^3.5"}, category="dev")
+
+    package_a100 = get_package("A", "1.0.0")
+    package_a200 = get_package("A", "2.0.0")
+
+    repo.add_package(package_a100)
+    repo.add_package(package_a200)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [
+            {"job": "install", "package": package_a100},
+            {"job": "install", "package": package_a200},
+        ],
+    )
+
+
+def test_solver_does_not_loop_indefinitely_on_duplicate_constraints_with_extras(
+    solver, repo, package
+):
+    package.python_versions = "~2.7 || ^3.5"
+    package.add_dependency("requests", {"version": "^2.22.0", "extras": ["security"]})
+
+    requests = get_package("requests", "2.22.0")
+    requests.add_dependency("idna", ">=2.5,<2.9")
+    requests.add_dependency(
+        "idna", {"version": ">=2.0.0", "markers": "extra == 'security'"}
+    )
+    requests.extras["security"] = [get_dependency("idna", ">=2.0.0")]
+    idna = get_package("idna", "2.8")
+
+    repo.add_package(requests)
+    repo.add_package(idna)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [{"job": "install", "package": idna}, {"job": "install", "package": requests}],
+    )
+
+
+def test_solver_does_not_fail_with_locked_git_and_non_git_dependencies(
+    solver, repo, package, locked, pool, installed, io
+):
+    package.add_dependency("demo", {"git": "https://github.com/demo/demo.git"})
+    package.add_dependency("a", "^1.2.3")
+
+    git_package = get_package("demo", "0.1.2")
+    git_package.source_type = "git"
+    git_package.source_url = "https://github.com/demo/demo.git"
+    git_package.source_reference = "commit"
+
+    installed.add_package(git_package)
+
+    locked.add_package(get_package("a", "1.2.3"))
+    locked.add_package(git_package)
+
+    repo.add_package(get_package("a", "1.2.3"))
+
+    solver = Solver(package, pool, installed, locked, io)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [
+            {"job": "install", "package": get_package("a", "1.2.3")},
+            {"job": "install", "package": git_package, "skipped": True},
+        ],
+    )
+
+
+def test_ignore_python_constraint_no_overlap_dependencies(solver, repo, package):
+    pytest = get_package("demo", "1.0.0")
+    pytest.add_dependency("configparser", {"version": "^1.2.3", "python": "<3.2"})
+
+    package.add_dependency("demo", {"version": "^1.0.0", "python": "^3.6"})
+
+    repo.add_package(pytest)
+    repo.add_package(get_package("configparser", "1.2.3"))
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops, [{"job": "install", "package": pytest}],
+    )
+
+
+def test_solver_should_not_go_into_an_infinite_loop_on_duplicate_dependencies(
+    solver, repo, package
+):
+    package.python_versions = "~2.7 || ^3.5"
+    package.add_dependency("A", "^1.0")
+
+    package_a = get_package("A", "1.0.0")
+    package_a.add_dependency("B")
+    package_a.add_dependency(
+        "B", {"version": "^1.0", "markers": "implementation_name == 'pypy'"}
+    )
+
+    package_b20 = get_package("B", "2.0.0")
+    package_b10 = get_package("B", "1.0.0")
+
+    repo.add_package(package_a)
+    repo.add_package(package_b10)
+    repo.add_package(package_b20)
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops,
+        [
+            {"job": "install", "package": package_b10},
+            {"job": "install", "package": package_b20},
+            {"job": "install", "package": package_a},
+        ],
+    )
+
+
+def test_solver_remove_untracked_single(package, pool, installed, locked, io):
+    solver = Solver(package, pool, installed, locked, io, remove_untracked=True)
+    package_a = get_package("a", "1.0")
+    installed.add_package(package_a)
+
+    ops = solver.solve()
+
+    check_solver_result(ops, [{"job": "remove", "package": package_a}])
+
+
+def test_solver_remove_untracked_keeps_critical_package(
+    package, pool, installed, locked, io
+):
+    solver = Solver(package, pool, installed, locked, io, remove_untracked=True)
+    package_pip = get_package("pip", "1.0")
+    installed.add_package(package_pip)
+
+    ops = solver.solve()
+
+    check_solver_result(ops, [])
+
+
+def test_solver_cannot_choose_another_version_for_directory_dependencies(
+    solver, repo, package
+):
+    pendulum = get_package("pendulum", "2.0.3")
+    demo = get_package("demo", "0.1.0")
+    foo = get_package("foo", "1.2.3")
+    foo.add_dependency("demo", "<0.1.2")
+    repo.add_package(foo)
+    repo.add_package(demo)
+    repo.add_package(pendulum)
+
+    path = (
+        Path(__file__).parent.parent
+        / "fixtures"
+        / "git"
+        / "github.com"
+        / "demo"
+        / "demo"
+    ).as_posix()
+
+    package.add_dependency("demo", {"path": path})
+    package.add_dependency("foo", "^1.2.3")
+
+    # This is not solvable since the demo version is pinned
+    # via the directory dependency
+    with pytest.raises(SolverProblemError):
+        solver.solve()
+
+
+def test_solver_cannot_choose_another_version_for_file_dependencies(
+    solver, repo, package
+):
+    pendulum = get_package("pendulum", "2.0.3")
+    demo = get_package("demo", "0.0.8")
+    foo = get_package("foo", "1.2.3")
+    foo.add_dependency("demo", "<0.1.0")
+    repo.add_package(foo)
+    repo.add_package(demo)
+    repo.add_package(pendulum)
+
+    path = (
+        Path(__file__).parent.parent
+        / "fixtures"
+        / "distributions"
+        / "demo-0.1.0-py2.py3-none-any.whl"
+    ).as_posix()
+
+    package.add_dependency("demo", {"path": path})
+    package.add_dependency("foo", "^1.2.3")
+
+    # This is not solvable since the demo version is pinned
+    # via the file dependency
+    with pytest.raises(SolverProblemError):
+        solver.solve()
+
+
+def test_solver_cannot_choose_another_version_for_git_dependencies(
+    solver, repo, package
+):
+    pendulum = get_package("pendulum", "2.0.3")
+    demo = get_package("demo", "0.0.8")
+    foo = get_package("foo", "1.2.3")
+    foo.add_dependency("demo", "<0.1.0")
+    repo.add_package(foo)
+    repo.add_package(demo)
+    repo.add_package(pendulum)
+
+    package.add_dependency("demo", {"git": "https://github.com/demo/demo.git"})
+    package.add_dependency("foo", "^1.2.3")
+
+    # This is not solvable since the demo version is pinned
+    # via the file dependency
+    with pytest.raises(SolverProblemError):
+        solver.solve()
+
+
+def test_solver_cannot_choose_another_version_for_url_dependencies(
+    solver, repo, package, http
+):
+    path = (
+        Path(__file__).parent.parent
+        / "fixtures"
+        / "distributions"
+        / "demo-0.1.0-py2.py3-none-any.whl"
+    )
+
+    http.register_uri(
+        "GET",
+        "https://foo.bar/demo-0.1.0-py2.py3-none-any.whl",
+        body=path.read_bytes(),
+        streaming=True,
+    )
+    pendulum = get_package("pendulum", "2.0.3")
+    demo = get_package("demo", "0.0.8")
+    foo = get_package("foo", "1.2.3")
+    foo.add_dependency("demo", "<0.1.0")
+    repo.add_package(foo)
+    repo.add_package(demo)
+    repo.add_package(pendulum)
+
+    package.add_dependency(
+        "demo", {"url": "https://foo.bar/distributions/demo-0.1.0-py2.py3-none-any.whl"}
+    )
+    package.add_dependency("foo", "^1.2.3")
+
+    # This is not solvable since the demo version is pinned
+    # via the git dependency
+    with pytest.raises(SolverProblemError):
+        solver.solve()
+
+
+def test_solver_should_not_update_same_version_packages_if_installed_has_no_source_type(
+    solver, repo, package, installed
+):
+    package.add_dependency("foo", "1.0.0")
+
+    foo = get_package("foo", "1.0.0")
+    foo.source_type = "legacy"
+    foo.source_reference = "custom"
+    foo.source_url = "https://foo.bar"
+    repo.add_package(foo)
+    installed.add_package(get_package("foo", "1.0.0"))
+
+    ops = solver.solve()
+
+    check_solver_result(
+        ops, [{"job": "install", "package": foo, "skipped": True}],
+    )
diff --git a/tests/repositories/fixtures/installed/lib/python3.7/site-packages/cleo-0.7.6.dist-info/METADATA b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/cleo-0.7.6.dist-info/METADATA
new file mode 100644
index 00000000000..261c036ecda
--- /dev/null
+++ b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/cleo-0.7.6.dist-info/METADATA
@@ -0,0 +1,525 @@
+Metadata-Version: 2.1
+Name: cleo
+Version: 0.7.6
+Summary: Cleo allows you to create beautiful and testable command-line interfaces.
+Home-page: https://github.com/sdispater/cleo
+License: MIT
+Keywords: cli,commands
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Requires-Dist: clikit (>=0.4.0,<0.5.0)
+Description-Content-Type: text/x-rst
+
+Cleo
+####
+
+.. image:: https://travis-ci.org/sdispater/cleo.png
+   :alt: Cleo Build status
+   :target: https://travis-ci.org/sdispater/cleo
+
+Create beautiful and testable command-line interfaces.
+
+Cleo is mostly a higher level wrapper for `CliKit `_, so
+a lot of the components and utilities comes from it. Refer to its documentation for more
+information.
+
+Resources
+=========
+
+* `Documentation `_
+* `Issue Tracker `_
+
+
+Usage
+=====
+
+To make a command that greets you from the command line,
+create ``greet_command.py`` and add the following to it:
+
+.. code-block:: python
+
+    from cleo import Command
+
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {name? : Who do you want to greet?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+        """
+
+        def handle(self):
+            name = self.argument('name')
+
+            if name:
+                text = 'Hello {}'.format(name)
+            else:
+                text = 'Hello'
+
+            if self.option('yell'):
+                text = text.upper()
+
+            self.line(text)
+
+
+You also need to create the file to run at the command line which creates
+an ``Application`` and adds commands to it:
+
+.. code-block:: python
+
+    #!/usr/bin/env python
+
+    from greet_command import GreetCommand
+    from cleo import Application
+
+    application = Application()
+    application.add(GreetCommand())
+
+    if __name__ == '__main__':
+        application.run()
+
+Test the new command by running the following
+
+.. code-block:: bash
+
+    $ python application.py greet John
+
+This will print the following to the command line:
+
+.. code-block:: text
+
+    Hello John
+
+You can also use the ``--yell`` option to make everything uppercase:
+
+.. code-block:: bash
+
+    $ python application.py greet John --yell
+
+This prints:
+
+.. code-block:: text
+
+    HELLO JOHN
+
+As you may have already seen, Cleo uses the command docstring to determine
+the command definition.
+The docstring must be in the following form :
+
+.. code-block:: python
+
+    """
+    Command description
+
+    Command signature
+    """
+
+The signature being in the following form:
+
+.. code-block:: python
+
+    """
+    command:name {argument : Argument description} {--option : Option description}
+    """
+
+The signature can span multiple lines.
+
+.. code-block:: python
+
+    """
+    command:name
+        {argument : Argument description}
+        {--option : Option description}
+    """
+
+Coloring the Output
+-------------------
+
+Whenever you output text, you can surround the text with tags to color its
+output. For example:
+
+.. code-block:: python
+
+    # green text
+    self.line('foo')
+
+    # yellow text
+    self.line('foo')
+
+    # black text on a cyan background
+    self.line('foo')
+
+    # white text on a red background
+    self.line('foo')
+
+The closing tag can be replaced by ````, which revokes all formatting options established by the last opened tag.
+
+It is possible to define your own styles using the ``add_style()`` method:
+
+.. code-block:: python
+
+    self.add_style('fire', fg='red', bg='yellow', options=['bold', 'blink'])
+    self.line('foo')
+
+Available foreground and background colors are: ``black``, ``red``, ``green``,
+``yellow``, ``blue``, ``magenta``, ``cyan`` and ``white``.
+
+And available options are: ``bold``, ``underscore``, ``blink``, ``reverse`` and ``conceal``.
+
+You can also set these colors and options inside the tag name:
+
+.. code-block:: python
+
+    # green text
+    self.line('foo')
+
+    # black text on a cyan background
+    self.line('foo')
+
+    # bold text on a yellow background
+    self.line('foo')
+
+
+Verbosity Levels
+----------------
+
+Cleo has four verbosity levels. These are defined in the ``Output`` class:
+
+=======================================  ================================== ======================
+Mode                                     Meaning                            Console option
+=======================================  ================================== ======================
+``NA``                                   Do not output any messages         ``-q`` or ``--quiet``
+``clikit.VERBOSITY_NORMAL``              The default verbosity level        (none)
+``clikit.VERBOSITY_VERBOSE``             Increased verbosity of messages    ``-v``
+``clikit.VERBOSITY_VERY_VERBOSE``        Informative non essential messages ``-vv``
+``clikit.VERBOSITY_DEBUG``               Debug messages                     ``-vvv``
+=======================================  ================================== ======================
+
+It is possible to print a message in a command for only a specific verbosity
+level. For example:
+
+.. code-block:: python
+
+    if clikit.VERBOSITY_VERBOSE <= self.io.verbosity:
+        self.line(...)
+
+There are also more semantic methods you can use to test for each of the
+verbosity levels:
+
+.. code-block:: python
+
+    if self.output.is_quiet():
+        # ...
+
+    if self.output.is_verbose():
+        # ...
+
+You can also pass the verbosity flag directly to `line()`.
+
+.. code-block:: python
+
+    self.line("", verbosity=clikit.VERBOSITY_VERBOSE)
+
+When the quiet level is used, all output is suppressed.
+
+
+Using Arguments
+---------------
+
+The most interesting part of the commands are the arguments and options that
+you can make available. Arguments are the strings - separated by spaces - that
+come after the command name itself. They are ordered, and can be optional
+or required. For example, add an optional ``last_name`` argument to the command
+and make the ``name`` argument required:
+
+.. code-block:: python
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {name : Who do you want to greet?}
+            {last_name? : Your last name?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+        """
+
+You now have access to a ``last_name`` argument in your command:
+
+.. code-block:: python
+
+    last_name = self.argument('last_name')
+    if last_name:
+        text += ' {}'.format(last_name)
+
+The command can now be used in either of the following ways:
+
+.. code-block:: bash
+
+    $ python application.py greet John
+    $ python application.py greet John Doe
+
+It is also possible to let an argument take a list of values (imagine you want
+to greet all your friends). For this it must be specified at the end of the
+argument list:
+
+.. code-block:: python
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {names* : Who do you want to greet?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+        """
+
+To use this, just specify as many names as you want:
+
+.. code-block:: bash
+
+    $ python application.py demo:greet John Jane
+
+You can access the ``names`` argument as a list:
+
+.. code-block:: python
+
+    names = self.argument('names')
+    if names:
+        text += ' {}'.format(', '.join(names))
+
+There are 3 argument variants you can use:
+
+================================ ==================================== ===============================================================================================================
+Mode                             Notation                             Value
+================================ ==================================== ===============================================================================================================
+``clikit.ARGUMENT_REQUIRED``     none (just write the argument name)  The argument is required
+``clikit.ARGUMENT_OPTIONAL``     ``argument?``                        The argument is optional and therefore can be omitted
+``clikit.ARGUMENT_MULTI_VALUED`` ``argument*``                        The argument can contain an indefinite number of arguments and must be used at the end of the argument list
+================================ ==================================== ===============================================================================================================
+
+You can combine them like this:
+
+.. code-block:: python
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {names?* : Who do you want to greet?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+        """
+
+If you want to set a default value, you can it like so:
+
+.. code-block:: text
+
+    argument=default
+
+The argument will then be considered optional.
+
+
+Using Options
+-------------
+
+Unlike arguments, options are not ordered (meaning you can specify them in any
+order) and are specified with two dashes (e.g. ``--yell`` - you can also
+declare a one-letter shortcut that you can call with a single dash like
+``-y``). Options are *always* optional, and can be setup to accept a value
+(e.g. ``--dir=src``) or simply as a boolean flag without a value (e.g.
+``--yell``).
+
+.. tip::
+
+    It is also possible to make an option *optionally* accept a value (so that
+    ``--yell`` or ``--yell=loud`` work). Options can also be configured to
+    accept a list of values.
+
+For example, add a new option to the command that can be used to specify
+how many times in a row the message should be printed:
+
+.. code-block:: python
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {name? : Who do you want to greet?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+            {--iterations=1 : How many times should the message be printed?}
+        """
+
+
+Next, use this in the command to print the message multiple times:
+
+.. code-block:: python
+
+    for _ in range(0, self.option('iterations')):
+        self.line(text)
+
+Now, when you run the task, you can optionally specify a ``--iterations``
+flag:
+
+.. code-block:: bash
+
+    $ python application.py demo:greet John
+    $ python application.py demo:greet John --iterations=5
+
+The first example will only print once, since ``iterations`` is empty and
+defaults to ``1``. The second example will print five times.
+
+Recall that options don't care about their order. So, either of the following
+will work:
+
+.. code-block:: bash
+
+    $ python application.py demo:greet John --iterations=5 --yell
+    $ python application.py demo:greet John --yell --iterations=5
+
+There are 4 option variants you can use:
+
+================================  =================================== ======================================================================================
+Option                            Notation                            Value
+================================  =================================== ======================================================================================
+``clikit.OPTION_MULTI_VALUED``    ``--option=*``                      This option accepts multiple values (e.g. ``--dir=/foo --dir=/bar``)
+``clikit.OPTION_NO_VALUE``        ``--option``                        Do not accept input for this option (e.g. ``--yell``)
+``clikit.OPTION_REQUIRED_VALUE``  ``--option=``                       This value is required (e.g. ``--iterations=5``), the option itself is still optional
+``clikit.OPTION_OPTIONAL_VALUE``  ``--option=?``                      This option may or may not have a value (e.g. ``--yell`` or ``--yell=loud``)
+================================  =================================== ======================================================================================
+
+You can combine them like this:
+
+.. code-block:: python
+
+    class GreetCommand(Command):
+        """
+        Greets someone
+
+        greet
+            {name? : Who do you want to greet?}
+            {--y|yell : If set, the task will yell in uppercase letters}
+            {--iterations=?*1 : How many times should the message be printed?}
+        """
+
+
+Testing Commands
+----------------
+
+Cleo provides several tools to help you test your commands. The most
+useful one is the ``CommandTester`` class.
+It uses a special IO class to ease testing without a real
+console:
+
+.. code-block:: python
+
+    import pytest
+
+    from cleo import Application
+    from cleo import CommandTester
+
+    def test_execute(self):
+        application = Application()
+        application.add(GreetCommand())
+
+        command = application.find('demo:greet')
+        command_tester = CommandTester(command)
+        command_tester.execute()
+
+        assert "..." == tester.io.fetch_output()
+
+The ``CommandTester.io.fetch_output()`` method returns what would have been displayed
+during a normal call from the console. ``CommandTester.io.fetch_error()`` is also available
+to get what you have been written to the stderr.
+
+You can test sending arguments and options to the command by passing them
+as a string to the ``CommandTester.execute()`` method:
+
+.. code-block:: python
+
+    import pytest
+
+    from cleo import Application
+    from cleo import CommandTester
+
+    def test_execute(self):
+        application = Application()
+        application.add(GreetCommand())
+
+        command = application.find('demo:greet')
+        command_tester = CommandTester(command)
+        command_tester.execute("John")
+
+        assert "John" in tester.io.fetch_output()
+
+You can also test a whole console application by using the ``ApplicationTester`` class.
+
+
+Calling an existing Command
+---------------------------
+
+If a command depends on another one being run before it, instead of asking the
+user to remember the order of execution, you can call it directly yourself.
+This is also useful if you want to create a "meta" command that just runs a
+bunch of other commands.
+
+Calling a command from another one is straightforward:
+
+.. code-block:: python
+
+    def handle(self):
+        return_code = self.call('demo:greet', "John --yell")
+
+        # ...
+
+If you want to suppress the output of the executed command,
+you can use the ``call_silent()`` method instead.
+
+
+
+Autocompletion
+--------------
+
+Cleo supports automatic (tab) completion in ``bash``, ``zsh`` and ``fish``.
+
+To activate support for autocompletion, pass a ``complete`` keyword when initializing
+your application:
+
+.. code-block:: python
+
+    application = Application('My Application', '0.1', complete=True)
+
+Now, register completion for your application by running one of the following in a terminal,
+replacing ``[program]`` with the command you use to run your application:
+
+.. code-block:: bash
+
+    # BASH - Ubuntu / Debian
+    [program] completions bash | sudo tee /etc/bash_completion.d/[program].bash-completion
+
+    # BASH - Mac OSX (with Homebrew "bash-completion")
+    [program] completions bash > $(brew --prefix)/etc/bash_completion.d/[program].bash-completion
+
+    # ZSH - Config file
+    mkdir ~/.zfunc
+    echo "fpath+=~/.zfunc" >> ~/.zshrc
+    [program] completions zsh > ~/.zfunc/_test
+
+    # FISH
+    [program] completions fish > ~/.config/fish/completions/[program].fish
+
+    # FISH - Mac OSX (with Homebrew "fish")
+    [program] completions fish > $(brew --prefix)/share/fish/vendor_completions.d/[program].fish
diff --git a/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable-2.3.4.dist-info/METADATA b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable-2.3.4.dist-info/METADATA
new file mode 100644
index 00000000000..b2a9033fee1
--- /dev/null
+++ b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable-2.3.4.dist-info/METADATA
@@ -0,0 +1,22 @@
+Metadata-Version: 2.1
+Name: editable
+Version: 2.3.4
+Summary: Editable description.
+License: MIT
+Keywords: cli,commands
+Author: Foo Bar
+Author-email: foo@bar.com
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Description-Content-Type: text/x-rst
+
+Editable
+####
diff --git a/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable.pth b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable.pth
new file mode 100644
index 00000000000..000a806eb9f
--- /dev/null
+++ b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/editable.pth
@@ -0,0 +1 @@
+/path/to/editable
diff --git a/tests/repositories/fixtures/installed/lib/python3.7/site-packages/foo-0.1.0-py3.8.egg b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/foo-0.1.0-py3.8.egg
new file mode 100644
index 00000000000..e5bf8f5683c
Binary files /dev/null and b/tests/repositories/fixtures/installed/lib/python3.7/site-packages/foo-0.1.0-py3.8.egg differ
diff --git a/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/PKG-INFO b/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/PKG-INFO
new file mode 100644
index 00000000000..f7ee228c556
--- /dev/null
+++ b/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/PKG-INFO
@@ -0,0 +1,235 @@
+Metadata-Version: 1.2
+Name: pendulum
+Version: 2.0.5
+Summary: Python datetimes made easy
+Home-page: https://pendulum.eustace.io
+Author: Sébastien Eustace
+Author-email: sebastien@eustace.io
+License: UNKNOWN
+Description: Pendulum
+        ########
+        
+        .. image:: https://img.shields.io/pypi/v/pendulum.svg
+            :target: https://pypi.python.org/pypi/pendulum
+        
+        .. image:: https://img.shields.io/pypi/l/pendulum.svg
+            :target: https://pypi.python.org/pypi/pendulum
+        
+        .. image:: https://img.shields.io/codecov/c/github/sdispater/pendulum/master.svg
+            :target: https://codecov.io/gh/sdispater/pendulum/branch/master
+        
+        .. image:: https://travis-ci.org/sdispater/pendulum.svg
+            :alt: Pendulum Build status
+            :target: https://travis-ci.org/sdispater/pendulum
+        
+        Python datetimes made easy.
+        
+        Supports Python **2.7** and **3.4+**.
+        
+        
+        .. code-block:: python
+        
+           >>> import pendulum
+        
+           >>> now_in_paris = pendulum.now('Europe/Paris')
+           >>> now_in_paris
+           '2016-07-04T00:49:58.502116+02:00'
+        
+           # Seamless timezone switching
+           >>> now_in_paris.in_timezone('UTC')
+           '2016-07-03T22:49:58.502116+00:00'
+        
+           >>> tomorrow = pendulum.now().add(days=1)
+           >>> last_week = pendulum.now().subtract(weeks=1)
+        
+           >>> past = pendulum.now().subtract(minutes=2)
+           >>> past.diff_for_humans()
+           >>> '2 minutes ago'
+        
+           >>> delta = past - last_week
+           >>> delta.hours
+           23
+           >>> delta.in_words(locale='en')
+           '6 days 23 hours 58 minutes'
+        
+           # Proper handling of datetime normalization
+           >>> pendulum.datetime(2013, 3, 31, 2, 30, tz='Europe/Paris')
+           '2013-03-31T03:30:00+02:00' # 2:30 does not exist (Skipped time)
+        
+           # Proper handling of dst transitions
+           >>> just_before = pendulum.datetime(2013, 3, 31, 1, 59, 59, 999999, tz='Europe/Paris')
+           '2013-03-31T01:59:59.999999+01:00'
+           >>> just_before.add(microseconds=1)
+           '2013-03-31T03:00:00+02:00'
+        
+        
+        Why Pendulum?
+        =============
+        
+        Native ``datetime`` instances are enough for basic cases but when you face more complex use-cases
+        they often show limitations and are not so intuitive to work with.
+        ``Pendulum`` provides a cleaner and more easy to use API while still relying on the standard library.
+        So it's still ``datetime`` but better.
+        
+        Unlike other datetime libraries for Python, Pendulum is a drop-in replacement
+        for the standard ``datetime`` class (it inherits from it), so, basically, you can replace all your ``datetime``
+        instances by ``DateTime`` instances in you code (exceptions exist for libraries that check
+        the type of the objects by using the ``type`` function like ``sqlite3`` or ``PyMySQL`` for instance).
+        
+        It also removes the notion of naive datetimes: each ``Pendulum`` instance is timezone-aware
+        and by default in ``UTC`` for ease of use.
+        
+        Pendulum also improves the standard ``timedelta`` class by providing more intuitive methods and properties.
+        
+        
+        Why not Arrow?
+        ==============
+        
+        Arrow is the most popular datetime library for Python right now, however its behavior
+        and API can be erratic and unpredictable. The ``get()`` method can receive pretty much anything
+        and it will try its best to return something while silently failing to handle some cases:
+        
+        .. code-block:: python
+        
+            arrow.get('2016-1-17')
+            # 
+        
+            pendulum.parse('2016-1-17')
+            # 
+        
+            arrow.get('20160413')
+            # 
+        
+            pendulum.parse('20160413')
+            # 
+        
+            arrow.get('2016-W07-5')
+            # 
+        
+            pendulum.parse('2016-W07-5')
+            # 
+        
+            # Working with DST
+            just_before = arrow.Arrow(2013, 3, 31, 1, 59, 59, 999999, 'Europe/Paris')
+            just_after = just_before.replace(microseconds=1)
+            '2013-03-31T02:00:00+02:00'
+            # Should be 2013-03-31T03:00:00+02:00
+        
+            (just_after.to('utc') - just_before.to('utc')).total_seconds()
+            -3599.999999
+            # Should be 1e-06
+        
+            just_before = pendulum.datetime(2013, 3, 31, 1, 59, 59, 999999, 'Europe/Paris')
+            just_after = just_before.add(microseconds=1)
+            '2013-03-31T03:00:00+02:00'
+        
+            (just_after.in_timezone('utc') - just_before.in_timezone('utc')).total_seconds()
+            1e-06
+        
+        Those are a few examples showing that Arrow cannot always be trusted to have a consistent
+        behavior with the data you are passing to it.
+        
+        
+        Limitations
+        ===========
+        
+        Even though the ``DateTime`` class is a subclass of ``datetime`` there are some rare cases where
+        it can't replace the native class directly. Here is a list (non-exhaustive) of the reported cases with
+        a possible solution, if any:
+        
+        * ``sqlite3`` will use the ``type()`` function to determine the type of the object by default. To work around it you can register a new adapter:
+        
+        .. code-block:: python
+        
+            from pendulum import DateTime
+            from sqlite3 import register_adapter
+        
+            register_adapter(DateTime, lambda val: val.isoformat(' '))
+        
+        * ``mysqlclient`` (former ``MySQLdb``) and ``PyMySQL`` will use the ``type()`` function to determine the type of the object by default. To work around it you can register a new adapter:
+        
+        .. code-block:: python
+        
+            import MySQLdb.converters
+            import pymysql.converters
+        
+            from pendulum import DateTime
+        
+            MySQLdb.converters.conversions[DateTime] = MySQLdb.converters.DateTime2literal
+            pymysql.converters.conversions[DateTime] = pymysql.converters.escape_datetime
+        
+        * ``django`` will use the ``isoformat()`` method to store datetimes in the database. However since ``pendulum`` is always timezone aware the offset information will always be returned by ``isoformat()`` raising an error, at least for MySQL databases. To work around it you can either create your own ``DateTimeField`` or use the previous workaround for ``MySQLdb``:
+        
+        .. code-block:: python
+        
+            from django.db.models import DateTimeField as BaseDateTimeField
+            from pendulum import DateTime
+        
+        
+            class DateTimeField(BaseDateTimeField):
+        
+                def value_to_string(self, obj):
+                    val = self.value_from_object(obj)
+        
+                    if isinstance(value, DateTime):
+                        return value.to_datetime_string()
+        
+                    return '' if val is None else val.isoformat()
+        
+        
+        Resources
+        =========
+        
+        * `Official Website `_
+        * `Documentation `_
+        * `Issue Tracker `_
+        
+        
+        Contributing
+        ============
+        
+        Contributions are welcome, especially with localization.
+        
+        Getting started
+        ---------------
+        
+        To work on the Pendulum codebase, you'll want to clone the project locally
+        and install the required depedendencies via `poetry `_.
+        
+        .. code-block:: bash
+        
+            $ git clone git@github.com:sdispater/pendulum.git
+            $ poetry install
+        
+        Localization
+        ------------
+        
+        If you want to help with localization, there are two different cases: the locale already exists
+        or not.
+        
+        If the locale does not exist you will need to create it by using the ``clock`` utility:
+        
+        .. code-block:: bash
+        
+            ./clock locale create 
+        
+        It will generate a directory in ``pendulum/locales`` named after your locale, with the following
+        structure:
+        
+        .. code-block:: text
+        
+            /
+                - custom.py
+                - locale.py
+        
+        The ``locale.py`` file must not be modified. It contains the translations provided by
+        the CLDR database.
+        
+        The ``custom.py`` file is the one you want to modify. It contains the data needed
+        by Pendulum that are not provided by the CLDR database. You can take the `en `_
+        data as a reference to see which data is needed.
+        
+        You should also add tests for the created or modified locale.
+        
+Platform: UNKNOWN
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
diff --git a/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/requires.txt b/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/requires.txt
new file mode 100644
index 00000000000..d09fb16dd97
--- /dev/null
+++ b/tests/repositories/fixtures/installed/src/pendulum/pendulum.egg-info/requires.txt
@@ -0,0 +1,5 @@
+python-dateutil<3.0,>=2.6
+pytzdata>=2018.3
+
+[:python_version < "3.5"]
+typing<4.0,>=3.6
diff --git a/tests/repositories/fixtures/installed/vendor/py3.7/attrs-19.3.0.dist-info/METADATA b/tests/repositories/fixtures/installed/vendor/py3.7/attrs-19.3.0.dist-info/METADATA
new file mode 100644
index 00000000000..6c8d9f7d6eb
--- /dev/null
+++ b/tests/repositories/fixtures/installed/vendor/py3.7/attrs-19.3.0.dist-info/METADATA
@@ -0,0 +1,227 @@
+Metadata-Version: 2.1
+Name: attrs
+Version: 19.3.0
+Summary: Classes Without Boilerplate
+Home-page: https://www.attrs.org/
+Author: Hynek Schlawack
+Author-email: hs@ox.cx
+Maintainer: Hynek Schlawack
+Maintainer-email: hs@ox.cx
+License: MIT
+Project-URL: Documentation, https://www.attrs.org/
+Project-URL: Bug Tracker, https://github.com/python-attrs/attrs/issues
+Project-URL: Source Code, https://github.com/python-attrs/attrs
+Keywords: class,attribute,boilerplate
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Description-Content-Type: text/x-rst
+Provides-Extra: azure-pipelines
+Requires-Dist: coverage ; extra == 'azure-pipelines'
+Requires-Dist: hypothesis ; extra == 'azure-pipelines'
+Requires-Dist: pympler ; extra == 'azure-pipelines'
+Requires-Dist: pytest (>=4.3.0) ; extra == 'azure-pipelines'
+Requires-Dist: six ; extra == 'azure-pipelines'
+Requires-Dist: zope.interface ; extra == 'azure-pipelines'
+Requires-Dist: pytest-azurepipelines ; extra == 'azure-pipelines'
+Provides-Extra: dev
+Requires-Dist: coverage ; extra == 'dev'
+Requires-Dist: hypothesis ; extra == 'dev'
+Requires-Dist: pympler ; extra == 'dev'
+Requires-Dist: pytest (>=4.3.0) ; extra == 'dev'
+Requires-Dist: six ; extra == 'dev'
+Requires-Dist: zope.interface ; extra == 'dev'
+Requires-Dist: sphinx ; extra == 'dev'
+Requires-Dist: pre-commit ; extra == 'dev'
+Provides-Extra: docs
+Requires-Dist: sphinx ; extra == 'docs'
+Requires-Dist: zope.interface ; extra == 'docs'
+Provides-Extra: tests
+Requires-Dist: coverage ; extra == 'tests'
+Requires-Dist: hypothesis ; extra == 'tests'
+Requires-Dist: pympler ; extra == 'tests'
+Requires-Dist: pytest (>=4.3.0) ; extra == 'tests'
+Requires-Dist: six ; extra == 'tests'
+Requires-Dist: zope.interface ; extra == 'tests'
+
+.. image:: https://www.attrs.org/en/latest/_static/attrs_logo.png
+   :alt: attrs Logo
+
+======================================
+``attrs``: Classes Without Boilerplate
+======================================
+
+.. image:: https://readthedocs.org/projects/attrs/badge/?version=stable
+   :target: https://www.attrs.org/en/stable/?badge=stable
+   :alt: Documentation Status
+
+.. image:: https://attrs.visualstudio.com/attrs/_apis/build/status/python-attrs.attrs?branchName=master
+   :target: https://attrs.visualstudio.com/attrs/_build/latest?definitionId=1&branchName=master
+   :alt: CI Status
+
+.. image:: https://codecov.io/github/python-attrs/attrs/branch/master/graph/badge.svg
+   :target: https://codecov.io/github/python-attrs/attrs
+   :alt: Test Coverage
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :target: https://github.com/psf/black
+   :alt: Code style: black
+
+.. teaser-begin
+
+``attrs`` is the Python package that will bring back the **joy** of **writing classes** by relieving you from the drudgery of implementing object protocols (aka `dunder `_ methods).
+
+Its main goal is to help you to write **concise** and **correct** software without slowing down your code.
+
+.. -spiel-end-
+
+For that, it gives you a class decorator and a way to declaratively define the attributes on that class:
+
+.. -code-begin-
+
+.. code-block:: pycon
+
+   >>> import attr
+
+   >>> @attr.s
+   ... class SomeClass(object):
+   ...     a_number = attr.ib(default=42)
+   ...     list_of_numbers = attr.ib(factory=list)
+   ...
+   ...     def hard_math(self, another_number):
+   ...         return self.a_number + sum(self.list_of_numbers) * another_number
+
+
+   >>> sc = SomeClass(1, [1, 2, 3])
+   >>> sc
+   SomeClass(a_number=1, list_of_numbers=[1, 2, 3])
+
+   >>> sc.hard_math(3)
+   19
+   >>> sc == SomeClass(1, [1, 2, 3])
+   True
+   >>> sc != SomeClass(2, [3, 2, 1])
+   True
+
+   >>> attr.asdict(sc)
+   {'a_number': 1, 'list_of_numbers': [1, 2, 3]}
+
+   >>> SomeClass()
+   SomeClass(a_number=42, list_of_numbers=[])
+
+   >>> C = attr.make_class("C", ["a", "b"])
+   >>> C("foo", "bar")
+   C(a='foo', b='bar')
+
+
+After *declaring* your attributes ``attrs`` gives you:
+
+- a concise and explicit overview of the class's attributes,
+- a nice human-readable ``__repr__``,
+- a complete set of comparison methods (equality and ordering),
+- an initializer,
+- and much more,
+
+*without* writing dull boilerplate code again and again and *without* runtime performance penalties.
+
+On Python 3.6 and later, you can often even drop the calls to ``attr.ib()`` by using `type annotations `_.
+
+This gives you the power to use actual classes with actual types in your code instead of confusing ``tuple``\ s or `confusingly behaving `_ ``namedtuple``\ s.
+Which in turn encourages you to write *small classes* that do `one thing well `_.
+Never again violate the `single responsibility principle `_ just because implementing ``__init__`` et al is a painful drag.
+
+
+.. -testimonials-
+
+Testimonials
+============
+
+**Amber Hawkie Brown**, Twisted Release Manager and Computer Owl:
+
+  Writing a fully-functional class using attrs takes me less time than writing this testimonial.
+
+
+**Glyph Lefkowitz**, creator of `Twisted `_, `Automat `_, and other open source software, in `The One Python Library Everyone Needs `_:
+
+  I’m looking forward to is being able to program in Python-with-attrs everywhere.
+  It exerts a subtle, but positive, design influence in all the codebases I’ve see it used in.
+
+
+**Kenneth Reitz**, creator of `Requests `_ (`on paper no less `_!):
+
+  attrs—classes for humans.  I like it.
+
+
+**Łukasz Langa**, creator of `Black `_, prolific Python core developer, and release manager for Python 3.8 and 3.9:
+
+  I'm increasingly digging your attr.ocity. Good job!
+
+
+.. -end-
+
+.. -project-information-
+
+Getting Help
+============
+
+Please use the ``python-attrs`` tag on `StackOverflow `_ to get help.
+
+Answering questions of your fellow developers is also great way to help the project!
+
+
+Project Information
+===================
+
+``attrs`` is released under the `MIT `_ license,
+its documentation lives at `Read the Docs `_,
+the code on `GitHub `_,
+and the latest release on `PyPI `_.
+It’s rigorously tested on Python 2.7, 3.4+, and PyPy.
+
+We collect information on **third-party extensions** in our `wiki `_.
+Feel free to browse and add your own!
+
+If you'd like to contribute to ``attrs`` you're most welcome and we've written `a little guide `_ to get you started!
+
+
+Release Information
+===================
+
+19.3.0 (2019-10-15)
+-------------------
+
+Changes
+^^^^^^^
+
+- Fixed ``auto_attribs`` usage when default values cannot be compared directly with ``==``, such as ``numpy`` arrays.
+  `#585 `_
+
+`Full changelog `_.
+
+Credits
+=======
+
+``attrs`` is written and maintained by `Hynek Schlawack `_.
+
+The development is kindly supported by `Variomedia AG `_.
+
+A full list of contributors can be found in `GitHub's overview `_.
+
+It’s the spiritual successor of `characteristic `_ and aspires to fix some of it clunkiness and unfortunate decisions.
+Both were inspired by Twisted’s `FancyEqMixin `_ but both are implemented using class decorators because `subclassing is bad for you `_, m’kay?
diff --git a/tests/repositories/fixtures/legacy/missing-version.html b/tests/repositories/fixtures/legacy/missing-version.html
index 7be5f920fc9..2dfd07f3b80 100644
--- a/tests/repositories/fixtures/legacy/missing-version.html
+++ b/tests/repositories/fixtures/legacy/missing-version.html
@@ -8,4 +8,4 @@ 
      Links for poetry
      
     poetry-0.1.0-py3-none-any.whl
      
     
 
-
\ No newline at end of file
+
diff --git a/tests/repositories/fixtures/pypi.org/json/ipython/4.1.0rc1.json b/tests/repositories/fixtures/pypi.org/json/ipython/4.1.0rc1.json
index 0ce31fc0833..ca3a2cc8dc6 100644
--- a/tests/repositories/fixtures/pypi.org/json/ipython/4.1.0rc1.json
+++ b/tests/repositories/fixtures/pypi.org/json/ipython/4.1.0rc1.json
@@ -257,4 +257,4 @@
       "url": "https://files.pythonhosted.org/packages/71/f0/9d670266b840b8b921dc7106ecddd892f6fb893424883498e1ba3ec3a3a1/ipython-4.1.0rc1.zip"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/repositories/fixtures/pypi.org/json/poetry.json b/tests/repositories/fixtures/pypi.org/json/poetry.json
index d32efac1268..0d5536cd3fc 100644
--- a/tests/repositories/fixtures/pypi.org/json/poetry.json
+++ b/tests/repositories/fixtures/pypi.org/json/poetry.json
@@ -24,7 +24,7 @@
       "last_month": -1,
       "last_week": -1
     },
-    "home_page": "https://poetry.eustace.io/",
+    "home_page": "https://python-poetry.org/",
     "keywords": "packaging,dependency,poetry",
     "license": "MIT",
     "maintainer": "Sébastien Eustace",
@@ -34,9 +34,9 @@
     "platform": "",
     "project_url": "https://pypi.org/project/poetry/",
     "project_urls": {
-      "Documentation": "https://poetry.eustace.io/docs",
-      "Homepage": "https://poetry.eustace.io/",
-      "Repository": "https://github.com/sdispater/poetry"
+      "Documentation": "https://python-poetry.org/docs",
+      "Homepage": "https://python-poetry.org/",
+      "Repository": "https://github.com/python-poetry/poetry"
     },
     "release_url": "https://pypi.org/project/poetry/0.12.4/",
     "requires_dist": [
diff --git a/tests/repositories/fixtures/pypi.org/json/poetry/0.12.4.json b/tests/repositories/fixtures/pypi.org/json/poetry/0.12.4.json
index 91949eb4585..585f745921a 100644
--- a/tests/repositories/fixtures/pypi.org/json/poetry/0.12.4.json
+++ b/tests/repositories/fixtures/pypi.org/json/poetry/0.12.4.json
@@ -24,7 +24,7 @@
       "last_month": -1,
       "last_week": -1
     },
-    "home_page": "https://poetry.eustace.io/",
+    "home_page": "https://python-poetry.org/",
     "keywords": "packaging,dependency,poetry",
     "license": "MIT",
     "maintainer": "Sébastien Eustace",
@@ -34,9 +34,9 @@
     "platform": "",
     "project_url": "https://pypi.org/project/poetry/",
     "project_urls": {
-      "Documentation": "https://poetry.eustace.io/docs",
-      "Homepage": "https://poetry.eustace.io/",
-      "Repository": "https://github.com/sdispater/poetry"
+      "Documentation": "https://python-poetry.org/docs",
+      "Homepage": "https://python-poetry.org/",
+      "Repository": "https://github.com/python-poetry/poetry"
     },
     "release_url": "https://pypi.org/project/poetry/0.12.4/",
     "requires_dist": [
diff --git a/tests/repositories/fixtures/pypi.org/search/search.html b/tests/repositories/fixtures/pypi.org/search/search.html
new file mode 100644
index 00000000000..31ba434f866
--- /dev/null
+++ b/tests/repositories/fixtures/pypi.org/search/search.html
@@ -0,0 +1,6105 @@
+
+
+
+    
+    
+    
+
+    
+    
+
+
+
+    Search results · PyPI
+    
+
+    
+    
+    
+    
+    
+    
+    
+
+
+
+    
+
+    
+    
+
+
+    
+    
+    
+    
+    
+    
+
+    
+
+
+    
+
+    
+
+
+    
+    
+  
+
+  
+
+
+    
+    
+
+    
+
+    
      
+      
+      
+
+      
+    
      
+
+
+      
      
+
+
+
+
      
+
+
+
+
+
+      
      
+
+
      
+
+
+    
      
+      
      
+        
      
+
+          
      
+            
      
+              
+            
      
+
+            
+          
      
+
+
+          
      
+
+    
      
+  
+  
+
      
+  
      
+        
      
+      
      
+    
      
+
+
+    
      
+      
+    
      
+
+
+    
      
+
+
      
+  
      
+    
      
+      
      
+      
      
+        
+        
      
+          Filter by classifier
+        
      
+        
      
+        
+        
+
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+
+          
      
+            
+            
+          
      
+
+
+        
      
+      
      
+    
      
+
+    
      
+      
      Search results
      
+
+      
      
+        
      
+          
      
+
+            
      
+
+
+
+
+
+              1,847 projects
+
+
+
+                for "sqlalchemy"
+
+
+
+
+
+            
      
+
+          
      
+          
      
+
+            
+            
+            
+
+          
      
+        
      
+
+        
      
+
+          
+            
+          
+        
      
+
+
+        
      
+
+          
+
+
+
+
      
+
+
+  Previous
+
+
+
+
+
+
+
+    1
+
+
+
+    2
+
+
+
+    3
+
+
+
+    ...
+
+
+
+
+
+    93
+
+
+
+
+    Next
+
+
      
+
+        
      
+
+      
      
+    
      
+  
      
+
      
+
+    
      
+
+    
+
+
+    
      
+      
      
+        
        
+
+          
      • 
+            
+          
        • 
+
+          
      • 
+            
+          
        • 
+
+          
      • 
+            
+          
        • 
+
+          
      • 
+            
+          
        • 
+
+          
      • 
+            
+          
        • 
+
+          
      • 
+            
+          
        • 
+
+        
      
+      
      
+    
      
+
+
+
+
+
      
+  
      Supported by
      
+
+
+      
+        
+        Elastic
+        Search
+      
+
+
+
+      
+        
+        Pingdom
+        Monitoring
+      
+
+
+
+      
+        
+        Google
+        BigQuery
+      
+
+
+
+      
+        
+        Sentry
+        Error logging
+      
+
+
+
+      
+        
+        AWS
+        Cloud computing
+      
+
+
+
+      
+        
+        DataDog
+        Monitoring
+      
+
+
+
+      
+        
+        Fastly
+        CDN
+      
+
+
+
+      
+        
+        SignalFx
+        Supporter
+      
+
+
+
+      
+        
+        DigiCert
+        EV certificate
+      
+
+
+
+      
+        
+        StatusPage
+        Status page
+      
+
+
+
      
+
+
+
+
+
diff --git a/tests/repositories/test_auth.py b/tests/repositories/test_auth.py
index 8899bb4cbbd..2e5ab6cd752 100644
--- a/tests/repositories/test_auth.py
+++ b/tests/repositories/test_auth.py
@@ -8,9 +8,9 @@
 
 
 def test_auth_with_request_on_the_same_host():
-    auth = Auth("https://poetry.eustace.io", "foo", "bar")
+    auth = Auth("https://python-poetry.org", "foo", "bar")
 
-    request = Request("GET", "https://poetry.eustace.io/docs/")
+    request = Request("GET", "https://python-poetry.org/docs/")
     assert "Authorization" not in request.headers
 
     request = auth(request)
@@ -22,9 +22,9 @@ def test_auth_with_request_on_the_same_host():
 
 
 def test_auth_with_request_with_same_authentication():
-    auth = Auth("https://poetry.eustace.io", "foo", "bar")
+    auth = Auth("https://python-poetry.org", "foo", "bar")
 
-    request = Request("GET", "https://foo:bar@poetry.eustace.io/docs/")
+    request = Request("GET", "https://foo:bar@python-poetry.org/docs/")
     assert "Authorization" not in request.headers
 
     request = auth(request)
@@ -36,7 +36,7 @@ def test_auth_with_request_with_same_authentication():
 
 
 def test_auth_with_request_on_different_hosts():
-    auth = Auth("https://poetry.eustace.io", "foo", "bar")
+    auth = Auth("https://python-poetry.org", "foo", "bar")
 
     request = Request("GET", "https://pendulum.eustace.io/docs/")
     assert "Authorization" not in request.headers
diff --git a/tests/repositories/test_installed_repository.py b/tests/repositories/test_installed_repository.py
index 3465d1500a4..243c25d11ee 100644
--- a/tests/repositories/test_installed_repository.py
+++ b/tests/repositories/test_installed_repository.py
@@ -1,37 +1,78 @@
 from poetry.repositories.installed_repository import InstalledRepository
+from poetry.utils._compat import Path
+from poetry.utils._compat import metadata
+from poetry.utils._compat import zipp
 from poetry.utils.env import MockEnv as BaseMockEnv
 
 
-FREEZE_RESULTS = """cleo==0.6.8
--e git+https://github.com/sdispater/pendulum.git@bb058f6b78b2d28ef5d9a5e759cfa179a1a713d6#egg=pendulum
-orator===0.9.8
-"""
+FIXTURES_DIR = Path(__file__).parent / "fixtures"
+ENV_DIR = (FIXTURES_DIR / "installed").resolve()
+SITE_PACKAGES = ENV_DIR / "lib" / "python3.7" / "site-packages"
+SRC = ENV_DIR / "src"
+VENDOR_DIR = ENV_DIR / "vendor" / "py3.7"
+INSTALLED_RESULTS = [
+    metadata.PathDistribution(SITE_PACKAGES / "cleo-0.7.6.dist-info"),
+    metadata.PathDistribution(SRC / "pendulum" / "pendulum.egg-info"),
+    metadata.PathDistribution(
+        zipp.Path(str(SITE_PACKAGES / "foo-0.1.0-py3.8.egg"), "EGG-INFO")
+    ),
+    metadata.PathDistribution(VENDOR_DIR / "attrs-19.3.0.dist-info"),
+    metadata.PathDistribution(SITE_PACKAGES / "editable-2.3.4.dist-info"),
+]
 
 
 class MockEnv(BaseMockEnv):
-    def run(self, bin, *args):
-        if bin == "python" and args[:3] == ("-m", "pip", "freeze"):
-            return FREEZE_RESULTS
+    @property
+    def site_packages(self):  # type: () -> Path
+        return SITE_PACKAGES
 
-        return super(MockEnv, self).run(bin, *args)
 
+def test_load(mocker):
+    mocker.patch(
+        "poetry.utils._compat.metadata.Distribution.discover",
+        return_value=INSTALLED_RESULTS,
+    )
+    mocker.patch(
+        "poetry.core.vcs.git.Git.rev_parse",
+        return_value="bb058f6b78b2d28ef5d9a5e759cfa179a1a713d6",
+    )
+    mocker.patch(
+        "poetry.core.vcs.git.Git.remote_urls",
+        side_effect=[
+            {"remote.origin.url": "https://github.com/sdispater/pendulum.git"},
+            {"remote.origin.url": "git@github.com:sdispater/pendulum.git"},
+        ],
+    )
+    mocker.patch("poetry.repositories.installed_repository._VENDORS", str(VENDOR_DIR))
+    repository = InstalledRepository.load(MockEnv(path=ENV_DIR))
 
-def test_load():
-    repository = InstalledRepository.load(MockEnv())
-
-    assert len(repository.packages) == 3
+    assert len(repository.packages) == 4
 
     cleo = repository.packages[0]
     assert cleo.name == "cleo"
-    assert cleo.version.text == "0.6.8"
+    assert cleo.version.text == "0.7.6"
+    assert (
+        cleo.description
+        == "Cleo allows you to create beautiful and testable command-line interfaces."
+    )
+
+    foo = repository.packages[2]
+    assert foo.name == "foo"
+    assert foo.version.text == "0.1.0"
 
-    pendulum = repository.packages[1]
+    pendulum = repository.packages[3]
     assert pendulum.name == "pendulum"
-    assert pendulum.version.text == "0.0.0"
+    assert pendulum.version.text == "2.0.5"
+    assert pendulum.description == "Python datetimes made easy"
     assert pendulum.source_type == "git"
     assert pendulum.source_url == "https://github.com/sdispater/pendulum.git"
     assert pendulum.source_reference == "bb058f6b78b2d28ef5d9a5e759cfa179a1a713d6"
 
-    orator = repository.packages[2]
-    assert orator.name == "orator"
-    assert orator.version.text == "0.9.8"
+    for pkg in repository.packages:
+        assert pkg.name != "attrs"
+
+    editable = repository.packages[1]
+    assert "editable" == editable.name
+    assert "2.3.4" == editable.version.text
+    assert "directory" == editable.source_type
+    assert "/path/to/editable" == editable.source_url
diff --git a/tests/repositories/test_legacy_repository.py b/tests/repositories/test_legacy_repository.py
index 7fd94ecbe9c..dc7ef9aab79 100644
--- a/tests/repositories/test_legacy_repository.py
+++ b/tests/repositories/test_legacy_repository.py
@@ -1,12 +1,9 @@
-import pytest
 import shutil
 
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
+import pytest
 
-from poetry.packages import Dependency
+from poetry.core.packages import Dependency
+from poetry.repositories.auth import Auth
 from poetry.repositories.exceptions import PackageNotFound
 from poetry.repositories.legacy_repository import LegacyRepository
 from poetry.repositories.legacy_repository import Page
@@ -14,13 +11,19 @@
 from poetry.utils._compat import Path
 
 
+try:
+    import urllib.parse as urlparse
+except ImportError:
+    import urlparse
+
+
 class MockRepository(LegacyRepository):
 
     FIXTURES = Path(__file__).parent / "fixtures" / "legacy"
 
-    def __init__(self):
+    def __init__(self, auth=None):
         super(MockRepository, self).__init__(
-            "legacy", url="http://foo.bar", disable_cache=True
+            "legacy", url="http://legacy.foo.bar", auth=auth, disable_cache=True
         )
 
     def _get(self, endpoint):
@@ -47,7 +50,7 @@ def test_page_relative_links_path_are_correct():
     page = repo._get("/relative")
 
     for link in page.links:
-        assert link.netloc == "foo.bar"
+        assert link.netloc == "legacy.foo.bar"
         assert link.path.startswith("/relative/poetry")
 
 
@@ -81,6 +84,9 @@ def test_get_package_information_fallback_read_setup():
 
     package = repo.package("jupyter", "1.0.0")
 
+    assert package.source_type == "legacy"
+    assert package.source_reference == repo.name
+    assert package.source_url == repo.url
     assert package.name == "jupyter"
     assert package.version.text == "1.0.0"
     assert (
@@ -139,6 +145,10 @@ def test_find_packages_no_prereleases():
 
     assert len(packages) == 1
 
+    assert packages[0].source_type == "legacy"
+    assert packages[0].source_reference == repo.name
+    assert packages[0].source_url == repo.url
+
 
 def test_get_package_information_chooses_correct_distribution():
     repo = MockRepository()
@@ -242,11 +252,17 @@ def test_get_package_retrieves_non_sha256_hashes():
     package = repo.package("ipython", "7.5.0")
 
     expected = [
-        "md5:dbdc53e3918f28fa335a173432402a00",
-        "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+        {
+            "file": "ipython-7.5.0-py3-none-any.whl",
+            "hash": "md5:dbdc53e3918f28fa335a173432402a00",
+        },
+        {
+            "file": "ipython-7.5.0.tar.gz",
+            "hash": "sha256:e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26",
+        },
     ]
 
-    assert expected == package.hashes
+    assert expected == package.files
 
 
 def test_get_package_retrieves_packages_with_no_hashes():
@@ -254,4 +270,11 @@ def test_get_package_retrieves_packages_with_no_hashes():
 
     package = repo.package("jupyter", "1.0.0")
 
-    assert [] == package.hashes
+    assert [] == package.files
+
+
+def test_username_password_special_chars():
+    auth = Auth("http://legacy.foo.bar", "user:", "/%2Fp@ssword")
+    repo = MockRepository(auth=auth)
+
+    assert "http://user%3A:%2F%252Fp%40ssword@legacy.foo.bar" == repo.authenticated_url
diff --git a/tests/repositories/test_pool.py b/tests/repositories/test_pool.py
index 8d4b160de66..54a405e555a 100644
--- a/tests/repositories/test_pool.py
+++ b/tests/repositories/test_pool.py
@@ -2,8 +2,8 @@
 
 from poetry.repositories import Pool
 from poetry.repositories import Repository
-from poetry.repositories.legacy_repository import LegacyRepository
 from poetry.repositories.exceptions import PackageNotFound
+from poetry.repositories.legacy_repository import LegacyRepository
 
 
 def test_pool_raises_package_not_found_when_no_package_is_found():
diff --git a/tests/repositories/test_pypi_repository.py b/tests/repositories/test_pypi_repository.py
index 5650d42421e..be522bdb375 100644
--- a/tests/repositories/test_pypi_repository.py
+++ b/tests/repositories/test_pypi_repository.py
@@ -1,11 +1,18 @@
 import json
-import pytest
 import shutil
 
-from poetry.packages import Dependency
+from io import BytesIO
+
+import pytest
+
+from requests.exceptions import TooManyRedirects
+from requests.models import Response
+
+from poetry.core.packages import Dependency
 from poetry.repositories.pypi_repository import PyPiRepository
 from poetry.utils._compat import PY35
 from poetry.utils._compat import Path
+from poetry.utils._compat import encode
 
 
 class MockRepository(PyPiRepository):
@@ -185,3 +192,26 @@ def test_invalid_versions_ignored():
     # and a correct one.
     packages = repo.find_packages("pygame-music-grid")
     assert len(packages) == 1
+
+
+def test_get_should_invalid_cache_on_too_many_redirects_error(mocker):
+    delete_cache = mocker.patch("cachecontrol.caches.file_cache.FileCache.delete")
+
+    response = Response()
+    response.encoding = "utf-8"
+    response.raw = BytesIO(encode('{"foo": "bar"}'))
+    mocker.patch(
+        "cachecontrol.adapter.CacheControlAdapter.send",
+        side_effect=[TooManyRedirects(), response],
+    )
+    repository = PyPiRepository()
+    repository._get("https://pypi.org/pypi/async-timeout/json")
+
+    assert delete_cache.called
+
+
+def test_urls():
+    repository = PyPiRepository()
+
+    assert "https://pypi.org/simple/" == repository.url
+    assert "https://pypi.org/simple/" == repository.authenticated_url
diff --git a/tests/semver/__init__.py b/tests/semver/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/semver/test_main.py b/tests/semver/test_main.py
deleted file mode 100644
index d6df3560d2d..00000000000
--- a/tests/semver/test_main.py
+++ /dev/null
@@ -1,196 +0,0 @@
-import pytest
-
-from poetry.semver import parse_constraint
-from poetry.semver import Version
-from poetry.semver import VersionRange
-from poetry.semver import VersionUnion
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("*", VersionRange()),
-        ("*.*", VersionRange()),
-        ("v*.*", VersionRange()),
-        ("*.x.*", VersionRange()),
-        ("x.X.x.*", VersionRange()),
-        # ('!=1.0.0', Constraint('!=', '1.0.0.0')),
-        (">1.0.0", VersionRange(min=Version(1, 0, 0))),
-        ("<1.2.3", VersionRange(max=Version(1, 2, 3))),
-        ("<=1.2.3", VersionRange(max=Version(1, 2, 3), include_max=True)),
-        (">=1.2.3", VersionRange(min=Version(1, 2, 3), include_min=True)),
-        ("=1.2.3", Version(1, 2, 3)),
-        ("1.2.3", Version(1, 2, 3)),
-        ("=1.0", Version(1, 0, 0)),
-        ("1.2.3b5", Version(1, 2, 3, pre="b5")),
-        (">= 1.2.3", VersionRange(min=Version(1, 2, 3), include_min=True)),
-        (">dev", VersionRange(min=Version(0, 0, pre="dev"))),  # Issue 206
-    ],
-)
-def test_parse_constraint(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("v2.*", VersionRange(Version(2, 0, 0), Version(3, 0, 0), True)),
-        ("2.*.*", VersionRange(Version(2, 0, 0), Version(3, 0, 0), True)),
-        ("20.*", VersionRange(Version(20, 0, 0), Version(21, 0, 0), True)),
-        ("20.*.*", VersionRange(Version(20, 0, 0), Version(21, 0, 0), True)),
-        ("2.0.*", VersionRange(Version(2, 0, 0), Version(2, 1, 0), True)),
-        ("2.x", VersionRange(Version(2, 0, 0), Version(3, 0, 0), True)),
-        ("2.x.x", VersionRange(Version(2, 0, 0), Version(3, 0, 0), True)),
-        ("2.2.X", VersionRange(Version(2, 2, 0), Version(2, 3, 0), True)),
-        ("0.*", VersionRange(max=Version(1, 0, 0))),
-        ("0.*.*", VersionRange(max=Version(1, 0, 0))),
-        ("0.x", VersionRange(max=Version(1, 0, 0))),
-    ],
-)
-def test_parse_constraint_wildcard(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("~v1", VersionRange(Version(1, 0, 0), Version(2, 0, 0), True)),
-        ("~1.0", VersionRange(Version(1, 0, 0), Version(1, 1, 0), True)),
-        ("~1.0.0", VersionRange(Version(1, 0, 0), Version(1, 1, 0), True)),
-        ("~1.2", VersionRange(Version(1, 2, 0), Version(1, 3, 0), True)),
-        ("~1.2.3", VersionRange(Version(1, 2, 3), Version(1, 3, 0), True)),
-        (
-            "~1.2-beta",
-            VersionRange(Version(1, 2, 0, pre="beta"), Version(1, 3, 0), True),
-        ),
-        ("~1.2-b2", VersionRange(Version(1, 2, 0, pre="b2"), Version(1, 3, 0), True)),
-        ("~0.3", VersionRange(Version(0, 3, 0), Version(0, 4, 0), True)),
-        ("~3.5", VersionRange(Version(3, 5, 0), Version(3, 6, 0), True)),
-        ("~=3.5", VersionRange(Version(3, 5, 0), Version(4, 0, 0), True)),  # PEP 440
-        ("~=3.5.3", VersionRange(Version(3, 5, 0), Version(3, 6, 0), True)),  # PEP 440
-    ],
-)
-def test_parse_constraint_tilde(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        ("^v1", VersionRange(Version(1, 0, 0), Version(2, 0, 0), True)),
-        ("^0", VersionRange(Version(0, 0, 0), Version(1, 0, 0), True)),
-        ("^0.0", VersionRange(Version(0, 0, 0), Version(0, 1, 0), True)),
-        ("^1.2", VersionRange(Version(1, 2, 0), Version(2, 0, 0), True)),
-        (
-            "^1.2.3-beta.2",
-            VersionRange(Version(1, 2, 3, pre="beta.2"), Version(2, 0, 0), True),
-        ),
-        ("^1.2.3", VersionRange(Version(1, 2, 3), Version(2, 0, 0), True)),
-        ("^0.2.3", VersionRange(Version(0, 2, 3), Version(0, 3, 0), True)),
-        ("^0.2", VersionRange(Version(0, 2, 0), Version(0, 3, 0), True)),
-        ("^0.2.0", VersionRange(Version(0, 2, 0), Version(0, 3, 0), True)),
-        ("^0.0.3", VersionRange(Version(0, 0, 3), Version(0, 0, 4), True)),
-    ],
-)
-def test_parse_constraint_caret(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input",
-    [
-        ">2.0,<=3.0",
-        ">2.0 <=3.0",
-        ">2.0  <=3.0",
-        ">2.0, <=3.0",
-        ">2.0 ,<=3.0",
-        ">2.0 , <=3.0",
-        ">2.0   , <=3.0",
-        "> 2.0   <=  3.0",
-        "> 2.0  ,  <=  3.0",
-        "  > 2.0  ,  <=  3.0 ",
-    ],
-)
-def test_parse_constraint_multi(input):
-    assert parse_constraint(input) == VersionRange(
-        Version(2, 0, 0), Version(3, 0, 0), include_min=False, include_max=True
-    )
-
-
-@pytest.mark.parametrize(
-    "input",
-    [">=2.7,!=3.0.*,!=3.1.*", ">=2.7, !=3.0.*, !=3.1.*", ">= 2.7, != 3.0.*, != 3.1.*"],
-)
-def test_parse_constraint_multi_wilcard(input):
-    assert parse_constraint(input) == VersionUnion(
-        VersionRange(Version(2, 7, 0), Version(3, 0, 0), True, False),
-        VersionRange(Version(3, 2, 0), None, True, False),
-    )
-
-
-@pytest.mark.parametrize(
-    "input,constraint",
-    [
-        (
-            "!=v2.*",
-            VersionRange(max=Version.parse("2.0")).union(
-                VersionRange(Version.parse("3.0"), include_min=True)
-            ),
-        ),
-        (
-            "!=2.*.*",
-            VersionRange(max=Version.parse("2.0")).union(
-                VersionRange(Version.parse("3.0"), include_min=True)
-            ),
-        ),
-        (
-            "!=2.0.*",
-            VersionRange(max=Version.parse("2.0")).union(
-                VersionRange(Version.parse("2.1"), include_min=True)
-            ),
-        ),
-        ("!=0.*", VersionRange(Version.parse("1.0"), include_min=True)),
-        ("!=0.*.*", VersionRange(Version.parse("1.0"), include_min=True)),
-    ],
-)
-def test_parse_constraints_negative_wildcard(input, constraint):
-    assert parse_constraint(input) == constraint
-
-
-@pytest.mark.parametrize(
-    "input, expected",
-    [
-        ("1", "1"),
-        ("1.2", "1.2"),
-        ("1.2.3", "1.2.3"),
-        ("!=1", "!=1"),
-        ("!=1.2", "!=1.2"),
-        ("!=1.2.3", "!=1.2.3"),
-        ("^1", ">=1,<2"),
-        ("^1.0", ">=1.0,<2.0"),
-        ("^1.0.0", ">=1.0.0,<2.0.0"),
-        ("~1", ">=1,<2"),
-        ("~1.0", ">=1.0,<1.1"),
-        ("~1.0.0", ">=1.0.0,<1.1.0"),
-    ],
-)
-def test_constraints_keep_version_precision(input, expected):
-    assert str(parse_constraint(input)) == expected
-
-
-@pytest.mark.parametrize(
-    "unsorted, sorted_",
-    [
-        (["1.0.3", "1.0.2", "1.0.1"], ["1.0.1", "1.0.2", "1.0.3"]),
-        (["1.0.0.2", "1.0.0.0rc2"], ["1.0.0.0rc2", "1.0.0.2"]),
-        (["1.0.0.0", "1.0.0.0rc2"], ["1.0.0.0rc2", "1.0.0.0"]),
-        (["1.0.0.0.0", "1.0.0.0rc2"], ["1.0.0.0rc2", "1.0.0.0.0"]),
-        (["1.0.0rc2", "1.0.0rc1"], ["1.0.0rc1", "1.0.0rc2"]),
-        (["1.0.0rc2", "1.0.0b1"], ["1.0.0b1", "1.0.0rc2"]),
-    ],
-)
-def test_versions_are_sortable(unsorted, sorted_):
-    unsorted = [parse_constraint(u) for u in unsorted]
-    sorted_ = [parse_constraint(s) for s in sorted_]
-
-    assert sorted(unsorted) == sorted_
diff --git a/tests/semver/test_version.py b/tests/semver/test_version.py
deleted file mode 100644
index b05167dd5dd..00000000000
--- a/tests/semver/test_version.py
+++ /dev/null
@@ -1,165 +0,0 @@
-import pytest
-
-from poetry.semver import EmptyConstraint
-from poetry.semver import Version
-from poetry.semver import VersionRange
-from poetry.semver.exceptions import ParseVersionError
-
-
-@pytest.mark.parametrize(
-    "input,version",
-    [
-        ("1.0.0", Version(1, 0, 0)),
-        ("1", Version(1, 0, 0)),
-        ("1.0", Version(1, 0, 0)),
-        ("1b1", Version(1, 0, 0, pre="beta1")),
-        ("1.0b1", Version(1, 0, 0, pre="beta1")),
-        ("1.0.0b1", Version(1, 0, 0, pre="beta1")),
-        ("1.0.0-b1", Version(1, 0, 0, pre="beta1")),
-        ("1.0.0-beta.1", Version(1, 0, 0, pre="beta1")),
-        ("1.0.0+1", Version(1, 0, 0, build="1")),
-        ("1.0.0-1", Version(1, 0, 0, build="1")),
-        ("1.0.0.0", Version(1, 0, 0)),
-        ("1.0.0-post", Version(1, 0, 0)),
-        ("1.0.0-post1", Version(1, 0, 0, build="1")),
-        ("0.6c", Version(0, 6, 0, pre="rc0")),
-        ("0.6pre", Version(0, 6, 0, pre="rc0")),
-    ],
-)
-def test_parse_valid(input, version):
-    parsed = Version.parse(input)
-
-    assert parsed == version
-    assert parsed.text == input
-
-
-@pytest.mark.parametrize("input", [(None, "example")])
-def test_parse_invalid(input):
-    with pytest.raises(ParseVersionError):
-        Version.parse(input)
-
-
-def test_comparison():
-    versions = [
-        "1.0.0-alpha",
-        "1.0.0-alpha.1",
-        "1.0.0-beta.2",
-        "1.0.0-beta.11",
-        "1.0.0-rc.1",
-        "1.0.0-rc.1+build.1",
-        "1.0.0",
-        "1.0.0+0.3.7",
-        "1.3.7+build",
-        "1.3.7+build.2.b8f12d7",
-        "1.3.7+build.11.e0f985a",
-        "2.0.0",
-        "2.1.0",
-        "2.2.0",
-        "2.11.0",
-        "2.11.1",
-    ]
-
-    for i in range(len(versions)):
-        for j in range(len(versions)):
-            a = Version.parse(versions[i])
-            b = Version.parse(versions[j])
-
-            assert (a < b) == (i < j)
-            assert (a > b) == (i > j)
-            assert (a <= b) == (i <= j)
-            assert (a >= b) == (i >= j)
-            assert (a == b) == (i == j)
-            assert (a != b) == (i != j)
-
-
-def test_equality():
-    assert Version.parse("1.2.3") == Version.parse("01.2.3")
-    assert Version.parse("1.2.3") == Version.parse("1.02.3")
-    assert Version.parse("1.2.3") == Version.parse("1.2.03")
-    assert Version.parse("1.2.3-1") == Version.parse("1.2.3-01")
-    assert Version.parse("1.2.3+1") == Version.parse("1.2.3+01")
-
-
-def test_allows():
-    v = Version.parse("1.2.3")
-    assert v.allows(v)
-    assert not v.allows(Version.parse("2.2.3"))
-    assert not v.allows(Version.parse("1.3.3"))
-    assert not v.allows(Version.parse("1.2.4"))
-    assert not v.allows(Version.parse("1.2.3-dev"))
-    assert not v.allows(Version.parse("1.2.3+build"))
-
-
-def test_allows_all():
-    v = Version.parse("1.2.3")
-
-    assert v.allows_all(v)
-    assert not v.allows_all(Version.parse("0.0.3"))
-    assert not v.allows_all(
-        VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4"))
-    )
-    assert not v.allows_all(VersionRange())
-    assert v.allows_all(EmptyConstraint())
-
-
-def test_allows_any():
-    v = Version.parse("1.2.3")
-
-    assert v.allows_any(v)
-    assert not v.allows_any(Version.parse("0.0.3"))
-    assert v.allows_any(VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4")))
-    assert v.allows_any(VersionRange())
-    assert not v.allows_any(EmptyConstraint())
-
-
-def test_intersect():
-    v = Version.parse("1.2.3")
-
-    assert v.intersect(v) == v
-    assert v.intersect(Version.parse("1.1.4")).is_empty()
-    assert (
-        v.intersect(VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4"))) == v
-    )
-    assert (
-        Version.parse("1.1.4")
-        .intersect(VersionRange(v, Version.parse("1.2.4")))
-        .is_empty()
-    )
-
-
-def test_union():
-    v = Version.parse("1.2.3")
-
-    assert v.union(v) == v
-
-    result = v.union(Version.parse("0.8.0"))
-    assert result.allows(v)
-    assert result.allows(Version.parse("0.8.0"))
-    assert not result.allows(Version.parse("1.1.4"))
-
-    range = VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4"))
-    assert v.union(range) == range
-
-    union = Version.parse("1.1.4").union(
-        VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4"))
-    )
-    assert union == VersionRange(
-        Version.parse("1.1.4"), Version.parse("1.2.4"), include_min=True
-    )
-
-    result = v.union(VersionRange(Version.parse("0.0.3"), Version.parse("1.1.4")))
-    assert result.allows(v)
-    assert result.allows(Version.parse("0.1.0"))
-
-
-def test_difference():
-    v = Version.parse("1.2.3")
-
-    assert v.difference(v).is_empty()
-    assert v.difference(Version.parse("0.8.0")) == v
-    assert v.difference(
-        VersionRange(Version.parse("1.1.4"), Version.parse("1.2.4"))
-    ).is_empty()
-    assert (
-        v.difference(VersionRange(Version.parse("1.4.0"), Version.parse("3.0.0"))) == v
-    )
diff --git a/tests/semver/test_version_range.py b/tests/semver/test_version_range.py
deleted file mode 100644
index fa5cde59be4..00000000000
--- a/tests/semver/test_version_range.py
+++ /dev/null
@@ -1,260 +0,0 @@
-import pytest
-
-from poetry.semver import EmptyConstraint
-from poetry.semver import Version
-from poetry.semver import VersionRange
-
-
-@pytest.fixture()
-def v003():
-    return Version.parse("0.0.3")
-
-
-@pytest.fixture()
-def v010():
-    return Version.parse("0.1.0")
-
-
-@pytest.fixture()
-def v080():
-    return Version.parse("0.8.0")
-
-
-@pytest.fixture()
-def v072():
-    return Version.parse("0.7.2")
-
-
-@pytest.fixture()
-def v114():
-    return Version.parse("1.1.4")
-
-
-@pytest.fixture()
-def v123():
-    return Version.parse("1.2.3")
-
-
-@pytest.fixture()
-def v124():
-    return Version.parse("1.2.4")
-
-
-@pytest.fixture()
-def v130():
-    return Version.parse("1.3.0")
-
-
-@pytest.fixture()
-def v140():
-    return Version.parse("1.4.0")
-
-
-@pytest.fixture()
-def v200():
-    return Version.parse("2.0.0")
-
-
-@pytest.fixture()
-def v234():
-    return Version.parse("2.3.4")
-
-
-@pytest.fixture()
-def v250():
-    return Version.parse("2.5.0")
-
-
-@pytest.fixture()
-def v300():
-    return Version.parse("3.0.0")
-
-
-def test_allows_all(v003, v010, v080, v114, v123, v124, v140, v200, v234, v250, v300):
-    assert VersionRange(v123, v250).allows_all(EmptyConstraint())
-
-    range = VersionRange(v123, v250, include_max=True)
-    assert not range.allows_all(v123)
-    assert range.allows_all(v124)
-    assert range.allows_all(v250)
-    assert not range.allows_all(v300)
-
-    # with no min
-    range = VersionRange(max=v250)
-    assert range.allows_all(VersionRange(v080, v140))
-    assert not range.allows_all(VersionRange(v080, v300))
-    assert range.allows_all(VersionRange(max=v140))
-    assert not range.allows_all(VersionRange(max=v300))
-    assert range.allows_all(range)
-    assert not range.allows_all(VersionRange())
-
-    # with no max
-    range = VersionRange(min=v010)
-    assert range.allows_all(VersionRange(v080, v140))
-    assert not range.allows_all(VersionRange(v003, v140))
-    assert range.allows_all(VersionRange(v080))
-    assert not range.allows_all(VersionRange(v003))
-    assert range.allows_all(range)
-    assert not range.allows_all(VersionRange())
-
-    # Allows bordering range that is not more inclusive
-    exclusive = VersionRange(v010, v250)
-    inclusive = VersionRange(v010, v250, True, True)
-    assert inclusive.allows_all(exclusive)
-    assert inclusive.allows_all(inclusive)
-    assert not exclusive.allows_all(inclusive)
-    assert exclusive.allows_all(exclusive)
-
-    # Allows unions that are completely contained
-    range = VersionRange(v114, v200)
-    assert range.allows_all(VersionRange(v123, v124).union(v140))
-    assert not range.allows_all(VersionRange(v010, v124).union(v140))
-    assert not range.allows_all(VersionRange(v123, v234).union(v140))
-
-
-def test_allows_any(
-    v003, v010, v072, v080, v114, v123, v124, v140, v200, v234, v250, v300
-):
-    # disallows an empty constraint
-    assert not VersionRange(v123, v250).allows_any(EmptyConstraint())
-
-    # allows allowed versions
-    range = VersionRange(v123, v250, include_max=True)
-    assert not range.allows_any(v123)
-    assert range.allows_any(v124)
-    assert range.allows_any(v250)
-    assert not range.allows_any(v300)
-
-    # with no min
-    range = VersionRange(max=v200)
-    assert range.allows_any(VersionRange(v140, v300))
-    assert not range.allows_any(VersionRange(v234, v300))
-    assert range.allows_any(VersionRange(v140))
-    assert not range.allows_any(VersionRange(v234))
-    assert range.allows_any(range)
-
-    # with no max
-    range = VersionRange(min=v072)
-    assert range.allows_any(VersionRange(v003, v140))
-    assert not range.allows_any(VersionRange(v003, v010))
-    assert range.allows_any(VersionRange(max=v080))
-    assert not range.allows_any(VersionRange(max=v003))
-    assert range.allows_any(range)
-
-    # with min and max
-    range = VersionRange(v072, v200)
-    assert range.allows_any(VersionRange(v003, v140))
-    assert range.allows_any(VersionRange(v140, v300))
-    assert not range.allows_any(VersionRange(v003, v010))
-    assert not range.allows_any(VersionRange(v234, v300))
-    assert not range.allows_any(VersionRange(max=v010))
-    assert not range.allows_any(VersionRange(v234))
-    assert range.allows_any(range)
-
-    # allows a bordering range when both are inclusive
-    assert not VersionRange(max=v250).allows_any(VersionRange(min=v250))
-    assert not VersionRange(max=v250, include_max=True).allows_any(
-        VersionRange(min=v250)
-    )
-    assert not VersionRange(max=v250).allows_any(
-        VersionRange(min=v250, include_min=True)
-    )
-    assert not VersionRange(min=v250).allows_any(VersionRange(max=v250))
-    assert VersionRange(max=v250, include_max=True).allows_any(
-        VersionRange(min=v250, include_min=True)
-    )
-
-    # allows unions that are partially contained'
-    range = VersionRange(v114, v200)
-    assert range.allows_any(VersionRange(v010, v080).union(v140))
-    assert range.allows_any(VersionRange(v123, v234).union(v300))
-    assert not range.allows_any(VersionRange(v234, v300).union(v010))
-
-    # pre-release min does not allow lesser than itself
-    range = VersionRange(Version.parse("1.9b1"), include_min=True)
-    assert not range.allows_any(
-        VersionRange(
-            Version.parse("1.8.0"),
-            Version.parse("1.9.0"),
-            include_min=True,
-            always_include_max_prerelease=True,
-        )
-    )
-
-
-def test_intersect(v114, v123, v124, v200, v250, v300):
-    # two overlapping ranges
-    assert VersionRange(v123, v250).intersect(VersionRange(v200, v300)) == VersionRange(
-        v200, v250
-    )
-
-    # a non-overlapping range allows no versions
-    a = VersionRange(v114, v124)
-    b = VersionRange(v200, v250)
-    assert a.intersect(b).is_empty()
-
-    # adjacent ranges allow no versions if exclusive
-    a = VersionRange(v114, v124)
-    b = VersionRange(v124, v200)
-    assert a.intersect(b).is_empty()
-
-    # adjacent ranges allow version if inclusive
-    a = VersionRange(v114, v124, include_max=True)
-    b = VersionRange(v124, v200, include_min=True)
-    assert a.intersect(b) == v124
-
-    # with an open range
-    open = VersionRange()
-    a = VersionRange(v114, v124)
-    assert open.intersect(open) == open
-    assert open.intersect(a) == a
-
-    # returns the version if the range allows it
-    assert VersionRange(v114, v124).intersect(v123) == v123
-    assert VersionRange(v123, v124).intersect(v114).is_empty()
-
-
-def test_union(
-    v003, v010, v072, v080, v114, v123, v124, v130, v140, v200, v234, v250, v300
-):
-    # with a version returns the range if it contains the version
-    range = VersionRange(v114, v124)
-    assert range.union(v123) == range
-
-    # with a version on the edge of the range, expands the range
-    range = VersionRange(v114, v124)
-    assert range.union(v124) == VersionRange(v114, v124, include_max=True)
-    assert range.union(v114) == VersionRange(v114, v124, include_min=True)
-
-    # with a version allows both the range and the version if the range
-    # doesn't contain the version
-    result = VersionRange(v003, v114).union(v124)
-    assert result.allows(v010)
-    assert not result.allows(v123)
-    assert result.allows(v124)
-
-    # returns a VersionUnion for a disjoint range
-    result = VersionRange(v003, v114).union(VersionRange(v130, v200))
-    assert result.allows(v080)
-    assert not result.allows(v123)
-    assert result.allows(v140)
-
-    # considers open ranges disjoint
-    result = VersionRange(v003, v114).union(VersionRange(v114, v200))
-    assert result.allows(v080)
-    assert not result.allows(v114)
-    assert result.allows(v140)
-    result = VersionRange(v114, v200).union(VersionRange(v003, v114))
-    assert result.allows(v080)
-    assert not result.allows(v114)
-    assert result.allows(v140)
-
-    # returns a merged range for an overlapping range
-    result = VersionRange(v003, v114).union(VersionRange(v080, v200))
-    assert result == VersionRange(v003, v200)
-
-    # considers closed ranges overlapping
-    result = VersionRange(v003, v114, include_max=True).union(VersionRange(v114, v200))
-    assert result == VersionRange(v003, v200)
-    result = VersionRange(v003, v114).union(VersionRange(v114, v200, include_min=True))
-    assert result == VersionRange(v003, v200)
diff --git a/tests/spdx/__init__.py b/tests/spdx/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/spdx/test_license.py b/tests/spdx/test_license.py
deleted file mode 100644
index 2589045063c..00000000000
--- a/tests/spdx/test_license.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from poetry.spdx import license_by_id
-
-
-def test_classifier_name():
-    license = license_by_id("lgpl-3.0-or-later")
-
-    assert (
-        license.classifier_name
-        == "GNU Lesser General Public License v3 or later (LGPLv3+)"
-    )
-
-
-def test_classifier_name_no_classifer_osi_approved():
-    license = license_by_id("LiLiQ-R-1.1")
-
-    assert license.classifier_name is None
-
-
-def test_classifier_name_no_classifer():
-    license = license_by_id("Leptonica")
-
-    assert license.classifier_name == "Other/Proprietary License"
-
-
-def test_classifier():
-    license = license_by_id("lgpl-3.0-or-later")
-
-    assert license.classifier == (
-        "License :: "
-        "OSI Approved :: "
-        "GNU Lesser General Public License v3 or later (LGPLv3+)"
-    )
-
-
-def test_classifier_no_classifer_osi_approved():
-    license = license_by_id("LiLiQ-R-1.1")
-
-    assert license.classifier == "License :: OSI Approved"
-
-
-def test_classifier_no_classifer():
-    license = license_by_id("Leptonica")
-
-    assert license.classifier == "License :: Other/Proprietary License"
-
-
-def test_proprietary_license():
-    license = license_by_id("Proprietary")
-
-    assert "License :: Other/Proprietary License" == license.classifier
diff --git a/tests/spdx/test_main.py b/tests/spdx/test_main.py
deleted file mode 100644
index 00e0910044d..00000000000
--- a/tests/spdx/test_main.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import pytest
-
-from poetry.spdx import license_by_id
-
-
-def test_license_by_id():
-    license = license_by_id("MIT")
-
-    assert license.id == "MIT"
-    assert license.name == "MIT License"
-    assert license.is_osi_approved
-    assert not license.is_deprecated
-
-    license = license_by_id("LGPL-3.0-or-later")
-
-    assert license.id == "LGPL-3.0-or-later"
-    assert license.name == "GNU Lesser General Public License v3.0 or later"
-    assert license.is_osi_approved
-    assert not license.is_deprecated
-
-
-def test_license_by_id_is_case_insensitive():
-    license = license_by_id("mit")
-
-    assert license.id == "MIT"
-
-    license = license_by_id("miT")
-
-    assert license.id == "MIT"
-
-
-def test_license_by_id_with_full_name():
-    license = license_by_id("GNU Lesser General Public License v3.0 or later")
-
-    assert license.id == "LGPL-3.0-or-later"
-    assert license.name == "GNU Lesser General Public License v3.0 or later"
-    assert license.is_osi_approved
-    assert not license.is_deprecated
-
-
-def test_license_by_id_invalid():
-    with pytest.raises(ValueError):
-        license_by_id("invalid")
diff --git a/tests/test_factory.py b/tests/test_factory.py
index ae63054b08e..37e000c0a99 100644
--- a/tests/test_factory.py
+++ b/tests/test_factory.py
@@ -4,7 +4,6 @@
 
 import pytest
 
-from poetry.io.null_io import NullIO
 from poetry.factory import Factory
 from poetry.utils._compat import PY2
 from poetry.utils._compat import Path
@@ -28,8 +27,8 @@ def test_create_poetry():
         package.readme.relative_to(fixtures_dir).as_posix()
         == "sample_project/README.rst"
     )
-    assert package.homepage == "https://poetry.eustace.io"
-    assert package.repository_url == "https://github.com/sdispater/poetry"
+    assert package.homepage == "https://python-poetry.org"
+    assert package.repository_url == "https://github.com/python-poetry/poetry"
     assert package.keywords == ["packaging", "dependency", "poetry"]
 
     assert package.python_versions == "~2.7 || ^3.6"
@@ -107,15 +106,14 @@ def test_create_poetry():
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ]
 
 
 def test_create_poetry_with_packages_and_includes():
-    poetry = Factory().create_poetry(
-        fixtures_dir.parent / "masonry" / "builders" / "fixtures" / "with-include"
-    )
+    poetry = Factory().create_poetry(fixtures_dir / "with-include")
 
     package = poetry.package
 
@@ -129,7 +127,10 @@ def test_create_poetry_with_packages_and_includes():
         {"include": "src_package", "from": "src"},
     ]
 
-    assert package.include == ["extra_dir/vcs_excluded.txt", "notes.txt"]
+    assert package.include == [
+        {"path": "extra_dir/vcs_excluded.txt", "format": []},
+        {"path": "notes.txt", "format": []},
+    ]
 
 
 def test_create_poetry_with_multi_constraints_dependency():
diff --git a/tests/utils/fixtures/pyproject.toml b/tests/utils/fixtures/pyproject.toml
index 393667ad845..09455111204 100644
--- a/tests/utils/fixtures/pyproject.toml
+++ b/tests/utils/fixtures/pyproject.toml
@@ -9,9 +9,9 @@ license = "MIT"
 
 readme = "README.md"
 
-homepage = "https://poetry.eustace.io/"
-repository = "https://github.com/sdispater/poetry"
-documentation = "https://poetry.eustace.io/docs"
+homepage = "https://python-poetry.org/"
+repository = "https://github.com/python-poetry/poetry"
+documentation = "https://python-poetry.org/docs"
 
 keywords = ["packaging", "dependency", "poetry"]
 
diff --git a/tests/utils/fixtures/setups/pendulum/setup.py b/tests/utils/fixtures/setups/pendulum/setup.py
index 702e08f4ce1..3a6323fbbdf 100644
--- a/tests/utils/fixtures/setups/pendulum/setup.py
+++ b/tests/utils/fixtures/setups/pendulum/setup.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from distutils.core import setup
 
+from build import *
+
 packages = [
     "pendulum",
     "pendulum._extensions",
@@ -45,7 +47,6 @@
     "extras_require": extras_require,
     "python_requires": ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
 }
-from build import *
 
 build(setup_kwargs)
 
diff --git a/tests/utils/fixtures/setups/setuptools_setup/setup.py b/tests/utils/fixtures/setups/setuptools_setup/setup.py
new file mode 100644
index 00000000000..807d8c702fe
--- /dev/null
+++ b/tests/utils/fixtures/setups/setuptools_setup/setup.py
@@ -0,0 +1,11 @@
+import setuptools
+
+setuptools.setup(
+    name="my_package",
+    version="0.1.2",
+    author="John Doe",
+    author_email="john@example.orh",
+    description="Just a description",
+    url="https://example.org",
+    packages=setuptools.find_packages(),
+)
diff --git a/tests/utils/fixtures/setups/with-setup-cfg/setup.py b/tests/utils/fixtures/setups/with-setup-cfg/setup.py
index b024da80e9c..606849326a4 100644
--- a/tests/utils/fixtures/setups/with-setup-cfg/setup.py
+++ b/tests/utils/fixtures/setups/with-setup-cfg/setup.py
@@ -1,4 +1,3 @@
 from setuptools import setup
 
-
 setup()
diff --git a/tests/utils/fixtures/test.toml b/tests/utils/fixtures/test.toml
index 5df96d4214c..4f2d733b731 100644
--- a/tests/utils/fixtures/test.toml
+++ b/tests/utils/fixtures/test.toml
@@ -89,5 +89,3 @@ trimmed in raw strings.
 points = [ { x = 1, y = 2, z = 3 },         # This value is so special to me
            { x = 7, y = 8, z = 9 },
            { x = 2, y = 4, z = 8 } ]
-
-
diff --git a/tests/utils/test_env.py b/tests/utils/test_env.py
index 8154c842771..800fc9b60f4 100644
--- a/tests/utils/test_env.py
+++ b/tests/utils/test_env.py
@@ -1,17 +1,23 @@
 import os
-import pytest
 import shutil
 import sys
+
+import pytest
 import tomlkit
+
 from clikit.io import NullIO
-from poetry.semver import Version
 
+from poetry.core.semver import Version
+from poetry.factory import Factory
 from poetry.utils._compat import Path
-from poetry.utils.env import EnvManager
 from poetry.utils.env import EnvCommandError
+from poetry.utils.env import EnvManager
+from poetry.utils.env import NoCompatiblePythonVersionFound
+from poetry.utils.env import SystemEnv
 from poetry.utils.env import VirtualEnv
 from poetry.utils.toml_file import TomlFile
 
+
 MINIMAL_SCRIPT = """\
 
 print("Minimal Output"),
@@ -25,32 +31,58 @@
 """
 
 
-def test_virtualenvs_with_spaces_in_their_path_work_as_expected(tmp_dir, config):
+class MockVirtualEnv(VirtualEnv):
+    def __init__(self, path, base=None, sys_path=None):
+        super(MockVirtualEnv, self).__init__(path, base=base)
+
+        self._sys_path = sys_path
+
+    @property
+    def sys_path(self):
+        if self._sys_path is not None:
+            return self._sys_path
+
+        return super(MockVirtualEnv, self).sys_path
+
+
+@pytest.fixture()
+def poetry(config):
+    poetry = Factory().create_poetry(
+        Path(__file__).parent.parent / "fixtures" / "simple_project"
+    )
+    poetry.set_config(config)
+
+    return poetry
+
+
+@pytest.fixture()
+def manager(poetry):
+    return EnvManager(poetry)
+
+
+def test_virtualenvs_with_spaces_in_their_path_work_as_expected(tmp_dir, manager):
     venv_path = Path(tmp_dir) / "Virtual Env"
 
-    EnvManager(config).build_venv(str(venv_path))
+    manager.build_venv(str(venv_path))
 
     venv = VirtualEnv(venv_path)
 
     assert venv.run("python", "-V", shell=True).startswith("Python")
 
 
-def test_env_get_in_project_venv(tmp_dir, config):
+def test_env_get_in_project_venv(manager, poetry):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    (Path(tmp_dir) / ".venv").mkdir()
+    (poetry.file.parent / ".venv").mkdir()
 
-    venv = EnvManager(config).get(Path(tmp_dir))
+    venv = manager.get()
 
-    assert venv.path == Path(tmp_dir) / ".venv"
+    assert venv.path == poetry.file.parent / ".venv"
 
     shutil.rmtree(str(venv.path))
 
 
-CWD = Path(__file__).parent.parent / "fixtures" / "simple_project"
-
-
 def build_venv(path, executable=None):
     os.mkdir(path)
 
@@ -72,7 +104,7 @@ def check_output(cmd, *args, **kwargs):
 
 
 def test_activate_activates_non_existing_virtualenv_no_envs_file(
-    tmp_dir, config, mocker
+    tmp_dir, manager, poetry, config, mocker
 ):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
@@ -89,8 +121,8 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
     )
     m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
 
-    env = EnvManager(config).activate("python3.7", CWD, NullIO())
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    env = manager.activate("python3.7", NullIO())
+    venv_name = EnvManager.generate_env_name("simple-project", str(poetry.file.parent))
 
     m.assert_called_with(
         os.path.join(tmp_dir, "{}-py3.7".format(venv_name)), executable="python3.7"
@@ -106,11 +138,13 @@ def test_activate_activates_non_existing_virtualenv_no_envs_file(
     assert env.base == Path("/prefix")
 
 
-def test_activate_activates_existing_virtualenv_no_envs_file(tmp_dir, config, mocker):
+def test_activate_activates_existing_virtualenv_no_envs_file(
+    tmp_dir, manager, poetry, config, mocker
+):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
 
     os.mkdir(os.path.join(tmp_dir, "{}-py3.7".format(venv_name)))
 
@@ -126,7 +160,7 @@ def test_activate_activates_existing_virtualenv_no_envs_file(tmp_dir, config, mo
     )
     m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
 
-    env = EnvManager(config).activate("python3.7", CWD, NullIO())
+    env = manager.activate("python3.7", NullIO())
 
     m.assert_not_called()
 
@@ -140,11 +174,13 @@ def test_activate_activates_existing_virtualenv_no_envs_file(tmp_dir, config, mo
     assert env.base == Path("/prefix")
 
 
-def test_activate_activates_same_virtualenv_with_envs_file(tmp_dir, config, mocker):
+def test_activate_activates_same_virtualenv_with_envs_file(
+    tmp_dir, manager, poetry, config, mocker
+):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
 
     envs_file = TomlFile(Path(tmp_dir) / "envs.toml")
     doc = tomlkit.document()
@@ -165,7 +201,7 @@ def test_activate_activates_same_virtualenv_with_envs_file(tmp_dir, config, mock
     )
     m = mocker.patch("poetry.utils.env.EnvManager.create_venv")
 
-    env = EnvManager(config).activate("python3.7", CWD, NullIO())
+    env = manager.activate("python3.7", NullIO())
 
     m.assert_not_called()
 
@@ -179,12 +215,12 @@ def test_activate_activates_same_virtualenv_with_envs_file(tmp_dir, config, mock
 
 
 def test_activate_activates_different_virtualenv_with_envs_file(
-    tmp_dir, config, mocker
+    tmp_dir, manager, poetry, config, mocker
 ):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     envs_file = TomlFile(Path(tmp_dir) / "envs.toml")
     doc = tomlkit.document()
     doc[venv_name] = {"minor": "3.7", "patch": "3.7.1"}
@@ -204,7 +240,7 @@ def test_activate_activates_different_virtualenv_with_envs_file(
     )
     m = mocker.patch("poetry.utils.env.EnvManager.build_venv", side_effect=build_venv)
 
-    env = EnvManager(config).activate("python3.6", CWD, NullIO())
+    env = manager.activate("python3.6", NullIO())
 
     m.assert_called_with(
         os.path.join(tmp_dir, "{}-py3.6".format(venv_name)), executable="python3.6"
@@ -219,11 +255,13 @@ def test_activate_activates_different_virtualenv_with_envs_file(
     assert env.base == Path("/prefix")
 
 
-def test_activate_activates_recreates_for_different_patch(tmp_dir, config, mocker):
+def test_activate_activates_recreates_for_different_patch(
+    tmp_dir, manager, poetry, config, mocker
+):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     envs_file = TomlFile(Path(tmp_dir) / "envs.toml")
     doc = tomlkit.document()
     doc[venv_name] = {"minor": "3.7", "patch": "3.7.0"}
@@ -254,7 +292,7 @@ def test_activate_activates_recreates_for_different_patch(tmp_dir, config, mocke
         "poetry.utils.env.EnvManager.remove_venv", side_effect=remove_venv
     )
 
-    env = EnvManager(config).activate("python3.7", CWD, NullIO())
+    env = manager.activate("python3.7", NullIO())
 
     build_venv_m.assert_called_with(
         os.path.join(tmp_dir, "{}-py3.7".format(venv_name)), executable="python3.7"
@@ -273,11 +311,13 @@ def test_activate_activates_recreates_for_different_patch(tmp_dir, config, mocke
     assert (Path(tmp_dir) / "{}-py3.7".format(venv_name)).exists()
 
 
-def test_activate_does_not_recreate_when_switching_minor(tmp_dir, config, mocker):
+def test_activate_does_not_recreate_when_switching_minor(
+    tmp_dir, manager, poetry, config, mocker
+):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     envs_file = TomlFile(Path(tmp_dir) / "envs.toml")
     doc = tomlkit.document()
     doc[venv_name] = {"minor": "3.7", "patch": "3.7.0"}
@@ -303,7 +343,7 @@ def test_activate_does_not_recreate_when_switching_minor(tmp_dir, config, mocker
         "poetry.utils.env.EnvManager.remove_venv", side_effect=remove_venv
     )
 
-    env = EnvManager(config).activate("python3.6", CWD, NullIO())
+    env = manager.activate("python3.6", NullIO())
 
     build_venv_m.assert_not_called()
     remove_venv_m.assert_not_called()
@@ -318,11 +358,13 @@ def test_activate_does_not_recreate_when_switching_minor(tmp_dir, config, mocker
     assert (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists()
 
 
-def test_deactivate_non_activated_but_existing(tmp_dir, config, mocker):
+def test_deactivate_non_activated_but_existing(
+    tmp_dir, manager, poetry, config, mocker
+):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
 
     (
         Path(tmp_dir)
@@ -336,8 +378,8 @@ def test_deactivate_non_activated_but_existing(tmp_dir, config, mocker):
         side_effect=check_output_wrapper(),
     )
 
-    EnvManager(config).deactivate(CWD, NullIO())
-    env = EnvManager(config).get(CWD)
+    manager.deactivate(NullIO())
+    env = manager.get()
 
     assert env.path == Path(tmp_dir) / "{}-py{}".format(
         venv_name, ".".join(str(c) for c in sys.version_info[:2])
@@ -345,11 +387,11 @@ def test_deactivate_non_activated_but_existing(tmp_dir, config, mocker):
     assert Path("/prefix")
 
 
-def test_deactivate_activated(tmp_dir, config, mocker):
+def test_deactivate_activated(tmp_dir, manager, poetry, config, mocker):
     if "VIRTUAL_ENV" in os.environ:
         del os.environ["VIRTUAL_ENV"]
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     version = Version.parse(".".join(str(c) for c in sys.version_info[:3]))
     other_version = Version.parse("3.4") if version.major == 2 else version.next_minor
     (
@@ -375,8 +417,8 @@ def test_deactivate_activated(tmp_dir, config, mocker):
         side_effect=check_output_wrapper(),
     )
 
-    EnvManager(config).deactivate(CWD, NullIO())
-    env = EnvManager(config).get(CWD)
+    manager.deactivate(NullIO())
+    env = manager.get()
 
     assert env.path == Path(tmp_dir) / "{}-py{}.{}".format(
         venv_name, version.major, version.minor
@@ -388,11 +430,11 @@ def test_deactivate_activated(tmp_dir, config, mocker):
 
 
 def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
-    tmp_dir, config, mocker
+    tmp_dir, manager, poetry, config, mocker
 ):
     os.environ["VIRTUAL_ENV"] = "/environment/prefix"
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
 
     config.merge({"virtualenvs": {"path": str(tmp_dir)}})
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
@@ -411,30 +453,30 @@ def test_get_prefers_explicitly_activated_virtualenvs_over_env_var(
         side_effect=[("/prefix", None)],
     )
 
-    env = EnvManager(config).get(CWD)
+    env = manager.get()
 
     assert env.path == Path(tmp_dir) / "{}-py3.7".format(venv_name)
     assert env.base == Path("/prefix")
 
 
-def test_list(tmp_dir, config):
+def test_list(tmp_dir, manager, poetry, config):
     config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
 
-    venvs = EnvManager(config).list(CWD)
+    venvs = manager.list()
 
     assert 2 == len(venvs)
     assert (Path(tmp_dir) / "{}-py3.6".format(venv_name)) == venvs[0].path
     assert (Path(tmp_dir) / "{}-py3.7".format(venv_name)) == venvs[1].path
 
 
-def test_remove_by_python_version(tmp_dir, config, mocker):
+def test_remove_by_python_version(tmp_dir, manager, poetry, config, mocker):
     config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
 
@@ -443,18 +485,16 @@ def test_remove_by_python_version(tmp_dir, config, mocker):
         side_effect=check_output_wrapper(Version.parse("3.6.6")),
     )
 
-    manager = EnvManager(config)
-
-    venv = manager.remove("3.6", CWD)
+    venv = manager.remove("3.6")
 
     assert (Path(tmp_dir) / "{}-py3.6".format(venv_name)) == venv.path
     assert not (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists()
 
 
-def test_remove_by_name(tmp_dir, config, mocker):
+def test_remove_by_name(tmp_dir, manager, poetry, config, mocker):
     config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
 
@@ -463,18 +503,16 @@ def test_remove_by_name(tmp_dir, config, mocker):
         side_effect=check_output_wrapper(Version.parse("3.6.6")),
     )
 
-    manager = EnvManager(config)
-
-    venv = manager.remove("{}-py3.6".format(venv_name), CWD)
+    venv = manager.remove("{}-py3.6".format(venv_name))
 
     assert (Path(tmp_dir) / "{}-py3.6".format(venv_name)) == venv.path
     assert not (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists()
 
 
-def test_remove_also_deactivates(tmp_dir, config, mocker):
+def test_remove_also_deactivates(tmp_dir, manager, poetry, config, mocker):
     config.merge({"virtualenvs": {"path": str(tmp_dir)}})
 
-    venv_name = EnvManager.generate_env_name("simple_project", str(CWD))
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
     (Path(tmp_dir) / "{}-py3.7".format(venv_name)).mkdir()
     (Path(tmp_dir) / "{}-py3.6".format(venv_name)).mkdir()
 
@@ -488,9 +526,7 @@ def test_remove_also_deactivates(tmp_dir, config, mocker):
     doc[venv_name] = {"minor": "3.6", "patch": "3.6.6"}
     envs_file.write(doc)
 
-    manager = EnvManager(config)
-
-    venv = manager.remove("python3.6", CWD)
+    venv = manager.remove("python3.6")
 
     assert (Path(tmp_dir) / "{}-py3.6".format(venv_name)) == venv.path
     assert not (Path(tmp_dir) / "{}-py3.6".format(venv_name)).exists()
@@ -499,22 +535,10 @@ def test_remove_also_deactivates(tmp_dir, config, mocker):
     assert venv_name not in envs
 
 
-@pytest.fixture
-def tmp_venv(tmp_dir, config, request):
-    venv_path = Path(tmp_dir) / "venv"
-
-    EnvManager(config).build_venv(str(venv_path))
-
-    venv = VirtualEnv(venv_path)
-    yield venv
-
-    shutil.rmtree(str(venv.path))
-
-
 def test_env_has_symlinks_on_nix(tmp_dir, tmp_venv):
     venv_available = False
     try:
-        from venv import EnvBuilder
+        from venv import EnvBuilder  # noqa
 
         venv_available = True
     except ImportError:
@@ -533,8 +557,240 @@ def test_run_with_input(tmp_dir, tmp_venv):
 def test_run_with_input_non_zero_return(tmp_dir, tmp_venv):
 
     with pytest.raises(EnvCommandError) as processError:
-
         # Test command that will return non-zero returncode.
-        result = tmp_venv.run("python", "-", input_=ERRORING_SCRIPT)
+        tmp_venv.run("python", "-", input_=ERRORING_SCRIPT)
 
     assert processError.value.e.returncode == 1
+
+
+def test_create_venv_tries_to_find_a_compatible_python_executable_using_generic_ones_first(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    poetry.package.python_versions = "^3.6"
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
+
+    mocker.patch("sys.version_info", (2, 7, 16))
+    mocker.patch(
+        "poetry.utils._compat.subprocess.check_output",
+        side_effect=check_output_wrapper(Version.parse("3.7.5")),
+    )
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    manager.create_venv(NullIO())
+
+    m.assert_called_with(
+        str(Path("/foo/virtualenvs/{}-py3.7".format(venv_name))), executable="python3"
+    )
+
+
+def test_create_venv_tries_to_find_a_compatible_python_executable_using_specific_ones(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    poetry.package.python_versions = "^3.6"
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
+
+    mocker.patch("sys.version_info", (2, 7, 16))
+    mocker.patch(
+        "poetry.utils._compat.subprocess.check_output", side_effect=["3.5.3", "3.8.0"]
+    )
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    manager.create_venv(NullIO())
+
+    m.assert_called_with(
+        str(Path("/foo/virtualenvs/{}-py3.8".format(venv_name))), executable="python3.8"
+    )
+
+
+def test_create_venv_fails_if_no_compatible_python_version_could_be_found(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    poetry.package.python_versions = "^4.8"
+
+    mocker.patch(
+        "poetry.utils._compat.subprocess.check_output", side_effect=["", "", "", ""]
+    )
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    with pytest.raises(NoCompatiblePythonVersionFound) as e:
+        manager.create_venv(NullIO())
+
+    expected_message = (
+        "Poetry was unable to find a compatible version. "
+        "If you have one, you can explicitly use it "
+        'via the "env use" command.'
+    )
+
+    assert expected_message == str(e.value)
+    assert 0 == m.call_count
+
+
+def test_create_venv_does_not_try_to_find_compatible_versions_with_executable(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    poetry.package.python_versions = "^4.8"
+
+    mocker.patch("poetry.utils._compat.subprocess.check_output", side_effect=["3.8.0"])
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    with pytest.raises(NoCompatiblePythonVersionFound) as e:
+        manager.create_venv(NullIO(), executable="3.8")
+
+    expected_message = (
+        "The specified Python version (3.8.0) is not supported by the project (^4.8).\n"
+        "Please choose a compatible version or loosen the python constraint "
+        "specified in the pyproject.toml file."
+    )
+
+    assert expected_message == str(e.value)
+    assert 0 == m.call_count
+
+
+def test_create_venv_uses_patch_version_to_detect_compatibility(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    version = Version.parse(".".join(str(c) for c in sys.version_info[:3]))
+    poetry.package.python_versions = "^{}".format(
+        ".".join(str(c) for c in sys.version_info[:3])
+    )
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
+
+    mocker.patch("sys.version_info", (version.major, version.minor, version.patch + 1))
+    check_output = mocker.patch(
+        "poetry.utils._compat.subprocess.check_output",
+        side_effect=check_output_wrapper(Version.parse("3.6.9")),
+    )
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    manager.create_venv(NullIO())
+
+    assert not check_output.called
+    m.assert_called_with(
+        str(
+            Path(
+                "/foo/virtualenvs/{}-py{}.{}".format(
+                    venv_name, version.major, version.minor
+                )
+            )
+        ),
+        executable=None,
+    )
+
+
+def test_create_venv_uses_patch_version_to_detect_compatibility_with_executable(
+    manager, poetry, config, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    version = Version.parse(".".join(str(c) for c in sys.version_info[:3]))
+    poetry.package.python_versions = "~{}".format(
+        ".".join(str(c) for c in (version.major, version.minor - 1, 0))
+    )
+    venv_name = manager.generate_env_name("simple-project", str(poetry.file.parent))
+
+    check_output = mocker.patch(
+        "poetry.utils._compat.subprocess.check_output",
+        side_effect=check_output_wrapper(
+            Version.parse("{}.{}.0".format(version.major, version.minor - 1))
+        ),
+    )
+    m = mocker.patch(
+        "poetry.utils.env.EnvManager.build_venv", side_effect=lambda *args, **kwargs: ""
+    )
+
+    manager.create_venv(
+        NullIO(), executable="python{}.{}".format(version.major, version.minor - 1)
+    )
+
+    assert check_output.called
+    m.assert_called_with(
+        str(
+            Path(
+                "/foo/virtualenvs/{}-py{}.{}".format(
+                    venv_name, version.major, version.minor - 1
+                )
+            )
+        ),
+        executable="python{}.{}".format(version.major, version.minor - 1),
+    )
+
+
+def test_activate_with_in_project_setting_does_not_fail_if_no_venvs_dir(
+    manager, poetry, config, tmp_dir, mocker
+):
+    if "VIRTUAL_ENV" in os.environ:
+        del os.environ["VIRTUAL_ENV"]
+
+    config.merge(
+        {
+            "virtualenvs": {
+                "path": str(Path(tmp_dir) / "virtualenvs"),
+                "in-project": True,
+            }
+        }
+    )
+
+    mocker.patch(
+        "poetry.utils._compat.subprocess.check_output",
+        side_effect=check_output_wrapper(),
+    )
+    mocker.patch(
+        "poetry.utils._compat.subprocess.Popen.communicate",
+        side_effect=[("/prefix", None), ("/prefix", None)],
+    )
+    m = mocker.patch("poetry.utils.env.EnvManager.build_venv")
+
+    manager.activate("python3.7", NullIO())
+
+    m.assert_called_with(
+        os.path.join(str(poetry.file.parent), ".venv"), executable="python3.7"
+    )
+
+    envs_file = TomlFile(Path(tmp_dir) / "virtualenvs" / "envs.toml")
+    assert not envs_file.exists()
+
+
+def test_system_env_has_correct_paths():
+    env = SystemEnv(Path(sys.prefix))
+
+    paths = env.paths
+
+    assert paths.get("purelib") is not None
+    assert paths.get("platlib") is not None
+    assert paths.get("scripts") is not None
+    assert env.site_packages == Path(paths["purelib"])
+
+
+def test_venv_has_correct_paths(tmp_venv):
+    paths = tmp_venv.paths
+
+    assert paths.get("purelib") is not None
+    assert paths.get("platlib") is not None
+    assert paths.get("scripts") is not None
+    assert tmp_venv.site_packages == Path(paths["purelib"])
diff --git a/tests/utils/test_exporter.py b/tests/utils/test_exporter.py
index ccb8ecf248b..0c05c907629 100644
--- a/tests/utils/test_exporter.py
+++ b/tests/utils/test_exporter.py
@@ -603,7 +603,7 @@ def test_exporter_can_export_requirements_txt_with_file_packages(tmp_dir, poetry
         content = f.read()
 
     expected = """\
--e tests/fixtures/distributions/demo-0.1.0.tar.gz
+tests/fixtures/distributions/demo-0.1.0.tar.gz
 """
 
     assert expected == content
@@ -644,7 +644,7 @@ def test_exporter_can_export_requirements_txt_with_file_packages_and_markers(
         content = f.read()
 
     expected = """\
--e tests/fixtures/distributions/demo-0.1.0.tar.gz; python_version < "3.7"
+tests/fixtures/distributions/demo-0.1.0.tar.gz; python_version < "3.7"
 """
 
     assert expected == content
@@ -707,6 +707,86 @@ def test_exporter_exports_requirements_txt_with_legacy_packages(tmp_dir, poetry)
     assert expected == content
 
 
+def test_exporter_exports_requirements_txt_with_legacy_packages_and_duplicate_sources(
+    tmp_dir, poetry
+):
+    poetry.pool.add_repository(
+        LegacyRepository(
+            "custom",
+            "https://example.com/simple",
+            auth=Auth("https://example.com/simple", "foo", "bar"),
+        )
+    )
+    poetry.pool.add_repository(LegacyRepository("custom", "https://foobaz.com/simple",))
+    poetry.locker.mock_lock_data(
+        {
+            "package": [
+                {
+                    "name": "foo",
+                    "version": "1.2.3",
+                    "category": "main",
+                    "optional": False,
+                    "python-versions": "*",
+                    "source": {
+                        "type": "legacy",
+                        "url": "https://example.com/simple",
+                        "reference": "",
+                    },
+                },
+                {
+                    "name": "bar",
+                    "version": "4.5.6",
+                    "category": "dev",
+                    "optional": False,
+                    "python-versions": "*",
+                    "source": {
+                        "type": "legacy",
+                        "url": "https://example.com/simple",
+                        "reference": "",
+                    },
+                },
+                {
+                    "name": "baz",
+                    "version": "7.8.9",
+                    "category": "dev",
+                    "optional": False,
+                    "python-versions": "*",
+                    "source": {
+                        "type": "legacy",
+                        "url": "https://foobaz.com/simple",
+                        "reference": "",
+                    },
+                },
+            ],
+            "metadata": {
+                "python-versions": "*",
+                "content-hash": "123456789",
+                "hashes": {"foo": ["12345"], "bar": ["67890"], "baz": ["24680"]},
+            },
+        }
+    )
+    exporter = Exporter(poetry)
+
+    exporter.export("requirements.txt", Path(tmp_dir), "requirements.txt", dev=True)
+
+    with (Path(tmp_dir) / "requirements.txt").open(encoding="utf-8") as f:
+        content = f.read()
+
+    expected = """\
+--extra-index-url https://example.com/simple
+--extra-index-url https://foobaz.com/simple
+
+bar==4.5.6 \\
+    --hash=sha256:67890
+baz==7.8.9 \\
+    --hash=sha256:24680
+foo==1.2.3 \\
+    --hash=sha256:12345
+"""
+
+    assert expected == content
+
+
 def test_exporter_exports_requirements_txt_with_legacy_packages_and_credentials(
     tmp_dir, poetry, config
 ):
diff --git a/tests/utils/test_extras.py b/tests/utils/test_extras.py
index 4bb03d19035..424ccc5ee9e 100644
--- a/tests/utils/test_extras.py
+++ b/tests/utils/test_extras.py
@@ -1,8 +1,8 @@
 import pytest
 
+from poetry.core.packages import Package
 from poetry.utils.extras import get_extra_package_names
 
-from poetry.packages import Package
 
 _PACKAGE_FOO = Package("foo", "0.1.0")
 _PACKAGE_SPAM = Package("spam", "0.2.0")
diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py
index 77ea9ff12b7..83bf2030780 100644
--- a/tests/utils/test_helpers.py
+++ b/tests/utils/test_helpers.py
@@ -1,5 +1,7 @@
-from poetry.utils.helpers import get_http_basic_auth
-from poetry.utils.helpers import parse_requires
+from poetry.core.utils.helpers import parse_requires
+from poetry.utils._compat import Path
+from poetry.utils.helpers import get_cert
+from poetry.utils.helpers import get_client_cert
 
 
 def test_parse_requires():
@@ -26,7 +28,10 @@ def test_parse_requires():
 pathlib2>=2.3.0.0,<3.0.0.0
 
 [:python_version >= "3.4.0.0" and python_version < "3.6.0.0"]
-zipfile36>=0.1.0.0,<0.2.0.0    
+zipfile36>=0.1.0.0,<0.2.0.0
+
+[dev]
+isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort
 """
     result = parse_requires(requires)
     expected = [
@@ -43,25 +48,24 @@ def test_parse_requires():
         "msgpack-python>=0.5.0.0,<0.6.0.0",
         "pyparsing>=2.2.0.0,<3.0.0.0",
         "requests-toolbelt>=0.8.0.0,<0.9.0.0",
-        'typing>=3.6.0.0,<4.0.0.0; (python_version >= "2.7.0.0" and python_version < "2.8.0.0") or (python_version >= "3.4.0.0" and python_version < "3.5.0.0")',
-        'virtualenv>=15.2.0.0,<16.0.0.0; python_version >= "2.7.0.0" and python_version < "2.8.0.0"',
-        'pathlib2>=2.3.0.0,<3.0.0.0; python_version >= "2.7.0.0" and python_version < "2.8.0.0"',
-        'zipfile36>=0.1.0.0,<0.2.0.0; python_version >= "3.4.0.0" and python_version < "3.6.0.0"',
+        'typing>=3.6.0.0,<4.0.0.0 ; (python_version >= "2.7.0.0" and python_version < "2.8.0.0") or (python_version >= "3.4.0.0" and python_version < "3.5.0.0")',
+        'virtualenv>=15.2.0.0,<16.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"',
+        'pathlib2>=2.3.0.0,<3.0.0.0 ; python_version >= "2.7.0.0" and python_version < "2.8.0.0"',
+        'zipfile36>=0.1.0.0,<0.2.0.0 ; python_version >= "3.4.0.0" and python_version < "3.6.0.0"',
+        'isort@ git+git://github.com/timothycrosley/isort.git@e63ae06ec7d70b06df9e528357650281a3d3ec22#egg=isort ; extra == "dev"',
     ]
     assert result == expected
 
 
-def test_get_http_basic_auth(config):
-    config.merge({"http-basic": {"foo": {"username": "foo", "password": "bar"}}})
-
-    assert get_http_basic_auth(config, "foo") == ("foo", "bar")
-
+def test_get_cert(config):
+    ca_cert = "path/to/ca.pem"
+    config.merge({"certificates": {"foo": {"cert": ca_cert}}})
 
-def test_get_http_basic_auth_without_password(config):
-    config.merge({"http-basic": {"foo": {"username": "foo"}}})
+    assert get_cert(config, "foo") == Path(ca_cert)
 
-    assert get_http_basic_auth(config, "foo") == ("foo", None)
 
+def test_get_client_cert(config):
+    client_cert = "path/to/client.pem"
+    config.merge({"certificates": {"foo": {"client-cert": client_cert}}})
 
-def test_get_http_basic_auth_missing(config):
-    assert get_http_basic_auth(config, "foo") is None
+    assert get_client_cert(config, "foo") == Path(client_cert)
diff --git a/tests/utils/test_helpers_keyring.py b/tests/utils/test_helpers_keyring.py
deleted file mode 100644
index fab25793291..00000000000
--- a/tests/utils/test_helpers_keyring.py
+++ /dev/null
@@ -1,125 +0,0 @@
-from uuid import uuid4
-
-import pytest
-from keyring import set_keyring, get_keyring
-from keyring.backend import KeyringBackend
-from keyring.errors import KeyringError
-
-from poetry.utils.helpers import (
-    keyring_service_name,
-    keyring_repository_password_get,
-    keyring_repository_password_set,
-    keyring_repository_password_del,
-)
-
-
-class DictKeyring(KeyringBackend):
-    priority = 1
-
-    def __init__(self):
-        self._storage = dict()
-
-    def set_password(self, servicename, username, password):
-        if servicename not in self._storage:
-            self._storage[servicename] = dict()
-        self._storage[servicename][username] = password
-
-    def get_password(self, servicename, username):
-        if servicename in self._storage:
-            return self._storage[servicename].get(username)
-
-    def delete_password(self, servicename, username):
-        if servicename in self._storage:
-            if username in self._storage[servicename]:
-                del self._storage[servicename][username]
-            if not self._storage[servicename]:
-                del self._storage[servicename]
-
-
-class BrokenKeyring(KeyringBackend):
-    priority = 1
-
-    def set_password(self, servicename, username, password):
-        raise KeyringError()
-
-    def get_password(self, servicename, username):
-        raise KeyringError()
-
-    def delete_password(self, servicename, username):
-        raise KeyringError()
-
-
-@pytest.fixture
-def keyring():  # type: () -> KeyringBackend
-    k = DictKeyring()
-    set_keyring(k)
-    return k
-
-
-@pytest.fixture
-def broken_keyring():  # type: () -> KeyringBackend
-    k = BrokenKeyring()
-    set_keyring(k)
-    return k
-
-
-@pytest.fixture
-def repository():  # type: () -> str
-    return "test"
-
-
-@pytest.fixture
-def username():  # type: () -> str
-    return "username"
-
-
-@pytest.fixture
-def password():  # type: () -> str
-    return str(uuid4())
-
-
-def test_keyring_repository_password_get(keyring, repository, username, password):
-    keyring.set_password(keyring_service_name(repository), username, password)
-    assert keyring_repository_password_get(repository, username) == password
-
-
-def test_keyring_repository_password_get_not_set(keyring, repository, username):
-    assert keyring.get_password(keyring_service_name(repository), username) is None
-    assert keyring_repository_password_get(repository, username) is None
-
-
-def test_keyring_repository_password_get_broken(broken_keyring):
-    assert get_keyring() == broken_keyring
-    assert keyring_repository_password_get("repository", "username") is None
-
-
-def test_keyring_repository_password_set(keyring, repository, username, password):
-    keyring_repository_password_set(repository, username, password)
-    assert keyring.get_password(keyring_service_name(repository), username) == password
-
-
-def test_keyring_repository_password_set_broken(broken_keyring):
-    assert get_keyring() == broken_keyring
-
-    with pytest.raises(RuntimeError):
-        keyring_repository_password_set(repository, "username", "password")
-
-
-def test_keyring_repository_password_del(
-    keyring, config, repository, username, password
-):
-    keyring.set_password(keyring_service_name(repository), username, password)
-    config.merge({"http-basic": {repository: {"username": username}}})
-    keyring_repository_password_del(config, repository)
-    assert keyring.get_password(keyring_service_name(repository), username) is None
-
-
-def test_keyring_repository_password_del_not_set(keyring, config, repository, username):
-    config.merge({"http-basic": {repository: {"username": username}}})
-    keyring_repository_password_del(config, repository)
-    assert keyring.get_password(keyring_service_name(repository), username) is None
-
-
-def test_keyring_repository_password_del_broken(broken_keyring, config):
-    assert get_keyring() == broken_keyring
-    keyring_repository_password_del(config, "repository")
diff --git a/tests/utils/test_password_manager.py b/tests/utils/test_password_manager.py
new file mode 100644
index 00000000000..675d38b7bbc
--- /dev/null
+++ b/tests/utils/test_password_manager.py
@@ -0,0 +1,226 @@
+import os
+
+import pytest
+
+from keyring.backend import KeyringBackend
+
+from poetry.utils.password_manager import KeyRing
+from poetry.utils.password_manager import KeyRingError
+from poetry.utils.password_manager import PasswordManager
+
+
+class DummyBackend(KeyringBackend):
+    def __init__(self):
+        self._passwords = {}
+
+    @classmethod
+    def priority(cls):
+        return 42
+
+    def set_password(self, service, username, password):
+        self._passwords[service] = {username: password}
+
+    def get_password(self, service, username):
+        return self._passwords.get(service, {}).get(username)
+
+    def delete_password(self, service, username):
+        if service in self._passwords and username in self._passwords[service]:
+            del self._passwords[service][username]
+
+
+@pytest.fixture()
+def backend():
+    return DummyBackend()
+
+
+@pytest.fixture()
+def mock_available_backend(backend):
+    import keyring
+
+    keyring.set_keyring(backend)
+
+
+@pytest.fixture()
+def mock_unavailable_backend():
+    import keyring
+    from keyring.backends.fail import Keyring
+
+    keyring.set_keyring(Keyring())
+
+
+@pytest.fixture()
+def mock_chainer_backend(mocker):
+    from keyring.backends.fail import Keyring
+
+    mocker.patch("keyring.backend.get_all_keyring", [Keyring()])
+    import keyring
+    from keyring.backends.chainer import ChainerBackend
+
+    keyring.set_keyring(ChainerBackend())
+
+
+def test_set_http_password(config, mock_available_backend, backend):
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    manager.set_http_password("foo", "bar", "baz")
+
+    assert "baz" == backend.get_password("poetry-repository-foo", "bar")
+
+    auth = config.get("http-basic.foo")
+    assert "bar" == auth["username"]
+    assert "password" not in auth
+
+
+def test_get_http_auth(config, mock_available_backend, backend):
+    backend.set_password("poetry-repository-foo", "bar", "baz")
+    config.auth_config_source.add_property("http-basic.foo", {"username": "bar"})
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    auth = manager.get_http_auth("foo")
+
+    assert "bar" == auth["username"]
+    assert "baz" == auth["password"]
+
+
+def test_delete_http_password(config, mock_available_backend, backend):
+    backend.set_password("poetry-repository-foo", "bar", "baz")
+    config.auth_config_source.add_property("http-basic.foo", {"username": "bar"})
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    manager.delete_http_password("foo")
+
+    assert backend.get_password("poetry-repository-foo", "bar") is None
+    assert config.get("http-basic.foo") is None
+
+
+def test_set_pypi_token(config, mock_available_backend, backend):
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    manager.set_pypi_token("foo", "baz")
+
+    assert config.get("pypi-token.foo") is None
+
+    assert "baz" == backend.get_password("poetry-repository-foo", "__token__")
+
+
+def test_get_pypi_token(config, mock_available_backend, backend):
+    backend.set_password("poetry-repository-foo", "__token__", "baz")
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    assert "baz" == manager.get_pypi_token("foo")
+
+
+def test_delete_pypi_token(config, mock_available_backend, backend):
+    backend.set_password("poetry-repository-foo", "__token__", "baz")
+    manager = PasswordManager(config)
+
+    assert manager.keyring.is_available()
+    manager.delete_pypi_token("foo")
+
+    assert backend.get_password("poetry-repository-foo", "__token__") is None
+
+
+def test_set_http_password_with_unavailable_backend(config, mock_unavailable_backend):
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    manager.set_http_password("foo", "bar", "baz")
+
+    auth = config.get("http-basic.foo")
+    assert "bar" == auth["username"]
+    assert "baz" == auth["password"]
+
+
+def test_get_http_auth_with_unavailable_backend(config, mock_unavailable_backend):
+    config.auth_config_source.add_property(
+        "http-basic.foo", {"username": "bar", "password": "baz"}
+    )
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    auth = manager.get_http_auth("foo")
+
+    assert "bar" == auth["username"]
+    assert "baz" == auth["password"]
+
+
+def test_delete_http_password_with_unavailable_backend(
+    config, mock_unavailable_backend
+):
+    config.auth_config_source.add_property(
+        "http-basic.foo", {"username": "bar", "password": "baz"}
+    )
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    manager.delete_http_password("foo")
+
+    assert config.get("http-basic.foo") is None
+
+
+def test_set_pypi_token_with_unavailable_backend(config, mock_unavailable_backend):
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    manager.set_pypi_token("foo", "baz")
+
+    assert "baz" == config.get("pypi-token.foo")
+
+
+def test_get_pypi_token_with_unavailable_backend(config, mock_unavailable_backend):
+    config.auth_config_source.add_property("pypi-token.foo", "baz")
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    assert "baz" == manager.get_pypi_token("foo")
+
+
+def test_delete_pypi_token_with_unavailable_backend(config, mock_unavailable_backend):
+    config.auth_config_source.add_property("pypi-token.foo", "baz")
+    manager = PasswordManager(config)
+
+    assert not manager.keyring.is_available()
+    manager.delete_pypi_token("foo")
+
+    assert config.get("pypi-token.foo") is None
+
+
+def test_keyring_raises_errors_on_keyring_errors(mocker, mock_unavailable_backend):
+    mocker.patch("poetry.utils.password_manager.KeyRing._check")
+
+    key_ring = KeyRing("poetry")
+    with pytest.raises(KeyRingError):
+        key_ring.set_password("foo", "bar", "baz")
+
+    with pytest.raises(KeyRingError):
+        key_ring.get_password("foo", "bar")
+
+    with pytest.raises(KeyRingError):
+        key_ring.delete_password("foo", "bar")
+
+
+def test_keyring_with_chainer_backend_and_not_compatible_only_should_be_unavailable(
+    mock_chainer_backend,
+):
+    key_ring = KeyRing("poetry")
+
+    assert not key_ring.is_available()
+
+
+def test_get_http_auth_from_environment_variables(
+    environ, config, mock_available_backend
+):
+    os.environ["POETRY_HTTP_BASIC_FOO_USERNAME"] = "bar"
+    os.environ["POETRY_HTTP_BASIC_FOO_PASSWORD"] = "baz"
+
+    manager = PasswordManager(config)
+
+    auth = manager.get_http_auth("foo")
+
+    assert "bar" == auth["username"]
+    assert "baz" == auth["password"]
diff --git a/tests/utils/test_setup_reader.py b/tests/utils/test_setup_reader.py
index 6349e532bc1..f218b922611 100644
--- a/tests/utils/test_setup_reader.py
+++ b/tests/utils/test_setup_reader.py
@@ -166,3 +166,14 @@ def test_setup_reader_read_extras_require_with_variables(setup):
     assert expected_install_requires == result["install_requires"]
     assert expected_extras_require == result["extras_require"]
     assert expected_python_requires == result["python_requires"]
+
+
+@pytest.mark.skipif(not PY35, reason="AST parsing does not work for Python <3.4")
+def test_setup_reader_setuptools(setup):
+    result = SetupReader.read_from_directory(setup("setuptools_setup"))
+
+    expected_name = "my_package"
+    expected_version = "0.1.2"
+
+    assert expected_name == result["name"]
+    assert expected_version == result["version"]
diff --git a/tests/version/__init__.py b/tests/version/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/version/test_helpers.py b/tests/version/test_helpers.py
deleted file mode 100644
index db53fab9709..00000000000
--- a/tests/version/test_helpers.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from poetry.version.helpers import format_python_constraint
-from poetry.semver import parse_constraint
-
-
-def test_format_python_constraint():
-    constraint = parse_constraint("~2.7 || ^3.6")
-
-    result = format_python_constraint(constraint)
-
-    assert result == ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-
-
-def test_format_python_constraint_single_version():
-    constraint = parse_constraint("3.6")
-
-    result = format_python_constraint(constraint)
-
-    assert result == ">=3.6,<3.7"
-
-    constraint = parse_constraint("3")
-
-    result = format_python_constraint(constraint)
-
-    assert result == ">=3.0,<4.0"
diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
deleted file mode 100644
index 448748fe34d..00000000000
--- a/tests/version/test_markers.py
+++ /dev/null
@@ -1,440 +0,0 @@
-import os
-import pytest
-
-from poetry.version.markers import MarkerUnion
-from poetry.version.markers import MultiMarker
-from poetry.version.markers import SingleMarker
-from poetry.version.markers import parse_marker
-
-
-def test_single_marker():
-    m = parse_marker('sys_platform == "darwin"')
-
-    assert isinstance(m, SingleMarker)
-    assert m.name == "sys_platform"
-    assert m.constraint_string == "==darwin"
-
-    m = parse_marker('python_version in "2.7, 3.0, 3.1"')
-
-    assert isinstance(m, SingleMarker)
-    assert m.name == "python_version"
-    assert m.constraint_string == "in 2.7, 3.0, 3.1"
-    assert str(m.constraint) == ">=2.7.0,<2.8.0 || >=3.0.0,<3.2.0"
-
-    m = parse_marker('"2.7" in python_version')
-
-    assert isinstance(m, SingleMarker)
-    assert m.name == "python_version"
-    assert m.constraint_string == "in 2.7"
-    assert str(m.constraint) == ">=2.7.0,<2.8.0"
-
-    m = parse_marker('python_version not in "2.7, 3.0, 3.1"')
-
-    assert isinstance(m, SingleMarker)
-    assert m.name == "python_version"
-    assert m.constraint_string == "not in 2.7, 3.0, 3.1"
-    assert str(m.constraint) == "<2.7.0 || >=2.8.0,<3.0.0 || >=3.2.0"
-
-
-def test_single_marker_intersect():
-    m = parse_marker('sys_platform == "darwin"')
-
-    intersection = m.intersect(parse_marker('implementation_name == "cpython"'))
-    assert (
-        str(intersection)
-        == 'sys_platform == "darwin" and implementation_name == "cpython"'
-    )
-
-    m = parse_marker('python_version >= "3.4"')
-
-    intersection = m.intersect(parse_marker('python_version < "3.6"'))
-    assert str(intersection) == 'python_version >= "3.4" and python_version < "3.6"'
-
-
-def test_single_marker_intersect_compacts_constraints():
-    m = parse_marker('python_version < "3.6"')
-
-    intersection = m.intersect(parse_marker('python_version < "3.4"'))
-    assert str(intersection) == 'python_version < "3.4"'
-
-
-def test_single_marker_intersect_with_multi():
-    m = parse_marker('sys_platform == "darwin"')
-
-    intersection = m.intersect(
-        parse_marker('implementation_name == "cpython" and python_version >= "3.6"')
-    )
-    assert (
-        str(intersection)
-        == 'implementation_name == "cpython" and python_version >= "3.6" and sys_platform == "darwin"'
-    )
-
-
-def test_single_marker_intersect_with_multi_with_duplicate():
-    m = parse_marker('python_version < "4.0"')
-
-    intersection = m.intersect(
-        parse_marker('sys_platform == "darwin" and python_version < "4.0"')
-    )
-    assert str(intersection) == 'sys_platform == "darwin" and python_version < "4.0"'
-
-
-def test_single_marker_intersect_with_multi_compacts_constraint():
-    m = parse_marker('python_version < "3.6"')
-
-    intersection = m.intersect(
-        parse_marker('implementation_name == "cpython" and python_version < "3.4"')
-    )
-    assert (
-        str(intersection)
-        == 'implementation_name == "cpython" and python_version < "3.4"'
-    )
-
-
-def test_single_marker_not_in_python_intersection():
-    m = parse_marker('python_version not in "2.7, 3.0, 3.1"')
-
-    intersection = m.intersect(
-        parse_marker('python_version not in "2.7, 3.0, 3.1, 3.2"')
-    )
-    assert str(intersection) == 'python_version not in "2.7, 3.0, 3.1, 3.2"'
-
-
-def test_single_marker_union():
-    m = parse_marker('sys_platform == "darwin"')
-
-    intersection = m.union(parse_marker('implementation_name == "cpython"'))
-    assert (
-        str(intersection)
-        == 'sys_platform == "darwin" or implementation_name == "cpython"'
-    )
-
-    m = parse_marker('python_version >= "3.4"')
-
-    intersection = m.union(parse_marker('python_version < "3.6"'))
-    assert str(intersection) == 'python_version >= "3.4" or python_version < "3.6"'
-
-
-def test_single_marker_union_compacts_constraints():
-    m = parse_marker('python_version < "3.6"')
-
-    union = m.union(parse_marker('python_version < "3.4"'))
-    assert str(union) == 'python_version < "3.6"'
-
-
-def test_single_marker_union_with_multi():
-    m = parse_marker('sys_platform == "darwin"')
-
-    union = m.union(
-        parse_marker('implementation_name == "cpython" and python_version >= "3.6"')
-    )
-    assert (
-        str(union)
-        == 'implementation_name == "cpython" and python_version >= "3.6" or sys_platform == "darwin"'
-    )
-
-
-def test_single_marker_union_with_multi_duplicate():
-    m = parse_marker('sys_platform == "darwin" and python_version >= "3.6"')
-
-    union = m.union(
-        parse_marker('sys_platform == "darwin" and python_version >= "3.6"')
-    )
-    assert str(union) == 'sys_platform == "darwin" and python_version >= "3.6"'
-
-
-def test_single_marker_union_with_union():
-    m = parse_marker('sys_platform == "darwin"')
-
-    union = m.union(
-        parse_marker('implementation_name == "cpython" or python_version >= "3.6"')
-    )
-    assert (
-        str(union)
-        == 'implementation_name == "cpython" or python_version >= "3.6" or sys_platform == "darwin"'
-    )
-
-
-def test_single_marker_not_in_python_union():
-    m = parse_marker('python_version not in "2.7, 3.0, 3.1"')
-
-    union = m.union(parse_marker('python_version not in "2.7, 3.0, 3.1, 3.2"'))
-    assert str(union) == 'python_version not in "2.7, 3.0, 3.1"'
-
-
-def test_single_marker_union_with_union_duplicate():
-    m = parse_marker('sys_platform == "darwin"')
-
-    union = m.union(parse_marker('sys_platform == "darwin" or python_version >= "3.6"'))
-    assert str(union) == 'sys_platform == "darwin" or python_version >= "3.6"'
-
-    m = parse_marker('python_version >= "3.7"')
-
-    union = m.union(parse_marker('sys_platform == "darwin" or python_version >= "3.6"'))
-    assert str(union) == 'sys_platform == "darwin" or python_version >= "3.6"'
-
-    m = parse_marker('python_version <= "3.6"')
-
-    union = m.union(parse_marker('sys_platform == "darwin" or python_version < "3.4"'))
-    assert str(union) == 'sys_platform == "darwin" or python_version <= "3.6"'
-
-
-def test_multi_marker():
-    m = parse_marker('sys_platform == "darwin" and implementation_name == "cpython"')
-
-    assert isinstance(m, MultiMarker)
-    assert m.markers == [
-        parse_marker('sys_platform == "darwin"'),
-        parse_marker('implementation_name == "cpython"'),
-    ]
-
-
-def test_multi_marker_is_empty_is_contradictory():
-    m = parse_marker(
-        'sys_platform == "linux" and python_version >= "3.5" and python_version < "2.8"'
-    )
-
-    assert m.is_empty()
-
-    m = parse_marker('sys_platform == "linux" and sys_platform == "win32"')
-
-    assert m.is_empty()
-
-
-def test_multi_marker_intersect_multi():
-    m = parse_marker('sys_platform == "darwin" and implementation_name == "cpython"')
-
-    intersection = m.intersect(
-        parse_marker('python_version >= "3.6" and os_name == "Windows"')
-    )
-    assert str(intersection) == (
-        'sys_platform == "darwin" and implementation_name == "cpython" '
-        'and python_version >= "3.6" and os_name == "Windows"'
-    )
-
-
-def test_multi_marker_intersect_multi_with_overlapping_constraints():
-    m = parse_marker('sys_platform == "darwin" and python_version < "3.6"')
-
-    intersection = m.intersect(
-        parse_marker(
-            'python_version <= "3.4" and os_name == "Windows" and sys_platform == "darwin"'
-        )
-    )
-    assert str(intersection) == (
-        'sys_platform == "darwin" and python_version <= "3.4" and os_name == "Windows"'
-    )
-
-
-def test_multi_marker_union_multi():
-    m = parse_marker('sys_platform == "darwin" and implementation_name == "cpython"')
-
-    intersection = m.union(
-        parse_marker('python_version >= "3.6" and os_name == "Windows"')
-    )
-    assert str(intersection) == (
-        'sys_platform == "darwin" and implementation_name == "cpython" '
-        'or python_version >= "3.6" and os_name == "Windows"'
-    )
-
-
-def test_multi_marker_union_with_union():
-    m = parse_marker('sys_platform == "darwin" and implementation_name == "cpython"')
-
-    intersection = m.union(
-        parse_marker('python_version >= "3.6" or os_name == "Windows"')
-    )
-    assert str(intersection) == (
-        'python_version >= "3.6" or os_name == "Windows"'
-        ' or sys_platform == "darwin" and implementation_name == "cpython"'
-    )
-
-
-def test_marker_union():
-    m = parse_marker('sys_platform == "darwin" or implementation_name == "cpython"')
-
-    assert isinstance(m, MarkerUnion)
-    assert m.markers == [
-        parse_marker('sys_platform == "darwin"'),
-        parse_marker('implementation_name == "cpython"'),
-    ]
-
-
-def test_marker_union_deduplicate():
-    m = parse_marker(
-        'sys_platform == "darwin" or implementation_name == "cpython" or sys_platform == "darwin"'
-    )
-
-    assert str(m) == 'sys_platform == "darwin" or implementation_name == "cpython"'
-
-
-def test_marker_union_intersect_single_marker():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    intersection = m.intersect(parse_marker('implementation_name == "cpython"'))
-    assert str(intersection) == (
-        'sys_platform == "darwin" and implementation_name == "cpython" '
-        'or python_version < "3.4" and implementation_name == "cpython"'
-    )
-
-
-def test_marker_union_intersect_single_with_overlapping_constraints():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    intersection = m.intersect(parse_marker('python_version <= "3.6"'))
-    assert (
-        str(intersection)
-        == 'sys_platform == "darwin" and python_version <= "3.6" or python_version < "3.4"'
-    )
-
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-    intersection = m.intersect(parse_marker('sys_platform == "darwin"'))
-    assert (
-        str(intersection)
-        == 'sys_platform == "darwin" or python_version < "3.4" and sys_platform == "darwin"'
-    )
-
-
-def test_marker_union_intersect_marker_union():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    intersection = m.intersect(
-        parse_marker('implementation_name == "cpython" or os_name == "Windows"')
-    )
-    assert str(intersection) == (
-        'sys_platform == "darwin" and implementation_name == "cpython" '
-        'or sys_platform == "darwin" and os_name == "Windows" or '
-        'python_version < "3.4" and implementation_name == "cpython" or '
-        'python_version < "3.4" and os_name == "Windows"'
-    )
-
-
-def test_marker_union_intersect_multi_marker():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    intersection = m.intersect(
-        parse_marker('implementation_name == "cpython" and os_name == "Windows"')
-    )
-    assert str(intersection) == (
-        'implementation_name == "cpython" and os_name == "Windows" and sys_platform == "darwin" '
-        'or implementation_name == "cpython" and os_name == "Windows" and python_version < "3.4"'
-    )
-
-
-def test_marker_union_union_with_union():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    union = m.union(
-        parse_marker('implementation_name == "cpython" or os_name == "Windows"')
-    )
-    assert str(union) == (
-        'sys_platform == "darwin" or python_version < "3.4" '
-        'or implementation_name == "cpython" or os_name == "Windows"'
-    )
-
-
-def test_marker_union_union_duplicates():
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    union = m.union(parse_marker('sys_platform == "darwin" or os_name == "Windows"'))
-    assert str(union) == (
-        'sys_platform == "darwin" or python_version < "3.4" or os_name == "Windows"'
-    )
-
-    m = parse_marker('sys_platform == "darwin" or python_version < "3.4"')
-
-    union = m.union(
-        parse_marker(
-            'sys_platform == "darwin" or os_name == "Windows" or python_version <= "3.6"'
-        )
-    )
-    assert str(union) == (
-        'sys_platform == "darwin" or python_version <= "3.6" or os_name == "Windows"'
-    )
-
-
-def test_intersect_compacts_constraints():
-    m = parse_marker('python_version < "4.0"')
-
-    intersection = m.intersect(parse_marker('python_version < "5.0"'))
-    assert str(intersection) == 'python_version < "4.0"'
-
-
-def test_multi_marker_removes_duplicates():
-    m = parse_marker('sys_platform == "win32" and sys_platform == "win32"')
-
-    assert 'sys_platform == "win32"' == str(m)
-
-    m = parse_marker(
-        'sys_platform == "darwin" and implementation_name == "cpython" '
-        'and sys_platform == "darwin" and implementation_name == "cpython"'
-    )
-
-    assert 'sys_platform == "darwin" and implementation_name == "cpython"' == str(m)
-
-
-@pytest.mark.parametrize(
-    ("marker_string", "environment", "expected"),
-    [
-        ("os_name == '{0}'".format(os.name), None, True),
-        ("os_name == 'foo'", {"os_name": "foo"}, True),
-        ("os_name == 'foo'", {"os_name": "bar"}, False),
-        ("'2.7' in python_version", {"python_version": "2.7.5"}, True),
-        ("'2.7' not in python_version", {"python_version": "2.7"}, False),
-        (
-            "os_name == 'foo' and python_version ~= '2.7.0'",
-            {"os_name": "foo", "python_version": "2.7.6"},
-            True,
-        ),
-        (
-            "python_version ~= '2.7.0' and (os_name == 'foo' or " "os_name == 'bar')",
-            {"os_name": "foo", "python_version": "2.7.4"},
-            True,
-        ),
-        (
-            "python_version ~= '2.7.0' and (os_name == 'foo' or " "os_name == 'bar')",
-            {"os_name": "bar", "python_version": "2.7.4"},
-            True,
-        ),
-        (
-            "python_version ~= '2.7.0' and (os_name == 'foo' or " "os_name == 'bar')",
-            {"os_name": "other", "python_version": "2.7.4"},
-            False,
-        ),
-        ("extra == 'security'", {"extra": "quux"}, False),
-        ("extra == 'security'", {"extra": "security"}, True),
-        ("os.name == '{0}'".format(os.name), None, True),
-        ("sys.platform == 'win32'", {"sys_platform": "linux2"}, False),
-        ("platform.version in 'Ubuntu'", {"platform_version": "#39"}, False),
-        ("platform.machine=='x86_64'", {"platform_machine": "x86_64"}, True),
-        (
-            "platform.python_implementation=='Jython'",
-            {"platform_python_implementation": "CPython"},
-            False,
-        ),
-        (
-            "python_version == '2.5' and platform.python_implementation" "!= 'Jython'",
-            {"python_version": "2.7"},
-            False,
-        ),
-    ],
-)
-def test_validate(marker_string, environment, expected):
-    m = parse_marker(marker_string)
-
-    assert m.validate(environment) is expected
-
-
-@pytest.mark.parametrize(
-    "marker, env",
-    [
-        (
-            'platform_release >= "9.0" and platform_release < "11.0"',
-            {"platform_release": "10.0"},
-        )
-    ],
-)
-def test_parse_version_like_markers(marker, env):
-    m = parse_marker(marker)
-
-    assert m.validate(env)
diff --git a/tox.ini b/tox.ini
index 9118d747e18..1f0a4b9ede4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
-skipsdist = True
-envlist = py27, py34, py35, py36, py37
+minversion = 3.3.0
+isolated_build = True
+envlist = py27, py35, py36, py37, py38
 
 [testenv]
 whitelist_externals = poetry
 skip_install = true
 commands =
     poetry install -vvv
-    poetry run pytest tests/
+    poetry run pytest {posargs} tests/