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

Fix direct url dependency resolution #3298

Merged
merged 74 commits into from
Mar 5, 2019
Merged

Fix direct url dependency resolution #3298

merged 74 commits into from
Mar 5, 2019

Commits on Nov 25, 2018

  1. Fix direct url dependency resolution 

    - Fix dependecy resolution for _all_ dependencies which are just
  direct URLs or files
- Bypass pip-tools for non-editable requirements which can be resolved
- Fixes #3148

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    ffb46e4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into bugfix/3148

    @techalchemy
    techalchemy committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    2798733 View commit details
    Browse the repository at this point in the history

  3. WIP continued, some fixes 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    bd78dae View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. Update vendored dependency pins 

    - Update gitignore entries for mypy config
- Update release task to add version after bumping but before release
- Fixes #3326 (going forward at least)
- Split out patching from vendoring so it can be done as a separate step
  if needed
- Update patches to account for updated packages
- Fixes #3432
- Fixes #2757
- Fixes #3305
- Fixes #2914
- Fixes #3439
- Fixes #3422
- Fixes #3378
- Fixes #3376
- Fixes #3315

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    ed3f206 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Update all vendored dependencies 

    - Clean up test config and environment variable handling
- Unset env var changes performend by `pipenv run`
- Make `environments.is_in_virtualenv()` more dynamic -- read
  environment on the fly
- Split up tests on `pipenv run` to reduce complexity -- one test for
  global run (no virtualenv creation), one test for virtualenv creation
- Add `warn_in_virtualenv` call to `run` command, why doesn't click
  invoke this automatically?

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    574fe73 View commit details
    Browse the repository at this point in the history

  2. Update pythonfinder 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    ea1096d View commit details
    Browse the repository at this point in the history

  3. Remove pyc from pyinstaller and grab final updates from pythonfinder 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    4a8eead View commit details
    Browse the repository at this point in the history

  4. Don't depend on kenneth's personal mirror for testing 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    1601511 View commit details
    Browse the repository at this point in the history

  5. A few fixes for windows and relative paths 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    7ad588d View commit details
    Browse the repository at this point in the history

  6. fix pythonfinder 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    7b25a5c View commit details
    Browse the repository at this point in the history

  7. Update pythonfinder windows implementation 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    3289c7b View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2019

  1. Fix editable and local setup.py builds 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    39c3b3a View commit details
    Browse the repository at this point in the history

  2. Fix direct url dependency resolution 

    - Fix dependecy resolution for _all_ dependencies which are just
  direct URLs or files
- Bypass pip-tools for non-editable requirements which can be resolved
- Fixes #3148

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    86ca6ff View commit details
    Browse the repository at this point in the history

  3. WIP continued, some fixes 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    da14a88 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. Update PEP 508 dependency parsing implementation 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    846b67f View commit details
    Browse the repository at this point in the history

  2. Add pep517 to environment path 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    23ee483 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2019

  1. Fix pep508 direct URL depedencies 

    - Fixes #3148

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Jan 27, 2019
    Configuration menu
    Copy the full SHA
    eae3958 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Update resolver to handle all resolution in venv 

    - Resolve all VCS and non-piptools-resolveable deps in venv
- Implement pep517 for resolution of non-setuptools builds
- Add full support for the new dependency link format
- Fix breakages from pip 19* rollout and subsequent setuptools breakage

Signed-off-by: Dan Ryan <dan.ryan@xyleminc.com>
    Dan Ryan committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    19f2ee6 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Update requirementslib for PEP517 builder 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    01845e5 View commit details
    Browse the repository at this point in the history

  2. requirementslib bugfixes 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    41345a7 View commit details
    Browse the repository at this point in the history

  3. Direct URL updates and pep517 fixes 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    f5fda09 View commit details
    Browse the repository at this point in the history

  4. Fix tuple bug in resolver 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    ef682bd View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2019

  1. Pass all packages through to venv_resolve_deps 

    - Use `project.parsed_pipfile` to get all packages instead of a filtered
  subset
- Determine index names via a new `refresh=True` argument to
  `project.get_source()` which clears the current pipfile cache
