Commit Graph

6829 Commits

Author SHA1 Message Date
Frost Ming f640fcba77 Merge pull request #4287 from pypa/bugfix/4286
Add missing import and fix function calls in cli
2020-05-29 20:51:03 +08:00
Frost Ming 8b319340f8 Merge branch 'master' into bugfix/4286 2020-05-29 18:49:26 +08:00
Frost Ming b374f85941 Merge pull request #4285 from pypa/bugfix/4276-add-robustness
Improve virtualenv and venv detection
2020-05-29 18:48:19 +08:00
Frost Ming 265ba92225 Merge branch 'master' into bugfix/4276-add-robustness 2020-05-29 17:25:35 +08:00
Frost Ming a17a9abfd8 Merge pull request #4275 from pypa/bugfix/4273
Don't check against root directory
2020-05-29 17:25:01 +08:00
Frost Ming 193cab877a Merge branch 'master' into bugfix/4273 2020-05-29 15:10:43 +08:00
Frost Ming a8bf65a2c9 Merge pull request #4284 from pypa/bugfix/4276
Fix incorrect environment when inside venv
2020-05-29 15:10:15 +08:00
Dan Ryan 4d1d671e44 Merge branch 'master' into bugfix/4286 2020-05-29 02:25:22 -04:00
frostming dffcac1233 Only ignore errors for CI builds 2020-05-29 14:18:13 +08:00
Dan Ryan 95e83a3403 Add missing import and fix function calls in cli
- Add missing `PipenvOptionsError` import to `pipenv.cli.command`
- Fix calls to `click.echo` (should be just `echo`)
- Fixes #4286

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-29 02:03:05 -04:00
Dan Ryan faf16b4394 Merge branch 'master' into bugfix/4276-add-robustness 2020-05-29 01:55:23 -04:00
Dan Ryan fc50e6dbe7 Improve virtualenv and venv detection
- Virtualenv and venv detection depends on more than just an envvar
- Add improved detection mechanisms to `is_in_virtualenv()` function

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-29 01:53:47 -04:00
frostming 08ec79d5db fix filename 2020-05-29 13:40:50 +08:00
frostming af649b2b86 Fix incorrect environment when inside venv 2020-05-29 13:35:56 +08:00
frostming ac0e152a80 Ignore errors removing user cache dir 2020-05-29 13:01:53 +08:00
Frost Ming 800155f8e4 Merge pull request #4283 from GPHemsley/issue-4278
#4278: Don't pin wildcard versions in lockfile
2020-05-29 12:58:45 +08:00
Gordon P. Hemsley 873beae567 #4278: Don't pin wildcard versions in lockfile
Fixes bug introduced by 552d1274ea,
which activated the (unused) changes made much earlier in
a08a2da524.
2020-05-29 00:01:12 -04:00
frostming 3f4abadac2 Use InstallCommand to fetch options 2020-05-29 11:03:30 +08:00
Frost Ming f6567bb328 add news entry 2020-05-29 11:03:30 +08:00
Frost Ming bad0846246 Don't check against root directory 2020-05-29 11:03:30 +08:00
Dan Ryan b5becd8f3b Merge pull request #4280 from GPHemsley/issue-4279
#4279: Stop test_ssh_vcs_install from failing
2020-05-28 21:16:51 -04:00
Dan Ryan e0017e82ab Merge branch 'master' into issue-4279 2020-05-28 21:16:43 -04:00
Dan Ryan 789b334ea0 Merge pull request #4277 from brainwane/releaseprocess 2020-05-28 21:12:24 -04:00
Sumana Harihareswara 0ce098edff Remove pypa-dev mention in release process
Per https://groups.google.com/d/msg/pypa-dev/rUNsfIbruHM/LCEx-CB5AgAJ
the pypa-dev Google Group is now decommissioned.
Pointing to Discourse instead.

Signed-off-by: Sumana Harihareswara <sh@changeset.nyc>
2020-05-28 17:37:11 -04:00
Gordon P. Hemsley 0add59f499 #4279: Stop test_ssh_vcs_install from failing
Remove expectation of `version` key in `test_ssh_vcs_install` to
stop it from failing.

Mirrors similar change to `test_git_vcs_install` in
243b4fd0df.
2020-05-28 12:48:28 -04:00
Sumana Harihareswara 26f32513c5 Update release process to reflect Dan's notes
Towards issue #4130.

Signed-off-by: Sumana Harihareswara <sh@changeset.nyc>
2020-05-28 11:27:05 -04:00
Github Action 67cf7d0d91 Bumped version.
Signed-off-by: Github Action <action@github.com>
2020-05-28 04:54:23 +00:00
Dan Ryan 472618cf0d Release v2020.5.28 v2020.5.28 2020-05-28 00:04:32 -04:00
Dan Ryan ed30845837 Update gitignore and release task
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-28 00:03:57 -04:00
Dan Ryan 3bbdb74ef5 Fix whitespace
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-27 23:45:45 -04:00
Dan Ryan 06f5d7f58c Merge pull request #4267 from torsava/import-vendored-attrs 2020-05-27 23:15:15 -04:00
Dan Ryan 45675144bd Merge branch 'master' into import-vendored-attrs 2020-05-27 19:57:37 -04:00
Dan Ryan df664f2784 Add patch to update attrs import paths and add news entry.
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-27 19:57:02 -04:00
Dan Ryan 3acad96afd Fix piptools patch typo
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-27 19:49:56 -04:00
Tomas Orsava 41042cffee Make sure to import the vendored attrs 2020-05-25 16:53:13 +02:00
Github Action df0eabf0a4 Bumped version.
Signed-off-by: Github Action <action@github.com>
2020-05-20 20:42:31 +00:00
Dan Ryan 96df756c66 Release v2020.4.1b2 v2020.4.1b2 2020-05-20 16:12:15 -04:00
Dan Ryan a67882cf5d Fix improper restructured text code escape syntax
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 16:11:44 -04:00
Dan Ryan 8cc00622cc Update makefile to build docs
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 15:58:49 -04:00
Dan Ryan 12e46a0bfb Fix release file
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 15:24:13 -04:00
Dan Ryan 3549d28702 Update release script
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 15:12:12 -04:00
Dan Ryan db74ee692d Merge pull request #4183 from ncoghlan/issue-3316-lock-all-deps-with-dev 2020-05-20 12:38:55 -04:00
Dan Ryan 562dcaae4b Merge branch 'master' into issue-3316-lock-all-deps-with-dev 2020-05-20 11:39:55 -04:00
Dan Ryan b2cc53a59b Merge pull request #4257 from rafaelpivato/safety-key-flag 2020-05-20 11:39:11 -04:00
Dan Ryan ce5499db0f Added news entry
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 09:57:52 -04:00
Dan Ryan ff91fa958a Merge branch 'master' into issue-3316-lock-all-deps-with-dev 2020-05-20 02:49:42 -04:00
Dan Ryan 48f978449d Merge branch 'master' into safety-key-flag 2020-05-20 02:49:32 -04:00
Dan Ryan 49335ad1a8 Merge pull request #4262 from pypa/bugfix/4220 2020-05-20 02:49:09 -04:00
Dan Ryan ed780c4061 Tweak crayons patch with vendored imports
- Remove now-unused `allow_global` argument to pip install
  argument builder
- Update vistir version number and code to fix vendoring issue

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-20 01:47:48 -04:00
Dan Ryan 2c49876bcf Detect global setting at environment creation time
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 22:06:25 -04:00