Commit Graph

7156 Commits

Author SHA1 Message Date
Grey Baker 1a196c1c9f Allow pyenv installs in non-interactive sessions in PIPENV_YES is set 2018-04-27 22:17:34 +01:00
Kyle Altendorf 1312da9b4c Merge branch 'master' into 1847-newlines 2018-04-27 04:20:58 -07:00
Kyle Altendorf 749e143068 Change to six.text_type for newline detection 2018-04-27 07:16:28 -04:00
Tzu-ping Chung 0944eb56d8 Ignore errors when removing old file 2018-04-27 15:31:46 +08:00
Tzu-ping Chung bd057000b2 Implement utility to write to lockfile atomically 2018-04-27 15:13:23 +08:00
Tzu-ping Chung 2df490a6d3 Merge branch 'do-not-destroy-lock' of https://github.com/frostming/pipenv into atomic-lockfile-overwrite 2018-04-27 14:39:16 +08:00
Dan Ryan 373073027f Capture package data
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.1
2018-04-26 23:28:54 -04:00
Dan Ryan 4a5bc94c47 Update history
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-26 23:08:49 -04:00
Dan Ryan 657cd6e0e1 Merge pull request #1668 from pypa/warehouse
Prep for warehouse release (ETA: EOM)
2018-04-26 22:58:21 -04:00
Dan Ryan 828269f3f0 Update pypi urls for pip and pipfile
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-26 19:54:40 -04:00
Kyle Altendorf 9b9721d6e5 Use six.string_types in preferred_newlines() 2018-04-26 18:24:16 -04:00
Dan Ryan fbf8d3ccba Update lockfile
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-26 16:56:09 -04:00
Kyle Altendorf dd11e2c196 Fix writing of json/lockfile for py2 2018-04-26 16:35:15 -04:00
Kyle Altendorf d635a42f1e Merge branch 'master' into 1847-newlines 2018-04-26 12:53:31 -07:00
Kyle Altendorf 6d2e208aae Default to \n, retain consistent \r\n
When writing the Pipfile and Pipfile.lock make an effort to retain
their existing newlines if consistent.  Default to \n (LF) for new
files and files with inconsistent line endings.
2018-04-26 15:50:43 -04:00
Dan Ryan 0b912245b9 Merge branch 'master' into warehouse 2018-04-26 10:54:40 -04:00
Dan Ryan e53b4441ad Patch requests imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-26 10:52:15 -04:00
Dan Ryan d4d283727a Merge branch 'master' into warehouse 2018-04-26 02:11:32 -04:00
Dan Ryan d2eeac7729 Fix travis.yml
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-26 02:10:04 -04:00
Dan Ryan 7d6579b206 Merge branch 'master' into warehouse 2018-04-26 01:40:59 -04:00
Dan Ryan e19c7a84f5 Merge branch 'master' into do-not-destroy-lock 2018-04-26 01:29:55 -04:00
Dan Ryan 479b3ff2d2 Merge pull request #2056 from davehunt/issue2055
Only depend on requests[security] and ordereddict for Python 2.6
2018-04-26 01:29:42 -04:00
Dan Ryan 98e7e3dc15 Merge branch 'master' into issue2055 2018-04-26 01:29:19 -04:00
Dan Ryan ea13302671 Merge pull request #2060 from benjaminjkraft/patch-2
Mention --keep-outdated in docs for importing
2018-04-25 22:32:33 -04:00
Dan Ryan 848bb0d156 Merge branch 'master' into patch-2 2018-04-25 22:32:13 -04:00
Dan Ryan 61b8fe8b4a Merge pull request #2064 from pypa/bugfix/2054-win10-spaces
Shellquote paths to requirements files
2018-04-25 22:31:19 -04:00
Dan Ryan 8991c0901f Shellquote paths to requirements files
- Allows for windows paths with spaces in them
- Fixes #2054

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-25 21:58:43 -04:00
Ben Kraft 3f13e8dfd3 Mention --keep-outdated in docs for importing
When importing from requirements.txt, it may be useful to
keep the versions of packages you have for the moment,
while unpinning them for the future.  This is already supported
via `--keep-outdated`; this commit adds a mention to the docs.
Fixes #908.
2018-04-25 11:43:04 -07:00
Dave Hunt 75d575b82f Only depend on requests[security] and ordereddict for Python 2.6
Fixes #2055
2018-04-25 14:21:41 +01:00
Chris Beaven 8b840640b2 Speed up lock by removing redundant freeze 2018-04-25 16:32:58 +12:00
Dan Ryan 9ecaf85f1b Merge pull request #2043 from pypa/bugfix/local-editable-vcs-locks
Re-add check for vcs pkgs presence in pipfile
2018-04-24 22:33:22 -04:00
Dan Ryan 9ab2af879e Fix tests to grab key from pipfile
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-24 21:52:18 -04:00
Dan Ryan a38d551131 Add test for vcs installs of local paths
- Ensure they do not wind up in the lockfile

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-24 20:19:34 -04:00
Dan Ryan b0aabc6492 Re-add check for vcs pkgs presence in pipfile
- This was removed in a refactor for no discernable reason
- The logic is still present in dev-packages
- Fixes #1130

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-24 19:51:27 -04:00
Dan Ryan a876f2d57c Merge pull request #2041 from mvaled/note-issue-2040
Note that ``-e`` impacts sub-dependencies in lock file.
2018-04-24 19:48:29 -04:00
Dan Ryan 3b5d81f057 Merge branch 'master' into note-issue-2040 2018-04-24 19:48:03 -04:00
Dan Ryan 4ba255febc Merge pull request #2049 from pypa/bugfix/2044-docker
Fix docker bug when using `--system`
v11.10.1.dev5
2018-04-24 19:37:58 -04:00
Dan Ryan 7eb1b6f734 Fix docker bug when using --system
- Fixes #2044

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-24 17:01:34 -04:00
Dan Ryan 2dbb8bc1fe Merge remote-tracking branch 'origin' 2018-04-23 19:19:05 -04:00
Dan Ryan 703e34e4ec Fix packages again
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.1.dev4
2018-04-23 18:35:17 -04:00
Dan Ryan c4a748726e Fix packages again
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-23 18:25:42 -04:00
Dan Ryan 8fa2a9e69f Update requests.packages import path
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.1.dev3
2018-04-23 18:19:56 -04:00
Manuel Vázquez Acosta e8eb732ce9 Note that `-e` impacts sub-dependencies in lock file. 2018-04-23 17:43:23 -04:00
Dan Ryan adff22b114 Update safety.zip to add modules to path properly
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.1.dev2
2018-04-23 16:29:32 -04:00
Dan Ryan 4044ba5ae9 Update manifest
Signed-off-by: Dan Ryan <dan@danryan.co>
v11.10.1.dev1
2018-04-22 20:38:12 -04:00
Dan Ryan a108093d2e Merge pull request #2035 from pypa/update-vendor
Update vendored dependencies
2018-04-23 02:27:24 -04:00
Dan Ryan e678203b0d Merge pull request #2034 from pypa/always-reuse-dotvenv
Make sure to consider existing .venv directory
2018-04-22 14:25:05 -04:00
Dan Ryan aefaff9f12 Fix buggy implementation of --system check
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-22 11:24:10 -04:00
Dan Ryan 0552ad23c1 Update pip vendored pkg resources and add patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-22 11:23:51 -04:00
Dan Ryan b16628f13b Update history, bump version(dev)
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-04-22 09:48:36 -04:00