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.

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

Update 1 21 2018 #2

Closed
wants to merge 117 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
cc0df39
Use download_dir=None for editable PyPI dependencies
blueyed Aug 16, 2016
906e8fa
Remove redundant check for editable
jdufresne May 31, 2017
3ee3d13
Remove prints used during debugging from tests
jdufresne Jun 1, 2017
7c62306
Add Python 3.6 to the tox test matrix
jdufresne Jun 4, 2017
c0cd04d
Merge pull request #528 from jdufresne/tox-py36
davidovich Jun 4, 2017
4f16fb4
Merge pull request #523 from jdufresne/pin-check
vphilippon Jun 6, 2017
ca51399
Adjust changelog for 1.10.0rc1
vphilippon Jun 7, 2017
4056be5
Add -q/--quiet flags to pip-sync command
jkimbo May 13, 2017
5c368dd
Updated CHANGELOG
jkimbo May 13, 2017
795b802
Add test for sync cli command
jkimbo May 14, 2017
80e3cdd
Clean up whitespace
jkimbo May 14, 2017
ae82285
Remove unnecessary test
Jun 8, 2017
449cb18
rebased against master.
dfee Jun 25, 2017
6c0580a
added changelog info
dfee Jun 25, 2017
9347603
added editable vcs test
dfee Jun 25, 2017
a037d96
made test_editable_package_vcs more comprehensive
dfee Jul 5, 2017
efa6d87
shortened vcs_editable pypi line for flake8
dfee Jul 5, 2017
46cddb3
Merge pull request #538 from dfee/no-download_dir-for-editable
vphilippon Jul 6, 2017
8748865
Merge pull request #527 from jdufresne/test-print
vphilippon Jul 6, 2017
a853e64
Fixing OutputWriter._iter_lines for pip 8.1.1 or below
Lucas-C Jun 28, 2017
dc6e898
Adding a pip==8.1.1 tox test env
Lucas-C Jul 30, 2017
df35e55
Adding TOXENVs with pip8.1.1 to .appveyor.yml
Jul 31, 2017
f7b0549
Merge pull request #540 from voyages-sncf-technologies/master
vphilippon Jul 31, 2017
9b68913
Add dates to changelog
jonafato Aug 15, 2017
9d0d4fa
Merge pull request #550 from jonafato/changelog-dates
davidovich Aug 15, 2017
cfd6b27
Merge pull request #509 from jkimbo/pip-sync-quiet
vphilippon Aug 16, 2017
1e7076c
Remove unwanted annotations from primary packages
quantus Jul 10, 2017
fe8c30e
Merge pull request #542 from quantus/hotfix/do-not-annotate-capitaliz…
vphilippon Aug 21, 2017
0d68da9
Ignore pkg-resources in pip-sync
cemsbr Aug 31, 2017
8c09d72
Merge pull request #555 from cemsbr/ubuntu
davidovich Aug 31, 2017
877241d
Generating hashes of distributions should not interfere with each other
Sep 1, 2017
627dbaf
Hash packages without unpacking
suutari Sep 2, 2017
08aed9d
Use InstallRequirement.extras for the diff in the Resolver.
vphilippon Sep 25, 2017
b3c6a11
Merge pull request #566 from vphilippon/fix-extras-compare-in-resolver
vphilippon Sep 26, 2017
3cb15eb
Fix unicode encoding errors inside pip
suutari Sep 26, 2017
6ab2c28
Added changelog entry with credit to suutari.
vphilippon Sep 26, 2017
94e6ada
Merge pull request #568 from vphilippon/unicode-fix
vphilippon Sep 26, 2017
cc5a82f
Merge branch 'master' into dont-unpack-for-hashing
suutari-ai Sep 27, 2017
dc261ed
Merge pull request #557 from suutari/dont-unpack-for-hashing
vphilippon Sep 27, 2017
74a2eb1
Added release date for 1.10.0.
jezdez Sep 27, 2017
cff1bcb
Fixed bug breaking pip-sync on Python 3, raising TypeError
vphilippon Sep 27, 2017
6651d2d
Merge pull request #570 from vphilippon/fix-pip-sync-py3
vphilippon Sep 27, 2017
aecb213
Update release date for 1.10.1.
jezdez Sep 27, 2017
4543619
rename to test
jezdez Sep 28, 2017
a984fdf
Keep pip.Wheel monkey patch only in the get_hashes context.
vphilippon Sep 28, 2017
81cf817
Change usage to reuse the cache for the hash computation.
vphilippon Sep 28, 2017
ef0aa2d
Merge pull request #571 from vphilippon/respect-plaform-wheel-for-dep…
vphilippon Oct 2, 2017
c2f9dd7
Rename [wheel] section to [bdist_wheel] as the former is legacy
jdufresne Oct 16, 2017
4a82d2f
Include BSD license at the top level of the project
jdufresne Oct 16, 2017
b37dce0
Merge pull request #578 from jdufresne/license
vphilippon Oct 19, 2017
29ea9a4
Merge pull request #577 from jdufresne/bdist-wheel
vphilippon Oct 19, 2017
569bcec
Un-vendor contextlib2
vphilippon Nov 14, 2017
e1be298
Merge pull request #597 from vphilippon/unvendor-contextlib2
vphilippon Nov 14, 2017
b8ede96
Add example of using generate-hashes
pgrzesik Oct 26, 2017
797a848
Merge pull request #589 from pgrzesik/master
vphilippon Nov 14, 2017
6fae093
Convert README (.md -> .rst)
bittner Nov 11, 2017
21b7539
Split up Travis matrix build
bittner Nov 11, 2017
8883365
Use absolute URL for image to display on PyPI
bittner Nov 13, 2017
5e88db2
Test PyPy on Windows (Appveyor)
bittner Nov 14, 2017
478558d
Update converted README with changes from #589
bittner Nov 14, 2017
accef1a
Remove unsupported PyPy from AppVeyor build matrix
bittner Nov 14, 2017
c161895
Merge pull request #595 from bittner/feature/convert-README-to-reST
vphilippon Nov 14, 2017
20e8b16
Use stages to deploy after tests.
vphilippon Nov 16, 2017
cbfa915
Fix environment marker support in pip-sync
hazmat345 Nov 16, 2017
c932d32
Merge pull request #599 from vphilippon/fixing-travis-deploy-deadlock
vphilippon Nov 16, 2017
f9f0597
Added changelog entry
vphilippon Nov 16, 2017
52113ad
Merge pull request #600 from hazmat345/sync_env_markers
vphilippon Nov 16, 2017
a33973c
Merge branch 'master' of github.com:jazzband/pip-tools
jezdez Nov 20, 2017
34d46b2
Updated deploy config variables.
jezdez Nov 20, 2017
a28fae7
Fixed yml indentation.
jezdez Nov 20, 2017
6a416b6
Rename distribution to pip-tools back
vphilippon Nov 20, 2017
3db3802
Making README.rst PyPi compliant
vphilippon Nov 21, 2017
7b65876
Merge pull request #605 from vphilippon/more-rst-adventures
vphilippon Nov 21, 2017
d51acbe
Revert "Un-vendor contextlib2"
vphilippon Nov 21, 2017
919538d
Exclude piptools/_compat/ from flake8
vphilippon Nov 21, 2017
9e24f75
Merge pull request #606 from vphilippon/do-not-unvendor-contextlib2
vphilippon Nov 21, 2017
156a261
Revert "Making README.rst PyPi compliant"
vphilippon Nov 21, 2017
39f4023
Merge pull request #607 from jazzband/revert-605-more-rst-adventures
vphilippon Nov 22, 2017
e35d20c
Strip newlines from the description in setup.py
vphilippon Nov 22, 2017
6bccdd6
Change the readme check test to match the pypa-recommended method
vphilippon Nov 22, 2017
10cfc91
Merge pull request #608 from vphilippon/remove-newlines-from-description
vphilippon Nov 22, 2017
8f5d4da
Changelog bump for 1.10.2
vphilippon Nov 22, 2017
5789bbe
Changed PR template to stop requiring changelog edit.
vphilippon Nov 23, 2017
d42bc17
Add pipdeptree in the readme
vphilippon Nov 23, 2017
de486b8
Merge pull request #610 from vphilippon/pipdeptree-in-readme
davidovich Nov 23, 2017
3c0f8e2
added a test to assert that for a locally available editable requirem…
costypetrisor Oct 22, 2017
3b9b5d8
fixed a bottleneck where pip-tools archives the entire folder of an e…
costypetrisor Oct 24, 2017
bef5d3b
Merge pull request #583 from costypetrisor/editable-no-archive
vphilippon Nov 23, 2017
3336fd6
Document that pip-sync should only used compiled requirements.txt
vphilippon Nov 23, 2017
3bddc0f
Merge pull request #609 from vphilippon/pip-sync-only-compiled-reqs
vphilippon Nov 23, 2017
abdd6e4
Allow for CA bundles in CLI for pip-compile
May 19, 2016
c877cbc
Merge pull request #612 from vphilippon/add-ca-bundle
davidovich Nov 23, 2017
a280091
Add '-markerlib' to the PACKAGES_TO_IGNORE
vphilippon Nov 23, 2017
79e81dc
Merge pull request #613 from vphilippon/ignore-dash-markerlib
vphilippon Nov 23, 2017
e8129c5
Slightly improved NoCandidateFound error message.
vphilippon Nov 24, 2017
7c13e6f
Merge pull request #614 from vphilippon/improve-no-candidate-message
vphilippon Nov 24, 2017
a838aca
Allow editable packages in requirements.in with --generate-hashes
jdufresne Jun 1, 2017
c4a6b1b
Recommend installation into virtual environment
bhrutledge Nov 25, 2017
b6290c6
Merge pull request #524 from jdufresne/editable-hashes
vphilippon Nov 26, 2017
b6a9f1f
Merge pull request #615 from bhrutledge/venv-readme
vphilippon Nov 27, 2017
09f0ec0
1.11.0 changelog
vphilippon Nov 30, 2017
8313f27
Updating Contribution Guidelines
vphilippon Nov 30, 2017
24eab2e
Added Appveyor and PyPi badges
vphilippon Nov 30, 2017
a2446fa
Merge pull request #617 from vphilippon/appveyor-and-pypi-badges
vphilippon Dec 1, 2017
cc0e6a2
Always use _compat to import TemporaryDirectory
jdufresne Dec 16, 2017
eb4baa6
Always prefer open()'s context manager
jdufresne Dec 16, 2017
a926c19
Merge pull request #621 from jdufresne/simplify-import
vphilippon Dec 19, 2017
99b9eca
Merge pull request #623 from jdufresne/context-manager
vphilippon Dec 19, 2017
2eb5074
tests: Do not download Django from Git
suutari Jan 2, 2018
1454d2e
Merge pull request #629 from suutari/dont-download-django
davidovich Jan 6, 2018
d065868
Fix doctests
suutari-ai Mar 11, 2017
2249bbc
tests: Rename "fixtures" to "test_data"
suutari-ai Jun 8, 2017
0fd5daa
Run doctests too
suutari Apr 28, 2017
7e9067b
Merge pull request #469 from suutari/doctest-fixes
davidovich Jan 7, 2018
d318135
Pass python_requires argument to setuptools
jdufresne Jan 11, 2018
6ac36fc
Fix capitalization: PyPi -> PyPI
jdufresne Jan 14, 2018
6a128c3
Merge pull request #631 from jdufresne/pypi
vphilippon Jan 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Slightly improved NoCandidateFound error message.
  • Loading branch information
