Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Support poetry.lock #7

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Support poetry.lock #7

wants to merge 19 commits into from

Conversation

cjolowicz
Copy link
Owner

@cjolowicz cjolowicz commented Aug 23, 2019 •
edited
Loading

This PR mirrors heroku#835.

This mirror PR exists because CI in the upstream repository can only be run by the upstream repository owner. It contains some additional commits:

See the original PR for more details.

@cjolowicz cjolowicz changed the title Support poetry.lock WIP: Support poetry.lock Aug 23, 2019
@cjolowicz cjolowicz mentioned this pull request Aug 23, 2019
Open
@cjolowicz cjolowicz force-pushed the ci-poetry-lock branch 6 times, most recently from cf606a0 to d59589d Compare August 25, 2019 06:32
@cjolowicz cjolowicz force-pushed the ci-poetry-lock branch 3 times, most recently from 013468a to 177479f Compare August 28, 2019 11:28
@cjolowicz cjolowicz changed the title WIP: Support poetry.lock Support poetry.lock Aug 28, 2019
@cjolowicz cjolowicz mentioned this pull request Aug 28, 2019
Closed
@cjolowicz cjolowicz changed the title Support poetry.lock WIP: Support poetry.lock Aug 28, 2019
@cjolowicz cjolowicz force-pushed the ci-poetry-lock branch 8 times, most recently from fd72e81 to c45e167 Compare August 29, 2019 08:05
@cjolowicz cjolowicz changed the title WIP: Support poetry.lock Support poetry.lock Aug 29, 2019
@cjolowicz cjolowicz force-pushed the ci-poetry-lock branch 2 times, most recently from d997569 to c65c6f3 Compare September 25, 2019 18:20
@cjolowicz
Switch Heroku account used by Travis CI
17bea38 
Change the HEROKU_API_KEY and HEROKU_API_USER environment variables used by
Travis CI. The encrypted values were generated using the following commands:

  heroku authorizations:create --description "For Travis"
  travis login --com
  travis encrypt HEROKU_API_KEY=<token> --add --com
  travis encrypt HEROKU_API_USER=<[email protected]> --add --com
@cjolowicz
Use a separate CI job per stack
494cc76 
Run the tests in a separate CI job per test suite and stack. Testing on
all stacks in a single job exceeds Travis time limits.
@cjolowicz
Allow running specific tests by passing TESTS
a887282 
Make it possible to specify individual tests to run, to facilitate
debugging. Running the entire test suite every time can take quite long.
Tests can be specified by passing the TESTS variable to `make test`.

If TESTS is non-empty, the test script defines the `suite` hook to build
the test suite using `suite_addTest` with each specified test function.
If TESTS is unset or empty, shUnit2's default behaviour is to run all
functions beginning with the word `test`.

See https://github.com/kward/shunit2#-suites
@cjolowicz
Skip undefined functions when processing TESTS
cc735a6 
Do not attempt to invoke test functions specified via the TESTS
environment variable if they are not defined. The Makefile invokes
multiple test scripts and each test function is only defined in one of
them.
@cjolowicz
Do not run all tests when no tests match TESTS
99d0e51 
Define a noop test function when TESTS is passed and no function in the
test script matches the contents of TESTS. The noop function merely
prints a line notifying the user that the tests were skipped.

This happens because tests were split up into multiple test scripts, but
the Makefile passes TESTS to all of them. When the `suite` hook does not
invoke `suite_addTest`, shunit2 falls back to running all defined tests.
@cjolowicz
Upgrade to pip 19.2.3
193af75 
Bump PIP_UPDATE from 9.0.2 to 19.2.3. This variable is used in bin/steps/python
to determine which pip version to install or upgrade to.
@cjolowicz
Upgrade to pip 19.1.1 for Python 3.4 projects
c3dc702 
Python 3.4 support was dropped in pip >= 19.2. For projects still on
this Python version, use pip 19.1.1 instead of pip 19.2.1.
@cjolowicz
Adapt pip-pop to changes in pip >= 10
32d1e2c 
The pip-diff and pip-grep tools from the vendorized `pip-pop` package
import internal modules from pip. In pip >= 10, internal modules were
moved under `pip._internal`, breaking the imports. Use `try...except
ImportError` to handle both import paths.

Also, the interface of the `PackageFinder` class from one of these
modules changed. Provide a wrapper function to allow creating objects of
this type using the old interface.
@cjolowicz
Pin to pip 9.0.2 for pipenv users only
83ffd2a 
This addresses an issue raised by @CaseyFeist during code review:

  Updating pip for pipenv users or requiring them to update without a
  heads up won't be a good experience (our version is old enough that
  they'll need to uninstall and reinstall pipenv locally to successfully
  update). If you can refactor this to stay pinned to current version for
  pipenv users only, I should be able to accept this (and the related
  project updates).

  heroku#833 (comment)
@cjolowicz
Support pyproject.toml when detecting Python apps
281b51d
@cjolowicz
Avoid editable installs for pyproject.toml-style projects
0bae9f0
@cjolowicz
Add tests for pyproject.toml-style projects using poetry
b3ed583 
Add two test cases for projects using poetry as the build backend:

- testPoetry: project without dependencies

- testPoetryLock: project with dependencies, using a poetry.lock file
@cjolowicz
Add tests for pyproject.toml-style projects using flit
9cacd3f 
Add two test cases for projects using flit as the build backend:

- testFlit: project without dependencies

- testFlitRequires: project with dependencies
@cjolowicz
Add test for pyproject.toml-style project using setuptools
ddcd782
@cjolowicz
Add failing test for poetry.lock
7627068 
Check that pinned requirements are honored when poetry.lock is present.
Request an outdated version of marshmallow in poetry.lock (3.0.0). Check
that the outdated version is installed, rather than a newer version
also satisfying the version constraint in pyproject.toml (^3.0.0).
@cjolowicz
Do not write requirements.txt for pyproject.toml-based projects
073a423 
Install pyproject.toml-based projects using `pip install .`. Do not use a
requirements.txt for this. The requirements.txt file is needed to handle pinned
versions extracted from the poetry.lock file.

Note that we cannot simply append `.` to the exported requirements.txt file.
Currently pip requires that either all requirements have a hash or none.
Including `.` would thus force us to omit hashes for all requirements.
@cjolowicz
Install pinned dependencies from poetry.lock
ebf2831 
If a poetry.lock file is present, use the Poetry CLI to export the
pinned requirements to a requirements.txt file. If the project already
contains a requirements.txt, use that and ignore poetry.lock.

Poetry is not used to install the project because it does not clean up
stale requirements. This means that requirements need to be exported
anyway, for the `pip-uninstall` step.

Since we only use Poetry to export a requirements.txt file, ignore the
Poetry version specified in pyproject.toml. Install a pre-release of
1.0.0 because the export command is not available before 1.0.0a0.

Note that supporting pyproject.toml-based installations is not enough to
handle pinned requirements: When pip installs a pyproject.toml-style
project using the process described in PEP 517, it only uses Poetry to
build a wheel. The wheel contains the version constraints from
pyproject.toml, not the pinned versions from poetry.lock.
@cjolowicz
Upgrade to poetry 1.0.0b7
22407f1
@cjolowicz
Use --output option instead of stream redirection
3332d1b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@cjolowicz