- Fix parsing of requirement lines from direct URLs which were
  previously excluding the `name@` portion and therefore generating
  invalid links

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    c049976 View commit details
    Browse the repository at this point in the history

  2. Add pytoml (dependency of pep517) 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 16, 2019
    Configuration menu
    Copy the full SHA
    6b1d617 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Add additional test packages 

    - Allows more thorough testing of new resolution method

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 17, 2019
    1 Configuration menu
    Copy the full SHA
    e392b02 View commit details
    Browse the repository at this point in the history

  2. Fix buggy pep517 implementation 

    - Fix resolution for pre-40.6.0 setuptools releases by auto-detecting
  installed setuptools version before calculating default backend

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    222eb50 View commit details
    Browse the repository at this point in the history

  3. Fix name reference 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    53c4968 View commit details
    Browse the repository at this point in the history

  4. Fix specifier parsing in python 2 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    eaf7504 View commit details
    Browse the repository at this point in the history

  5. Restore existing pyinstaller commit 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    a019de0 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. Update lockfile 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    f6e657e View commit details
    Browse the repository at this point in the history

  2. Add test extras to setup.py to pin pytest 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    08a8bbc View commit details
    Browse the repository at this point in the history

  3. Install local tests extra for test runners 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    f8a5102 View commit details
    Browse the repository at this point in the history

  4. Fix pipenv clean to stop trying to remove python 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    9a47590 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Use set comparisons for removing packages 

    - Fixes `pipenv clean` implementation

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    907aca1 View commit details
    Browse the repository at this point in the history

  2. Update azure test runner 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    caf4818 View commit details
    Browse the repository at this point in the history

  3. Fix uninstall and error formatting 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    c54aa54 View commit details
    Browse the repository at this point in the history

  4. Update test runner scripts to handle both python versions 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    a522430 View commit details
    Browse the repository at this point in the history

  5. Fix test errors and local install for azure 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    5ac228e View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Fix installed package discovery 

    - Exclude python when searching virtualenvs created using nested
  virtualenv interpreters (via `lib-dynload` library directory)

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    bfdb9ae View commit details
    Browse the repository at this point in the history

  2. Update tests to rectify issues 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    9340ddb View commit details
    Browse the repository at this point in the history

  3. Fix failing tests 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    a47a26b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfix/3148' of github.com:pypa/pipenv into bugfix/3148

    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    8041704 View commit details
    Browse the repository at this point in the history

  5. Fix installed package discovery on windows 

    - Fix prefix formatting
- Add posix formatting function

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    16a249f View commit details
    Browse the repository at this point in the history

  6. Avoid using which in cross platform tests 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    cd2cbd4 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Fix venv with leading dash test on windows and clean up tests 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    3bc48f0 View commit details
    Browse the repository at this point in the history

  2. Clean up path checks in environment 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    7f75507 View commit details
    Browse the repository at this point in the history

  3. Fix path reformatting for posix python path 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    3f3e61e View commit details
    Browse the repository at this point in the history

  4. Fix broken imports 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    565850d View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2019

  1. Fix pipenv dist discovery 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    018e6fe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix/3148' of github.com:pypa/pipenv into bugfix/3148 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    33e456d View commit details
    Browse the repository at this point in the history

  3. Fix virtualenv tempdir lifespan 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    090619a View commit details
    Browse the repository at this point in the history

  4. Update syntax for context manager virtualenv test class 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    b0ba9a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. Update license download script 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    05d3b5a View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Update vendored vistir 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    bc3d50b View commit details
    Browse the repository at this point in the history

  2. Update requirementslib 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    32876ec View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Fix command dispatching

    frostming committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    3f053a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. Update vistir and requirementslib 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    4848a1e View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2019

  1. Incorporate fixes from feature/keep-outdated-peep 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 2, 2019
    Configuration menu
    Copy the full SHA
    199a14a View commit details
    Browse the repository at this point in the history

  2. Cut in new cursor implementation 

    - Fix some errors in exception handler
- Update yaspin patch
- Fix spinner

Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 2, 2019
    Configuration menu
    Copy the full SHA
    be3c771 View commit details
    Browse the repository at this point in the history

  3. Update requirementslib to include extras in parser 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 2, 2019
    Configuration menu
    Copy the full SHA
    57b266f View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. Only resolve requirements with markers we can evaluate 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    e238c84 View commit details
    Browse the repository at this point in the history

  2. requirementslib bugfix 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    de4d659 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Update requirementslib 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    374086e View commit details
    Browse the repository at this point in the history

  2. Add new file for requirementslib 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    7fe11e7 View commit details
    Browse the repository at this point in the history

  3. vendor orderedmultidict 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    a1cb576 View commit details
    Browse the repository at this point in the history

  4. Update vnedored dependency list 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    cebe0ac View commit details
    Browse the repository at this point in the history

  5. Re-add passa 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    37916cb View commit details
    Browse the repository at this point in the history

  6. Update vistir patch 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    716dfb4 View commit details
    Browse the repository at this point in the history

  7. Update setup dependencies 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    2d1b4bd View commit details
    Browse the repository at this point in the history

  8. Re-run vendoring script 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    dc41e66 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Fix vendoring script in azure pipeline 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    c53e29b View commit details
    Browse the repository at this point in the history

  2. Update news files 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    01444da View commit details
    Browse the repository at this point in the history

  3. One more news file update 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    439a258 View commit details
    Browse the repository at this point in the history

  4. Add missing news entries 

    Signed-off-by: Dan Ryan <dan@danryan.co>
    @techalchemy
    techalchemy committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    b395aca View commit details
    Browse the repository at this point in the history