vphilippon committed Nov 24, 2017
commit e8129c5e8b87b7eaa6a846fb3eb1c8cd8d3383b6
9 changes: 8 additions & 1 deletion piptools/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,23 @@ class PipToolsError(Exception):


class NoCandidateFound(PipToolsError):
def __init__(self, ireq, candidates_tried):
def __init__(self, ireq, candidates_tried, index_urls):
self.ireq = ireq
self.candidates_tried = candidates_tried
self.index_urls = index_urls

def __str__(self):
sorted_versions = sorted(c.version for c in self.candidates_tried)
lines = [
'Could not find a version that matches {}'.format(self.ireq),
'Tried: {}'.format(', '.join(str(version) for version in sorted_versions) or '(no version found at all)')
]
if sorted_versions:
lines.append('There are incompatible versions in the resolved dependencies.')
else:
lines.append('{} {} reachable?'.format(
'Were' if len(self.index_urls) > 1 else 'Was', ' or '.join(self.index_urls))
)
return '\n'.join(lines)


Expand Down
2 changes: 1 addition & 1 deletion piptools/repositories/pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def find_best_match(self, ireq, prereleases=None):
# Reuses pip's internal candidate sort key to sort
matching_candidates = [candidates_by_version[ver] for ver in matching_versions]
if not matching_candidates:
raise NoCandidateFound(ireq, all_candidates)
raise NoCandidateFound(ireq, all_candidates, self.finder.index_urls)
best_candidate = max(matching_candidates, key=self.finder._candidate_sort_key)

# Turn the candidate into a pinned InstallRequirement
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def find_best_match(self, ireq, prereleases=False):
versions = list(ireq.specifier.filter(self.index[key_from_req(ireq.req)],
prereleases=prereleases))
if not versions:
raise NoCandidateFound(ireq, self.index[key_from_req(ireq.req)])
raise NoCandidateFound(ireq, self.index[key_from_req(ireq.req)], ['https://fake.url.foo'])
best_version = max(versions, key=Version)
return make_install_requirement(key_from_req(ireq.req), best_version, ireq.extras, constraint=ireq.constraint)

Expand Down