Commit Graph

234 Commits

Author SHA1 Message Date
Dan Ryan 79bcbbab53 Fix safety zipfile generation
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-22 13:59:20 -04:00
Dan Ryan 1bc1bd75ac Add pipenv vendor dirs to safety runtime paths
- Fix configparser import and add patch in dparse
- Update patch on safety to add paths

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-20 18:26:31 -04:00
Dan Ryan 8e0d01998c Vendor safety outside of zipfile
- Vendor `pyyaml == 5.3.1`
- Vendor `dparse == 0.5.0`
- Vendor `safety == 1.8.7`
- Remove built `pyyaml` extensions and move `lib` directory to
  `vendor/yaml2` and `lib3` to `vendor/yaml3`
- Patch `safety` to use modified `pyyaml` paths
- Update outdated dependencies:
  - `urllib3 1.25.8 => 1.25.9`
  - `certifi 2019.11.28 => 2020.4.5.1`
  - `pyparsing 2.4.6 => 2.4.7`
  - `resolvelib 0.2.2 => 0.3.0`

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-20 17:23:57 -04:00
Dan Ryan e19129e5df Fix safety script and re-vendor safety
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-17 19:57:46 -04:00
Dan Ryan b93c49a54a Don't set default CA cert bundle
- Requests doesn't unpack zipped certs when they are set directly
- Zipped bundles are unpacked when they are discovered
- So we can just include certifi and put it on `sys.path`

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-17 01:47:50 -04:00
Dan Ryan b4b5691577 Fix failing pyup API key
- Update vendored safety package
- Swap to blank pyup API key by default (but allow custom key)
- Slightly improve safety revendoring
- Fixes #4188

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-16 21:23:37 -04:00
Dan Ryan 4bbcefb675 Update marker resolution
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:15:59 -04:00
Dan Ryan e03878d7c7 Add news entry and fix lockfile
- Drop pytest-tap
- Update azure pipelines config
- Borrow ramdisk configuration from pip
- Fix pyinstaller ref for python 2
- Add 0-minute timeout and add github workflow
- Add skip for pywin32
- Scale down to `-n auto` to reduce race conditions on windows
- Skip pywin32 on python 3.8 as the relevant dependencies aren't
  compatible
- Use default pip exists action = ignore to work around VCS race
  condition
- Create local temp directory to avoid crossing drive letter boundary on
  azure during CI runs
- Monkeypatch click windows console detection to return False in CI

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:06 -04:00
Dan Ryan ed8ae212c7 Fix tomlkit functools32 import
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:05 -04:00
Dan Ryan 7923151d2b Update vendoring script
- Pull licenses from .DIST-INFO files if available before cleaining up
  wheel metadata

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:04 -04:00
Dan Ryan bff39c5720 Update piptools patches
- Fix hash retrieval and reverse dependency traversal for wheel urls

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:03 -04:00
Dan Ryan 01157a21d7 Fix tomlkit patch and update library
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:03 -04:00
Dan Ryan 662e7c77c9 Update tomlkit patch
- Update tomlkit patch
- Update test artifacts

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:02 -04:00
Dan Ryan e7fc6e9425 Re-vendor dependencies
- Update tomlkit => 0.5.11

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:02 -04:00
Dan Ryan 14566756a0 Fix outline table conversion for new tomlkit release
- Fix conversion of outline tables with new tomlkit release
- Fix pip and pip-shims patches

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:01 -04:00
Dan Ryan e629c0ce02 Update vendor.txt and ecosystem libraries
- Update `pip_shims`, `pythonfinder`, `requirementslib`, `vistir`
- Add patches to update or fix import paths where necessary
- Hardcode funcsigs license

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:01 -04:00
Dan Ryan b5892c1d03 Add missing dependencies, fix patched pip path
- Add missing dependencies:
  - `zipp==0.6.0`
  - `more-itertools==5.0.0`
  - `importlib-metadata==1.3.0`
  - `funcsigs==1.0.2`
  - `contextlib2==0.6.0.post1`
