Add compatibility with the pip master (upcoming pip==19.3) #864

atugushev · 2019-08-02T14:12:42Z

Added create_command function to instantiate a command (e.g., InstallCommand), see Address #6692: Only import a Command class when needed pypa/pip#6694.
Added compatible is_vcs_url function, see consolidate vcs link detection pypa/pip#6883, closes pip: function is_vcs_url moved to is_vcs Link property #876.
Added compatibility for refactored PackageFinder, see Simplify PackageFinder best candidate API some more pypa/pip#6787.
Added compatibility for refactored Resolver, see Reduce context/options passed to Resolver pypa/pip#6986.

Changelog-friendly one-liner: Add compatibility with pip==19.3

Contributor checklist

Provided the tests for the changes.
Requested a review from another contributor.
Gave a clear one-line description in the PR (that the maintainers can add to CHANGELOG.md on release).
Assign the PR to an existing or new milestone for the target version (following Semantic Versioning).

codecov · 2019-08-02T15:22:55Z

Codecov Report

Merging #864 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #864      +/-   ##
==========================================
+ Coverage   99.05%   99.06%   +<.01%     
==========================================
  Files          35       35              
  Lines        2230     2237       +7     
  Branches      285      286       +1     
==========================================
+ Hits         2209     2216       +7     
  Misses         13       13              
  Partials        8        8

