Commit Graph

5981 Commits

Author SHA1 Message Date
Dan Ryan a33ad9df2d Update utils to work with patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-02-17 19:19:17 -05:00
Dan Ryan 698dfb8c9e Port over changes that were overwritten
- Bring in changes from bugfix/3148

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-02-17 19:11:36 -05:00
Dan Ryan 552d1274ea Merge with updates
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-02-17 13:39:04 -05:00
Nick Coghlan 3feeaa738f Merge branch 'master' into feature/keep-outdated-peep 2019-01-21 14:03:41 +10:00
jxltom 44db5dd87d Merge pull request #3340 from jxltom/activate-custom-virtualenv
Fix bug where custom virtualenv can not be activated by pipenv shell
2019-01-18 21:04:01 +08:00
jxltom afe1f4d581 Merge branch 'master' into activate-custom-virtualenv 2019-01-18 20:47:11 +08:00
Frost Ming 1f36ca17bc Merge pull request #3456 from pypa/ci-exclude-peeps
Exclude peeps folder when trigger pipelines
2019-01-18 17:15:06 +08:00
Frost Ming 3235bb7253 Exclude peeps folder when trigger pipelines 2019-01-18 16:39:47 +08:00
jxltom a873e7c2e3 Merge branch 'master' into activate-custom-virtualenv 2019-01-18 12:40:23 +08:00
Frost Ming 943f828227 Merge pull request #3451 from pypa/bugfix/3449
Update the index names in lock file
2019-01-18 12:07:09 +08:00
Frost Ming 11b8d19c2f Merge branch 'master' into bugfix/3449 2019-01-18 11:32:39 +08:00
jxltom d17d46256c Merge branch 'master' into activate-custom-virtualenv 2019-01-18 09:05:43 +08:00
Frost Ming 7e44236d2b Merge pull request #3448 from pypa/bugfix/3446
Fix order of hashes
2019-01-17 22:40:15 +08:00
Frost Ming 3800ef1261 Merge branch 'master' into bugfix/3446 2019-01-17 21:40:09 +08:00
jxltom 32a5e16d9d Merge pull request #3447 from AdamGold/feature/pip_source_args_error_handling
handle [[source]] without url - raise PipenvUsageError
2019-01-17 21:25:01 +08:00
Adam Goldschmidt c3e3cfb015 add .news file to describe the fix 2019-01-17 14:10:41 +02:00
Adam Goldschmidt 3b4c592f30 add test to invalid prepare_pip_source_args and change error to be more descriptive. (+1 squashed commit)
Squashed commits:
[b00fb5ba] fixed test getting empty URL in source
2019-01-17 14:10:41 +02:00
Adam Goldschmidt b60439db37 handle non-URL sources - raise PipenvUsageError 2019-01-17 14:07:54 +02:00
Frost Ming b5c88e9c32 ensure the existence of 'url' 2019-01-17 15:47:32 +08:00
Frost Ming c3e94364a0 Use the source passed in 2019-01-17 12:57:02 +08:00
Frost Ming 9dab05d64e Update the index names in lock file 2019-01-17 12:04:05 +08:00
Frost Ming bd1bebb957 Fix order of hashes 2019-01-17 09:41:35 +08:00
Frost Ming c4341a7d5d Merge pull request #3442 from kenyon/patch-2
core: nonexistent virtualenv warning msg: add missing space
2019-01-14 12:40:35 +08:00
Kenyon Ralph 18fe121d50 core: nonexistent virtualenv warning msg: add missing space 2019-01-13 20:11:46 -08:00
Frost Ming 5695322152 Merge pull request #3431 from pypa/bugfix/3427
Populate source when getting lockfile
2019-01-11 08:52:00 +08:00
Frost Ming 9cb66a8c64 Merge branch 'master' into bugfix/3427 2019-01-11 08:14:34 +08:00
kennethreitz 32981ac83b Create PEEP-003.md 2019-01-10 13:10:32 -05:00
Frost Ming ba9f5057b8 Populate source when getting lockfile 2019-01-09 10:07:26 +08:00
Frost Ming 9c18016f7b Merge pull request #3424 from pypa/remove-typing-dep
Remove typing dep
2019-01-05 22:24:26 +08:00
Frost Ming 661992d6d0 Merge branch 'master' into remove-typing-dep 2019-01-04 21:59:31 +08:00
Frost Ming 1ca89369c1 Merge pull request #3416 from jdufresne/py26
Remove Python 2.6 dependencies from setup.py
2019-01-04 21:48:51 +08:00
Frost Ming 37c79915df Remove typing dep 2019-01-04 21:44:11 +08:00
Jon Dufresne 976c04cb2a Remove Python 2.6 dependencies from setup.py
Support for Python 2.6 was removed in (or before)
47604c644b. Therefore, no need to include
these dependencies.
2018-12-29 21:06:21 -05:00
Frost Ming 3b3ebb4752 Merge pull request #3392 from RohanTalip/patch-2
Replaced double hyphens with a single hyphen
2018-12-18 09:29:21 +08:00
Rohan Talip c794e7e566 Replaced double hyphens with a single hyphen 2018-12-17 15:22:36 -08:00
jxltom 16db36e60f Test for pipenv behavior in activated virtualenv 2018-12-16 20:36:32 +08:00
jxltom ce143942eb Merge remote-tracking branch 'upstream/master' into activate-custom-virtualenv 2018-12-16 18:29:06 +08:00
jxltom 94e7c971af Merge pull request #3350 from thedrow/patch-2
Mention Linuxbrew in installation docs
2018-12-16 11:21:17 +08:00
jxltom 5afb07baa9 Merge branch 'master' into patch-2 2018-12-16 10:58:51 +08:00
jxltom 844f7f80e2 Merge homebrew and linuxbrew installation into same section 2018-12-16 10:45:29 +08:00
Frost Ming 4e476ced06 Merge pull request #3384 from alexallah/fix-selective-upgrade-unhashable-error
Fix unhashable type error in --selective-upgrade
2018-12-15 21:54:31 +08:00
Frost Ming c433262847 Update news/3384.bugfix.rst
Co-Authored-By: alexallah <alex.allah@gmail.com>
2018-12-14 20:22:06 -08:00
Alexander Allakhverdiyev f4f5acbd38 added news file 2018-12-14 19:37:52 -08:00
Alexander Allakhverdiyev e400d81a42 use a better variable 2018-12-14 12:17:43 -08:00
Alexander Allakhverdiyev f2c60f4908 Fix unhashable type error in --selective-upgrade 2018-12-14 12:07:26 -08:00
Frost Ming d4d54eeb39 Merge pull request #3371 from GreatBahram/master
simple bug fix in setup.py
2018-12-11 14:07:48 +08:00
GreatBahram 2fdc4fa6cb simple bug fix in setup.py 2018-12-11 09:03:08 +03:30
Omer Katz 36a5c5264e Merge branch 'master' into patch-2 2018-12-09 18:19:43 +02:00
Omer Katz 497fdf8d6b Updated install documentation. 2018-12-09 18:19:14 +02:00
Dan Ryan 51b46c9f58 Merge pull request #3348 from refack/verbose-run
Enable output of script line for 'run' in verbose mode
2018-12-09 02:37:08 -05:00