Commit Graph

5934 Commits

Author SHA1 Message Date
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
Dan Ryan 670b010d6f Merge branch 'master' into verbose-run 2018-12-08 18:39:41 -05:00
Dan Ryan 7a2bdfe73b Merge pull request #3352 from nonylene/patch-1
Fix `--site-packages` flag is not recognized
2018-12-08 17:16:16 -05:00
nonylene f81e86181c Add test for pipenv --python --site-packages 2018-12-09 05:17:25 +09:00
nonylene 0498b46f02 Merge branch 'master' into patch-1 2018-12-09 02:53:10 +09:00
Frost Ming 69f2003c44 Merge pull request #3362 from pypa/preserve-inline-spaces
Preserve inline spaces in toml
2018-12-07 09:47:48 +08:00
Frost Ming aadb24b9df Move to install test suite 2018-12-07 09:00:04 +08:00
Frost Ming 8efaea620e Raise condition evaluation 2018-12-06 16:02:37 +08:00
Frost Ming 560d4ff5aa fix a typo 2018-12-06 16:00:33 +08:00
Frost Ming 27f83a8631 preserve inline spaces in toml 2018-12-06 15:54:18 +08:00
Frost Ming 7f5676e2b8 add news 2018-12-06 15:05:54 +08:00
nonylene e229f7e038 Rename 3352.bugfix.rst to 3351.bugfix.rst 2018-12-05 06:41:06 +09:00
nonylene eff802a62d Create 3352.bugfix.rst 2018-12-05 06:28:36 +09:00
nonylene 64ae1ed8a4 Fix --site-packages flag is not recognized
`site_packages` argument in `cli` function always set to false because `--site-packages` flag was defined in global state (https://github.com/pypa/pipenv/blob/97657b2797b8a8f045776470d74add6048a95b67/pipenv/cli/options.py#L62). 

Fixes #3351
2018-12-05 06:19:32 +09:00
Refael Ackermann 5c8ecfc86f fixup! add news 2018-12-04 12:10:37 -05:00
Dan Ryan 453ed705a8 fixup! use $
Co-Authored-By: refack <refack@gmail.com>
2018-12-04 12:03:56 -05:00
Omer Katz d191deb744 Mention Linuxbrew in installation docs. 2018-12-04 17:50:41 +02:00
Refael Ackermann aee66c6074 fixup! use click.echo > stderr 2018-12-03 20:17:01 -05:00
Refael Ackermann d47604892a Enable output of script line for 'run' in verbose mode 2018-12-03 16:26:23 -05:00
jxltom 0df02b4c28 Merge branch 'master' into activate-custom-virtualenv 2018-12-03 09:35:45 +08:00
jxltom dbb3603a05 Fix a bug where activated virtualenv is not being used in pipenv run 2018-12-03 09:27:23 +08:00
Dan Ryan 8707fe5257 Merge pull request #3344 from jxltom/remove-additional-option
Remove duplicate skip-lock option
2018-12-02 03:21:25 -05:00
jxltom 97657b2797 Remove duplicate skip-lock option 2018-12-02 15:03:02 +08:00
Frost Ming 613d99b1a0 Merge pull request #3338 from pypa/bugfix/3324
Don't normalize name when writing Pipfile
2018-12-02 08:32:39 +08:00
Dan Ryan 2160b64005 Merge branch 'master' into bugfix/3324 2018-12-01 14:09:59 -05:00
Dan Ryan 847b8ae28d Merge pull request #3337 from jxltom/resort-imports
Resort imports for pipenv, tasks, tests and docs
2018-12-01 14:09:25 -05:00
Dan Ryan a500420f6c Merge branch 'master' into resort-imports 2018-12-01 13:06:25 -05:00
Frost Ming e87e15dc4f Merge pull request #3341 from jxltom/enable-tests-in-travis
Enable test disabled in travis
2018-12-01 22:47:26 +08:00
jxltom d165d65636 Add blank line since these two environment variable has different purpose 2018-12-01 22:23:27 +08:00
jxltom bea9e03165 Enable test disabled in travis 2018-12-01 22:17:00 +08:00
jxltom 5e29e7635e Add bugfix news for 3339 2018-12-01 21:01:25 +08:00
jxltom 76ca3e3ba1 Set PIPENV_ACTIVATE after virtualenv_location is being used 2018-12-01 20:58:30 +08:00
Frost Ming 360ed75992 try another package
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-12-01 20:56:47 +08:00
Frost Ming 7eab5bede2 use pep423_name
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-12-01 20:18:32 +08:00
Frost Ming 7718350f2f Don't normalize name when writing Pipfile
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-12-01 19:44:10 +08:00
jxltom d3d2c6b14a Merge branch 'master' into resort-imports 2018-12-01 19:17:01 +08:00
jxltom c1a9f0079c Resort imports for docs 2018-12-01 19:11:55 +08:00