- Fix patched pip import paths for CLI and resolver
- Update patches

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:00 -04:00
Dan Ryan d9cddcb890 Updated and re-patched vendored dependencies
- **click-completion**: ``0.5.1 => 0.5.2``
- **python-dotenv**: ``0.10.2 => 0.10.3``
- **jinja2**: ``2.10. => 2.10.3``
- **parse**: ``1.12.0 => 1.13.0``
- **pathlib2**: ``2.3.3 => 2.3.5``
- **pipreqs**: ``0.4.9 => 0.4.10``
- **urllib3**: ``1.25.2 => 1.25.7``
- **certifi**: ``2019.3.9 => 2019.11.28``
- **requirementslib**: ``1.5.1 => 1.5.4``
- **attrs**: ``19.1.0 => 19.3.0``
- **distlib**: ``0.2.9 => 0.3.0``
- **packaging**: ``19.0 => 19.2``
- **pyparsing**: ``2.3.1 => 2.4.5``
- **tomlkit**: ``0.5.3 => 0.5.8``
- **six**: ``1.12.0 => 1.13.0``
- **semver**: ``2.8.1 => 2.9.0``
- **vistir**: ``0.4.2 => 0.4.3``
- **pip-shims**: ``0.3.2 => 0.4.0``
- **yaspin**: ``0.14.3 => 0.15.0``
- **cerberus**: ``1.3.1 => 1.3.2``
- **pep517**: ``0.5.0 => 0.8.1``
- **orderedmultidict**: ``1.0 => 1.0.1``
- **pip**: ``19.0.3 => 19.3.1``
- **pip-tools**: ``3.5.0 => 4.3.0``

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-10 12:14:00 -04:00
frostming 7d36f3fbda Reformat codes 2019-09-06 18:06:05 +08:00
frostming 089bb57d7e Update vendor packages 2019-07-17 12:21:11 +08:00
Frost Ming 5e69bca451 Use autogenerated contributing.md 2019-07-14 16:45:19 +08:00
Frost Ming 2f619df5f9 Merge branch master 2019-07-14 15:36:41 +08:00
Dan Ryan 83868c8f1a Cut over to devpi for tests and improve logging
- Verbose logs will now write gracefully to the terminal even while the
  spinner is running (i.e. during locking)
- This PR also cuts over to Devpi for a backing cache rather than a
  hacked httpbin instance
- Inclues a refactor of `pip_install` to deduplicate logic
- Attempts to switch back to relying on native editable installs in pip
  as the current implementation is broken on master (i.e. nothing is
  installed in the virtualenv)
- Fixes #3809

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-06-25 01:26:49 -04:00
Dan Ryan 8b244bef51 Update locking to respect pep517 and isolation
- Fix verbosity and logging
- Clean minor fixes

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-06-25 01:07:33 -04:00
Dan Ryan f0e3bbaa79 parent 8ae44bc90b
author Dan Ryan <dan@danryan.co> 1554074378 -0400
committer Dan Ryan <dan@danryan.co> 1558982736 -0400
gpgsig -----BEGIN PGP SIGNATURE-----

 iQIzBAABCgAdFiEEb6jpcpb+5zzDideCsyDQTvvOpJUFAlzsMFAACgkQsyDQTvvO
 pJWZmRAAtge5wdprlLnKdWUYK5USZb7Uk3zJHi9UIvnO7nKP6UA/L2D/5nxZitvx
 pZI7cGG+8sLp2yZNtQZdW6LNM1jmRXgzdMLYQh/5zo5gbj6KLOw7erh0FU3L3uM6
 wNBNM135Eqt7b+4a4C5TEK2UjwRxBHAsF+3ZzUy+UJQqgQEKxFVxW4gC4yxpfMtL
 jipE8ludwuOIM88ZJapmLpv2R6adQTxWZedTlmczdsy2/WKGHTCCpWs96PBbntdI
 pVBmoXfMhgZi+IuGR3iBYU0qS97vjJ8Te9tQZAaB9JGSqv3hHDWo1ht/rrG2RXzp
 3i0Cf2vG4035EUh56VYE9FCC9m6Vu3U9iIR34BZG9K5+lDP7pmJmjT+GymEgMP0N
 GoP3LYUO+dJjMjaUEMsC6QIi6DAots3uk4lxIw3wcA4Im/N/i5xafsRj1Eu3UdBL
 wBDKMz/FQjH+tD+mnvTlzaxD5vdhhCdBu1gK59rjNMlzg8hz6EF61QbHCaQHd4UI
 VOGIa8ThLlLI3addxzq/McceAc+OsLJ9hm06jkjvvoIuKrHyE3DybdbYQC7uEwyw
 2AvVuMDCPcciYQnkJhNTKmGvPcUDYD7cF91GKcUJKdPdyzDCeFEo5SUTKnLV4Cj2
 VD2sdVUk4jnmYfE4pCFvHKYooxQDMKQk/VCKl1c9QHL9/ijCx+o=
 =b+H1
 -----END PGP SIGNATURE-----

Ensure resolver doesn't compare editable specifiers

- Don't compare versions of editable dependencies when updating using
  `--keep-outdated` -- editable dependencies will now be updated to
  the latest version
- Ensure we don't drop markers from the lockfile when versions are not
  updated
- Fixes #3656
- Fixes #3659

Signed-off-by: Dan Ryan <dan@danryan.co>

Add future import for print function

Signed-off-by: Dan Ryan <dan@danryan.co>

