Skip to content

Commit

Permalink
Merge pull request #2384 from pypa/exclude-failing-markers
Browse files Browse the repository at this point in the history
Exclude failing markers
  • Loading branch information
techalchemy authored Jun 22, 2018
2 parents fde4a89 + b74c658 commit f307507
Show file tree
Hide file tree
Showing 49 changed files with 516 additions and 308 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
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
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
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
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

0 comments on commit f307507

Please sign in to comment.