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 marker parsing and grouping during resolution #2384

Merged
merged 10 commits into from
Jun 22, 2018
Merged

Fix marker parsing and grouping during resolution #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f58768
Exclude dependencies with failing markers from lock
techalchemy Jun 19, 2018
93aceb1
Add pytz-2018 wheel
techalchemy Jun 21, 2018
c31a311
Minor code cleanup
techalchemy Jun 21, 2018
15bcf36
Catch `AttributeErrors` when resolving sdists
techalchemy Jun 21, 2018
32a89d9
explicitly turn possible `InlineTableElement` to dict
techalchemy Jun 21, 2018
6c62d94
Fix pip cahce dir argument
techalchemy Jun 21, 2018
efe3965
Update integration test
techalchemy Jun 22, 2018
6343acb
Use the real marker parser -- confirmed working
techalchemy Jun 22, 2018
f91c9e0
Update news
techalchemy Jun 22, 2018
b74c658
Minor control flow and test logic updates
techalchemy Jun 22, 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
11 changes: 11 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Defaults people to autocrlf if they dont have it set
* text=auto

# binaries
*.png
*.jpg
*.tar.gz
*.zip
*.whl
*.exe
*.gif
2 changes: 2 additions & 0 deletions news/2384.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Resolved a bug in our patched resolvers which could cause nondeterministic resolution failures in certain conditions.
Running ``pipenv install`` with no arguments in a project with only a ``Pipfile`` will now correctly lock first for dependency resolution before installing.
1 change: 1 addition & 0 deletions news/2384.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pipenv will now generate hashes much more quickly by resolving them in a single pass during locking.
2 changes: 2 additions & 0 deletions news/2384.trivial
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Updated mocked pypi dependencies.
Removed ellipsis and em-dash characters from terminal output.
Loading