Commit Graph

5775 Commits

Author SHA1 Message Date
Dan Ryan 8049b4ff6e Merge branch 'master' into vendoring-update 2018-11-19 13:56:17 -05:00
Dan Ryan 9a6443abcf Merge pull request #3253 from pypa/bugfix/3249
Fix parsing of markers in VCS requirements
2018-11-19 13:55:02 -05:00
Dan Ryan c8c78931f5 Merge branch 'master' into bugfix/3249 2018-11-19 12:20:09 -05:00
Dan Ryan 0bc846290d Merge pull request #3251 from pypa/bugfix/3239
Redirect all spinner output to stderr
2018-11-19 12:19:03 -05:00
Dan Ryan de22ff69db Exclude gitmodules
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 09:19:46 -05:00
Dan Ryan fca047e4a1 Exclude gitmodules
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 09:19:32 -05:00
Dan Ryan ddd6744a15 Merge branch 'master' into bugfix/3239 2018-11-19 09:00:29 -05:00
Frost Ming 8de5a92321 Merge pull request #3243 from pypa/editable-packages-fix
Fix environment
2018-11-19 15:02:44 +08:00
Frost Ming e575f87074 Merge branch 'master' into editable-packages-fix 2018-11-19 14:27:58 +08:00
Dan Ryan 969703e38f Merge branch 'bugfix/3249' into vendoring-update
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 01:15:41 -05:00
Dan Ryan 200775e05c Add manifest
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 01:15:06 -05:00
Dan Ryan de2cd76af7 fix manifest
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 01:14:10 -05:00
Dan Ryan fad64653cc Remove local tests
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 01:13:00 -05:00
Dan Ryan 9560aa60aa Update requirementslib and pythonfinder
- Fixes #3242
- Fixes #3232
- Fixes #3229
- Fixes #3234

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 01:09:32 -05:00
Dan Ryan 5b460706c4 Merge branch 'bugfix/3239' into bugfix/3249 2018-11-19 00:04:36 -05:00
Dan Ryan f654b24882 Merge branch 'bugfix/3239' of github.com:pypa/pipenv into bugfix/3239 2018-11-19 00:02:47 -05:00
Dan Ryan ae389f06e7 Update vistir
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-19 00:02:20 -05:00
Dan Ryan d407ac4740 Add submodule sync and update to scripts
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-18 23:55:50 -05:00
Dan Ryan 45e9f6e417 Fix parsing of markers in VCS requirements
- Parsing of markers in non-editable vcs requirements was broken
- This PR adds some VCS repos, some utility pipfile generation functions
  and some fixture helpers
- Fixes #3249

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-18 23:49:57 -05:00
frostming 52499dfa9a don't expand var for command 2018-11-19 10:47:19 +08:00
Dan Ryan 6598674500 Merge branch 'master' into bugfix/3239 2018-11-18 17:49:44 -05:00
Dan Ryan 17c93ebf0f Fix stdout spinner writing
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-18 17:44:06 -05:00
Dan Ryan 589b1a4f20 Redirect all spinner output to stderr
- Fixes #3239

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-11-17 21:47:54 -05:00
Frost Ming e909d9b84f do not check on windows
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-18 09:42:04 +08:00
Frost Ming bd9c40b79f Merge pull request #3237 from christek91/master
Fix race condition when installing 2+ editable non-VCS pkgs at once
2018-11-18 09:21:21 +08:00
Frost Ming 5e94bcb595 fix case for windows
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-18 08:56:43 +08:00
Frost Ming 6cfa466672 Merge branch 'master' into master 2018-11-18 08:52:13 +08:00
Chris Miller cba5a1efc6 Remove debug print from test. 2018-11-17 12:52:12 -05:00
Frost Ming 6901eae31d expand env before run script
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 22:53:07 +08:00
Frost Ming 32f5d85b0b Pop VIRTUAL_ENV env
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 19:42:43 +08:00
Frost Ming 915b3c1334 ignore PIPENV_ACTIVE in testing
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 18:23:28 +08:00
Frost Ming a8f52eb0a6 determin virtualenv location on the run
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 17:51:26 +08:00
Frost Ming df924d3ea3 Merge branch 'master' into editable-packages-fix 2018-11-17 17:50:10 +08:00
Frost Ming 301e4a918d Merge pull request #3235 from pypa/bugfix/3233
Derive missing values of source from existing fields
2018-11-17 16:28:28 +08:00
frostming 905c8c062a Derive missing values of source from existing fields
Signed-off-by: frostming <mianghong@gmail.com>
2018-11-17 15:50:19 +08:00
Frost Ming ab09a3d7e4 Merge pull request #3221 from 5uper5hoot/patch-2
Doc fixes in 'A Note about VCS Dependencies' section.
2018-11-17 15:45:08 +08:00
Frost Ming 510fe5ae23 Merge branch 'master' into patch-2 2018-11-17 13:13:39 +08:00
Frost Ming 748d22b2f2 virtualenv fixture and a test case
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 13:08:12 +08:00
Dan Ryan ce0ed98db8 Merge pull request #3226 from pypa/bugfix/3222
Don't disable --user when --system is passed
2018-11-16 23:16:13 -05:00
Frost Ming 95c70c3f61 Correct the virtualenv location passed to environment
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 11:37:22 +08:00
Frost Ming 5d8ac0901c add news
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 09:37:32 +08:00
Frost Ming ff8d17f383 switch to pathlib tmpdir
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 08:59:06 +08:00
Chris Miller 70f6bec85e Use cross platform Path compatibility module in test. 2018-11-16 13:33:22 -05:00
Frost Ming 483621f478 recognize editable packages as in project
Signed-off-by: Frost Ming <mianghong@gmail.com>
2018-11-17 00:10:46 +08:00
Chris Miller 65e49f1bff Print generated Pipfile during test to help debug failures. 2018-11-16 10:23:51 -05:00
Chris Miller db1eb1bacb Use correct Path module to get tests to work. 2018-11-16 10:23:51 -05:00
Chris Miller a95ce8bb32 Remove unnecessary test marks and imports. 2018-11-16 10:23:51 -05:00
Chris Miller 262293699e Fix race condition when installing 2+ editable non-VCS pkgs at once
This regression was recently introduced, and only affects non-vcs
packages. The effect of the race is that installations of multiple
editable non-VCS sourced packages at once may cause some of them to be
un-importable.

The fix is to make editable package installs Blocking just like VCS
installs are.
2018-11-16 10:23:51 -05:00
Dan Ryan 6ef5b4c81b Merge branch 'master' into bugfix/3222 2018-11-15 19:10:58 -05:00
Dan Ryan 33e07181d3 Merge pull request #3225 from pypa/bugfix/3223
Fix encoding issues and python discovery
2018-11-15 19:10:43 -05:00