Commit Graph

4884 Commits

Author SHA1 Message Date
Tzu-ping Chung bb5201edbd Merge pull request #2595 from sinscary/better_error_message
Show better error if virtual env is broken
2018-07-18 14:38:20 +08:00
Tzu-ping Chung 234b55035c Merge branch 'master' into better_error_message 2018-07-18 14:16:22 +08:00
Tzu-ping Chung eabe99d042 Merge pull request #2600 from sup/make-readme-badges-inline
Make README badges inline
2018-07-18 14:15:51 +08:00
Charles Lai 72d643c1f2 Make README badges inline 2018-07-17 17:06:21 -07:00
Nitesh Sharma f141911dab Show better error if virtual env is broken
Closes https://github.com/pypa/pipenv/issues/1918
2018-07-17 20:02:18 +05:30
Tzu-ping Chung 5c49b9ae0e Merge pull request #2597 from giuscri/add-rm-option-to-usage-examples
Add --rm option example to Usage Examples
2018-07-17 19:45:30 +08:00
Giuseppe fe89ed43ec Add --rm option example to Usage Examples 2018-07-17 12:42:55 +02:00
Tzu-ping Chung 91b39d34ff Merge pull request #2592 from Alexgmin/master
Fix broken link in CONTRIBUTING.md
2018-07-16 22:08:38 +08:00
Alex Gómez Martín 4f433c0131 Fix broken link in CONTRIBUTING.md 2018-07-16 15:58:52 +02:00
Tzu-ping Chung e17d76e414 Merge pull request #2591 from Alexgmin/master
Add pkg-resources to the ignored packages list
2018-07-16 21:51:38 +08:00
Alex Gómez Martín ff3c49e5b4 Add pkg-resources to the ignored packages list 2018-07-16 15:33:57 +02:00
Dan Ryan 6b1ec91607 Added working draft of changelog and release task for markdown conversion
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-15 16:22:06 -04:00
Dan Ryan d8b6ccaed7 Added missing news entries
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-15 16:18:32 -04:00
Dan Ryan 6ead6ff8bc Bumped version.
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-15 16:18:11 -04:00
Dan Ryan 2355bdca00 Update release task
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-15 16:14:32 -04:00
Tzu-ping Chung b9423b6823 Merge pull request #2561 from JacobHayes/2504-fix-array-element-serialization
Serialize prettytoml ArrayElements as lists
2018-07-13 22:35:51 +08:00
Tzu-ping Chung 3623914001 Also allow TokenElement in lock file encoder
Can't be too careful hadling things here.
2018-07-13 22:26:43 +08:00
Tzu-ping Chung 98a52149d7 Seperate lock file concerns in a custom encoder 2018-07-13 16:26:54 +08:00
Tzu-ping Chung 5cedecd9eb Merge branch '2504-fix-array-element-serialization' of https://github.com/JacobHayes/pipenv into 2504-fix-array-element-serialization 2018-07-13 14:43:34 +08:00
Erin O'Connell 94fbfe44b7 Merge pull request #2578 from sup/master
Revert "Revert "Add docstrings to show short_help when running --help""
2018-07-12 14:23:47 -06:00
Jacob Hayes b1ecc68951 Merge branch 'master' into 2504-fix-array-element-serialization 2018-07-12 15:20:15 -05:00
Charles Lai 8f2b4abeb1 Revert "Revert "Add docstrings to show short_help when running --help""
This reverts commit 05b3581756.
2018-07-12 16:05:20 -04:00
Tzu-ping Chung 946050087f Merge pull request #2568 from JacobHayes/make-local-test-easy
Simplify testing for new contributors
2018-07-13 03:23:47 +08:00
Tzu-ping Chung f711678537 Get virtualenv location from output
The Project class's implementation is a fucking mess. Avoid that.
2018-07-13 03:14:22 +08:00
Jacob Hayes b8dbe78775 Merge branch 'master' into make-local-test-easy 2018-07-12 08:09:04 -05:00
Jacob Hayes e9379437f8 Merge branch 'master' into 2504-fix-array-element-serialization 2018-07-12 08:08:13 -05:00
Jacob Hayes dbc9008131 Duck type prettytoml types during serialization 2018-07-12 08:05:58 -05:00
Erin O'Connell 6cfe5fb993 Merge pull request #2571 from pypa/revert-2542-master
Revert "Add docstrings to show short_help when running --help"
2018-07-12 02:16:55 -06:00
Erin O'Connell 05b3581756 Revert "Add docstrings to show short_help when running --help" 2018-07-12 02:13:20 -06:00
Erin O'Connell af4ba9ec9c Merge pull request #2542 from sup/master
Add docstrings to show short_help when running --help
2018-07-12 02:12:30 -06:00
Erin O'Connell bf5d83a1af Merge branch 'master' into master 2018-07-12 00:40:56 -06:00
Jacob Hayes 1ceccb9bdf Fix extras check in test 2018-07-11 23:32:43 -05:00
Dan Ryan 7eeeeb9d4d Merge branch 'master' into 2504-fix-array-element-serialization 2018-07-11 21:51:43 -04:00
Dan Ryan 55ab8c4594 Merge branch 'master' into make-local-test-easy 2018-07-11 21:08:54 -04:00
Dan Ryan 97241a917a Merge pull request #2564 from pypa/requirementslib-update
Update requirementslib
2018-07-11 20:14:55 -04:00
Dan Ryan c30cacc7b2 Merge branch 'master' into make-local-test-easy 2018-07-11 19:44:48 -04:00
Dan Ryan 35b071daab Add news entry.
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-11 19:30:10 -04:00
Dan Ryan cd929dcae8 Update requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-07-11 19:30:10 -04:00
Dan Ryan d5a3ce4d43 Merge branch 'master' into 2504-fix-array-element-serialization 2018-07-11 19:24:46 -04:00
Jacob Hayes 74de4d6af0 Remove duplicate dir check 2018-07-11 15:59:39 -05:00
Jacob Hayes aaac6c6429 Replace test PYPI_VENDOR_DIR envvar with explicit package prep 2018-07-11 15:16:46 -05:00
Jacob Hayes 3a25846f88 Add dev setup and testing section to CONTRIBUTING.md 2018-07-11 13:26:03 -05:00
Jacob Hayes dd4b4be175 Remove explicit sets of PYPI_VENDOR_DIR and let integration conftest do its thing 2018-07-11 13:25:02 -05:00
Jacob Hayes f7ee0764e3 Add pytest default norecursedirs 2018-07-11 13:24:41 -05:00
Dan Ryan 6e801edcd4 Merge pull request #2567 from pypa/latest-release-in-issue-template
Please report against the latest version
2018-07-11 13:17:56 -04:00
Tzu-ping Chung 24f90a4ac2 Please report against the latest version 2018-07-12 00:56:21 +08:00
Jacob Hayes 6de915ab79 [#2504] Replace security extra with socks in test 2018-07-11 08:19:42 -05:00
Tzu-ping Chung aec7881a47 Merge pull request #2563 from pypa/cmd-quote-better
Only quote arguments during cmdify if needed
2018-07-11 18:44:01 +08:00
Tzu-ping Chung 86965203bf Add news fragment 2018-07-11 17:26:18 +08:00
Tzu-ping Chung 9315887101 Only quote arguments during cmdify if needed 2018-07-11 17:17:08 +08:00