Impacted Files	Coverage Δ
piptools/utils.py	`100% <100%> (ø)`	⬆️
piptools/repositories/pypi.py	`94.84% <100%> (+0.02%)`	⬆️
tests/test_repositories.py	`100% <100%> (ø)`	⬆️
tests/test_cli_compile.py	`100% <100%> (ø)`	⬆️
piptools/scripts/compile.py	`100% <100%> (ø)`	⬆️
tests/test_utils.py	`100% <100%> (ø)`	⬆️
piptools/resolver.py	`100% <0%> (ø)`	⬆️
tests/conftest.py	`97.7% <0%> (ø)`	⬆️
tests/test_resolver.py	`100% <0%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6d631e...8b05751. Read the comment docs.

blueyed

To be in line with the improvements in pip (lazy import / creation), I think it would be good if _compat.pip_compat would do less also - specifically not doing the InstallCommand = do_import("commands.install", "InstallCommand") anymore. This should be done via/in create_install_command then only.

piptools/utils.py

atugushev · 2019-08-17T22:19:53Z

Master broken again, see #876

atugushev · 2019-08-17T23:49:40Z

@blueyed

I've used do_import and added compatibility for the latest master changes. Please take a look if you have time.

atugushev · 2019-08-21T21:14:06Z

The PackageFinder has been refactored pypa/pip#6787

atugushev · 2019-09-06T23:08:15Z

FTR, Resolver is going to be refactored pypa/pip#6986 and might break instantination

pip-tools/piptools/repositories/pypi.py

Lines 188 to 199 in b387e5e

    
           resolver_kwargs = { 
        
               "finder": self.finder, 
        
               "session": self.session, 
        
               "upgrade_strategy": "to-satisfy-only", 
        
               "force_reinstall": False, 
        
               "ignore_dependencies": False, 
        
               "ignore_requires_python": False, 
        
               "ignore_installed": True, 
        
               "isolated": False, 
        
               "wheel_cache": wheel_cache, 
        
               "use_user_site": False, 
        
           }

atugushev · 2019-09-15T12:41:27Z

I've fixed the latest compatibility issue. I hope it's the last breaking change in upcoming pip==19.3.

We should check this before release in October, see pypa/pip#6993 (comment). Otherwise, it'll break pip-tools again.

/cc @vphilippon @davidovich @blueyed @jdufresne @jcushman @codingjoe

Sorry for disturbing you guys. Pinging the most recently active members 🙏

codingjoe

LGTM, I would probably prefer it though, if you would skip the broken pytest version in a separate PR and rebase. Is there maybe a way to already test against the new version in the tox setup? I mean it does test against master, but we should maybe also add the version you wrote the exception handling for later.

atugushev · 2019-09-15T19:13:31Z

Hey @codingjoe, thanks for reviewing this!

LGTM, I would probably prefer it though, if you would skip the broken pytest version in a separate PR and rebase.

Do I understand correctly that you want to remove 9f02db5 from this PR and open a separate PR for this commit?

Is there maybe a way to already test against the new version in the tox setup? I mean it does test against master, but we should maybe also add the version you wrote the exception handling for later.

Do you mean to add to tox.ini new env pip19.3 pointing to the master? For example:

pip19.3: -e git+https://github.com/pypa/pip.git@master#egg=pip

And change it later to pip19.3: pip==19.3 after the release. Right?

codingjoe · 2019-09-17T06:02:40Z

@atugushev yes, yes and yes ;)

See pypa/pip#6694

To DRY

Function is_vcs_url has been replaced by is_vcs Link property. See pypa/pip#6883

The `get_best_candidate` has been renamed to `compute_best_candidate`, which now returns an instance of `BestCandidateResult`. See pypa/pip#6787

See pypa/pip#6986

Add pip19.3 the tox envlist.

atugushev · 2019-09-17T18:28:52Z

@codingjoe

@atugushev yes, yes and yes ;)

Addressed in 8b05751. Also, I've rebased to the latest master.

codingjoe

LGTM 👍 thanks for adressing my change requests

atugushev · 2019-09-19T09:58:06Z

@codingjoe thanks for reviewing this. Appreciate it!

This comment has been minimized.

Sign in to view

atugushev requested review from blueyed and vphilippon August 2, 2019 15:23

atugushev added the bug fix label Aug 2, 2019

blueyed reviewed Aug 5, 2019

View reviewed changes

piptools/utils.py Outdated Show resolved Hide resolved

atugushev force-pushed the create-command branch from 69d412b to 66c261d Compare August 5, 2019 18:28

atugushev added this to the 4.0.1 milestone Aug 5, 2019

blueyed reviewed Aug 12, 2019

View reviewed changes

piptools/utils.py Show resolved Hide resolved

atugushev modified the milestones: 4.0.1, 4.1.0 Aug 14, 2019

atugushev changed the title ~~Add compatibility with upcoming pip==19.3~~ Add compatibility with the pip master (upcoming pip==19.3) Aug 17, 2019

atugushev removed this from the 4.1.0 milestone Aug 25, 2019

atugushev closed this Sep 6, 2019

atugushev reopened this Sep 6, 2019

codingjoe reviewed Sep 15, 2019

View reviewed changes

atugushev added 6 commits September 17, 2019 17:24

Add compatibility for refactored command constructor

4e7404f

See pypa/pip#6694

Move PIP_VERSION to pip_compat module

1d0c6b5

To DRY

Add compatibility for refactored is_vcs_url

73619fb

Function is_vcs_url has been replaced by is_vcs Link property. See pypa/pip#6883

Add compatibility for refactored PackageFinder

3990cd9

The `get_best_candidate` has been renamed to `compute_best_candidate`, which now returns an instance of `BestCandidateResult`. See pypa/pip#6787

Add compatibility for refactored Resolver

4685eec

See pypa/pip#6986

Address review comments

8b05751

Add pip19.3 the tox envlist.

atugushev force-pushed the create-command branch from 9f02db5 to 8b05751 Compare September 17, 2019 14:49

codingjoe approved these changes Sep 19, 2019

View reviewed changes

atugushev added this to the 4.2.0 milestone Sep 19, 2019

atugushev merged commit 53c0742 into jazzband:master Sep 19, 2019

atugushev deleted the create-command branch September 19, 2019 09:54

jamescooke mentioned this pull request Sep 22, 2019

Add info to README about layered requirements files #905

Merged

3 tasks

atugushev mentioned this pull request Sep 22, 2019

Allow failing PIP=19.3 until pip being released #906

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add compatibility with the pip master (upcoming pip==19.3) #864

Add compatibility with the pip master (upcoming pip==19.3) #864

atugushev commented Aug 2, 2019 •

edited

Loading

This comment has been minimized.

codecov bot commented Aug 2, 2019 •

edited

Loading

blueyed left a comment

atugushev commented Aug 17, 2019 •

edited

Loading

atugushev commented Aug 17, 2019 •

edited

Loading

atugushev commented Aug 21, 2019

atugushev commented Sep 6, 2019 •

edited

Loading

atugushev commented Sep 15, 2019 •

edited

Loading

codingjoe left a comment

atugushev commented Sep 15, 2019

codingjoe commented Sep 17, 2019

atugushev commented Sep 17, 2019 •

edited

Loading

codingjoe left a comment

atugushev commented Sep 19, 2019

Add compatibility with the pip master (upcoming pip==19.3) #864

Add compatibility with the pip master (upcoming pip==19.3) #864

Conversation

atugushev commented Aug 2, 2019 • edited Loading

Contributor checklist

This comment has been minimized.

codecov bot commented Aug 2, 2019 • edited Loading

Codecov Report

blueyed left a comment

Choose a reason for hiding this comment

atugushev commented Aug 17, 2019 • edited Loading

atugushev commented Aug 17, 2019 • edited Loading

atugushev commented Aug 21, 2019

atugushev commented Sep 6, 2019 • edited Loading

atugushev commented Sep 15, 2019 • edited Loading

codingjoe left a comment

Choose a reason for hiding this comment

atugushev commented Sep 15, 2019

codingjoe commented Sep 17, 2019

atugushev commented Sep 17, 2019 • edited Loading

codingjoe left a comment

Choose a reason for hiding this comment

atugushev commented Sep 19, 2019

atugushev commented Aug 2, 2019 •

edited

Loading

codecov bot commented Aug 2, 2019 •

edited

Loading

atugushev commented Aug 17, 2019 •

edited

Loading

atugushev commented Aug 17, 2019 •

edited

Loading

atugushev commented Sep 6, 2019 •

edited

Loading

atugushev commented Sep 15, 2019 •

edited

Loading

atugushev commented Sep 17, 2019 •

edited

Loading