Handle all possible markers in lockfiles

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix json import

Signed-off-by: Dan Ryan <dan@danryan.co>

point to correct reference for lockfile

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix marker merging errors

Signed-off-by: Dan Ryan <dan@danryan.co>

Prevent automatically setting `editable=True`

- Fixes #3647

Signed-off-by: Dan Ryan <dan@danryan.co>

Add new feature toggle for VCS dependency resolution

- Fixes #3577

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix syntax error

Signed-off-by: Dan Ryan <dan@danryan.co>

Use string for environment

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix class name resolution for py27

Signed-off-by: Dan Ryan <dan@danryan.co>

Write json files as unicode

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix resolution with env var

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-27 17:44:41 -04:00
Dan Ryan b4b54020b6 Merge branch 'master' into unused-vendor-shutilwhich 2019-05-26 17:08:42 -04:00
Dan Ryan fa56deacb1 Merge branch 'master' into unused-vendor-shutilwhich 2019-05-19 22:01:06 -04:00
Dan Ryan c187398d3f Merge branch 'master' into unused-vendors 2019-05-19 22:01:02 -04:00
Dan Ryan c23e57b482 Fix test and pipeline definitions
- Update extras name in pipelines
- fix windows virtualenv calls
- don't write debug info during virtualenv creation and just move on
- Generalize some pipelines
- Use quotes around evaluated statements in pipeline
- Fix envvar references
- Update vistir:
  - fix stream wrapper on windows
  - fix ICACLS permissions handler
  - fix path normalization function
- Update azure venv creation script
- Fix vendoring script

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-18 23:22:53 -04:00
Dan Ryan 7e394c39e7 Fix license download script
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-16 01:24:47 -04:00
Dan Ryan adc8d13168 Add dotenv patch to guard typing imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-16 00:41:15 -04:00
Dan Ryan cf6305ea7b Fix piptools patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-16 00:14:09 -04:00
Dan Ryan 65751d37c0 Update dependencies and fix azure pipeline definitions
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-15 23:57:00 -04:00
Dan Ryan 8e1e825041 Update vendored pip licenses
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-15 22:02:58 -04:00
Dan Ryan aa2b1d2618 Update piptools patch and re-lock
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-15 20:39:38 -04:00
Dan Ryan 289eac386f Update vendored dependencies
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-15 01:27:42 -04:00
Dan Ryan 90c2c66dc8 Update pythonfinder, requirementslib and vistir
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-05-11 01:30:25 -04:00
John Vandenberg 2481471b7d Remove unused vendored blindspin
This package is no longer used.

Closes https://github.com/pypa/pipenv/issues/3640
2019-05-08 19:30:56 +07:00
John Vandenberg d79ae0c270 Remove unused vendored shutilwhich
This package is no longer used.

Closes https://github.com/pypa/pipenv/issues/3621
2019-05-08 19:29:50 +07:00
Dan Ryan d937050884 Update pip patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-24 23:30:13 -04:00
Dan Ryan c5729523ee Update vistir to rely on new rmtree logic
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-21 01:16:42 -04:00
Dan Ryan 5e2ab186d7 Update resolver to fix tempdir usage
- Fix piptools patch
- Fix windows ansi/colorama implementation
- Write output even if no newline is found during resolution

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-20 20:38:15 -04:00
Dan Ryan fa31b64f37 Update vendored piptools and pip versions
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-20 12:15:00 -04:00
Dan Ryan 1ebebcd7bb Update piptools
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-20 00:04:23 -04:00
Dan Ryan 729e790ef4 Update pip version
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-19 01:12:54 -04:00
Dan Ryan 716dfb4804 Update vistir patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-04 13:35:32 -05:00
Dan Ryan be3c7714ee Cut in new cursor implementation
- Fix some errors in exception handler
- Update yaspin patch
- Fix spinner

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-03-02 14:20:30 -05:00
Dan Ryan 05d3b5af26 Update license download script
Signed-off-by: Dan Ryan <dan@danryan.co>
2019-02-24 22:34:26 -05:00
Dan Ryan ed3f206e64 Update vendored dependency pins
- Update gitignore entries for mypy config
- Update release task to add version after bumping but before release
- Fixes #3326 (going forward at least)
- Split out patching from vendoring so it can be done as a separate step
  if needed
- Update patches to account for updated packages
- Fixes #3432
- Fixes #2757
- Fixes #3305
- Fixes #2914
- Fixes #3439
- Fixes #3422
- Fixes #3378
- Fixes #3376
- Fixes #3315

Signed-off-by: Dan Ryan <dan@danryan.co>
2019-01-21 12:20:20 -05:00
jxltom 084bf41f77 Resort imports for tasks 2018-12-01 18:49:37 +08:00