Commit Graph

212 Commits

Author SHA1 Message Date
Frost Ming 10554c1c7d Fix pip shims import 2021-11-04 17:36:23 +08:00
Frost Ming a3ad42afa7 Update deps pip-shims and requirementslib 2021-11-04 16:06:59 +08:00
Frost Ming 6647954202 fix wrong pin for url requirements 2021-11-04 16:06:59 +08:00
Frost Ming 750cf98d28 Fix vendored pip issue 2021-11-04 16:06:56 +08:00
Frost Ming 859776e263 Switch the resolver to pip internal 2021-11-04 16:06:17 +08:00
Frost Ming 866a56d2e3 Apply patches for notpip 2021-11-04 16:05:26 +08:00
Frost Ming 9b4eb98529 Remove unused patch files 2021-07-28 17:30:17 +08:00
Frost Ming 17861457c4 Delete py2 compat dependencies 2021-07-27 21:53:59 +08:00
Frost Ming e21846953c fix test cases 2021-07-27 12:45:36 +08:00
Frost Ming fac3eaeaa7 Revendor packages and update patches 2021-07-27 09:45:57 +08:00
Frost Ming cd6fc80451 Inject vendor library root 2020-11-13 09:16:15 +08:00
Frost Ming 7b731533c1 update patch file 2020-11-12 22:31:04 +08:00
Frost Ming 0a7235b12e Add test case 2020-11-12 22:06:25 +08:00
Frost Ming fac49444a5 Change patch and vendoring scripts 2020-11-12 18:42:13 +08:00
Frost Ming a94afd2afd Restrict the acceptable hash type to SHA256 only 2020-11-05 09:17:25 +08:00
Frost Ming 2f92245172 Restore the whitespaces 2020-10-28 10:06:37 +08:00
Frost Ming d34feeece4 Fix the file encoding 2020-10-28 10:05:12 +08:00
Frost Ming 7bb6668cdf Update piptools patch 2020-10-28 09:57:49 +08:00
Frost Ming 491fa333b1 fix the hash value 2020-10-27 18:29:51 +08:00
Frost Ming 41b31a4392 revert format change 2020-10-27 17:06:20 +08:00
Frost Ming 52160d1a09 Encode hash value 2020-10-27 16:23:21 +08:00
Frost Ming 4236a71303 Reduce the number of internet requests to get hash 2020-10-27 16:09:56 +08:00
Frost Ming 8a215dd198 remove typing imports 2020-08-27 21:30:14 +08:00
frostming f58a97329e update vendors 2020-08-12 15:24:07 +08:00
frostming 034bd6a4fe Update requirementslib to 1.5.12 2020-07-10 16:06:14 +08:00
frostming 564ed68718 Update pythonfinder from 1.2.2 to 1.2.4 2020-06-01 21:47:06 +08:00
frostming c5d2129e2b Update requirementslib 2020-06-01 19:21:16 +08: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
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 4c10c35b57 Update vistir patch
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 19:48:37 -04:00
Dan Ryan 47aa2acc90 Set build_isolation and use_pep517 correctly
- Fix how `use_pep517` and `build_isolation` are read from the
  environment -- introduce a new environment helper to detect
  `<PREFIX>_<SETTING>` and `<PREFIX>_NO_<SETTING>`, check for booleans
  and return appropriately boolean, str, or None types
- Check for `False` values when adding `--no-use-pep517` and
  `--no-build-isolation` during resolution rather than falsey values
- Change environment variable name from `PIP_PYTHON_VERSION` to
  `PIPENV_REQUESTED_PYTHON_VERSION` to avoid causing `pip` to fail due
  to accidentally percieving the `python_version` flag as being set --
  this is an artifact from attempting to resolve outside of the
  virtualenv
- Add `pipenv` to the path of patched `notpip.__main__` to accommodate
  updated import fully qualified module names
- Update `pip` and `piptools` patches
- Add test packages for each of two known failure modes: outdated
  `setuptools` with a missing `build-backend` (which `pip` forces to
  `build_meta:__legacy__` & which doesn't exist before `40.8`), and
  `import Cython` statements in `setup.py` in packages with properly
  defined `pyproject.toml` `build-backend` lines.
- Fixes #4231
- Replaces, includes, and closes #4242

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>

Add integration tests for #4231

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-08 21:43:32 -04:00
Dan Ryan 7059a26fbd Float wheels to the top of the candidate sort order
- `ignore_compatibility` is meant to resolve hashes into the lockfile
  after resolution happens
- We still want compatible items to be the ones we actually tell pip to
  install
- Fixes #4231

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-08 09:59:09 -04:00
Dan Ryan c30155ff45 Fix recursive PEP 508 VCS resolution
- Recursively resolve PEP 508 URLs in subdependencies
  - Fix `piptools` cache storage of VCS dependencies as results
- Avoid saving VCS dependency versions to `Pipfile.lock`
- Fixes #3396
- Fixes #4217

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-05 23:44:34 -04:00
Dan Ryan 76576761c6 Allow incompatible links during hash lookup
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-28 11:47:00 -04:00
Dan Ryan ca1da4b295 Fix broken pip patch
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-27 16:59:53 -04:00
Dan Ryan d8f0100c08 Update patches for pip and piptools
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-27 15:28:30 -04:00
Dan Ryan d8be535006 Update patch for pep425tags to include os import
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-04-26 15:55: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 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 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