Commit Graph

6758 Commits

Author SHA1 Message Date
Dan Ryan edce45c5c8 Merge pull request #4255 from pypa/bugfix/4226 2020-05-19 16:46:44 -04:00
Dan Ryan f81cec0840 Merge pull request #4259 from pypa/bugfix/3976 2020-05-19 15:39:20 -04:00
Dan Ryan f4fba43533 Update requirementslib and vistir
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 15:39:05 -04:00
Dan Ryan 243b4fd0df VCS version key removal
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 14:47:56 -04:00
Dan Ryan 07a7c6110f Remove version from VCS lock keys
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 14:23:01 -04:00
Dan Ryan befb29ceae Update requirement parser and lockfile generation for vcs dependencies, fix test
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 13:36:23 -04:00
Dan Ryan c4f6b7f6f4 use normalized names in lockfile
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 10:53:00 -04:00
Dan Ryan 1f96b8cf7d Fix package name in test
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 09:56:55 -04:00
Dan Ryan 1a8111d4bb Clean up tests
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 09:56:55 -04:00
Dan Ryan a0f82865f8 Add tests for VCS pep508 subdependencies
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 09:56:55 -04:00
Dan Ryan edf79f7132 Fix resolution of direct url subdependencies
- Fix resolution of direct url VCS subdependencies (e.g. top level dep
  depends on a VCS direct url subdependency) which rely on subdirectory
  resolution
- Fixes #3976

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 09:56:54 -04:00
Dan Ryan ad7a514563 Fix test that has been broken for who knows how long...
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 09:56:32 -04:00
Dan Ryan 9757dbf1bc Update requirementslib with fix for passing subdirectory to setup info
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-19 00:10:40 -04:00
Dan Ryan 03e12d4826 Update requirementslib
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-18 16:08:52 -04:00
Dan Ryan 9e13146e4e Merge branch 'bugfix/4226' of github.com:pypa/pipenv into bugfix/4226 2020-05-18 10:57:06 -04:00
Dan Ryan e2eef02670 Requirementslib bugfix to avoid miscategorizing local files as packages
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-18 10:55:03 -04:00
Dan Ryan 19bbb5e2e1 Merge branch 'master' into bugfix/4226 2020-05-17 01:15:48 -04:00
Frost Ming 760f7afaf1 Merge pull request #4246 from klaviyo/master
Allow pyenv/asdf to be used even if they are not on PATH
2020-05-17 08:03:26 +08:00
Dan Ryan 5a7ed8ff57 Parse requires-python values of old pythons
- Parse `Requires-Python` values specifying constraint versions of
  python starting from `1.x`
- Requires updated vendored dependencies including `vistir` and
 `requirementslib`:
  - **requirementslib** `1.5.8` => `1.5.9`
  - **vistir** `0.5.0` => `0.5.1`
  - **jinja2** `2.11.1` => `2.11.2`
  - **click** `7.1.1` => `7.1.2`
  - **dateutil** `(none)` => `2.8.1`
  - **backports.functools_lru_cache** `1.5.0` => `1.6.1`
  - **enum34** `1.1.6` => `1.1.10`
  - **toml** `0.10.0` => `0.10.1`
  - **importlib_resources** `1.4.0` => `1.5.0`

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-16 15:26:50 -04:00
Dan Ryan c4a165bce3 Re-vendor vistir and requirementslib
- Fix issues parsing direct dependency URLs
- Fix vistir `rmtree` error handling automated attempts at `chmod`
  invocation which may not always be permitted
- Fix nested direct dependency parsing
- Fixes #4226
- Fixes #3964

Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-14 20:15:07 -04:00
zbentley 0f999f5533 Remove dotenv sourcing 2020-05-14 17:20:39 -04:00
zbentley 11cef6fd35 Merge branch 'master' of github.com:klaviyo/pipenv 2020-05-14 13:53:17 -04:00
zbentley 1f0e064f3a Fix misnamed asdf invocation, and debug print 2020-05-14 13:53:00 -04:00
Zac Bentley e663691140 Merge branch 'master' into master 2020-05-13 14:55:40 -04:00
Frost Ming cb6cdb9644 Merge pull request #4252 from pypa/bugfix/4229
Fix the broken update --outdated handler
2020-05-13 20:34:24 +08:00
frostming 58822861c1 Keep the original deps set during loop 2020-05-13 17:49:55 +08:00
Zac Bentley f2016744a1 Merge branch 'master' into master 2020-05-12 18:25:36 -04:00
zbentley 9334872fb8 Missed imports, testing in an IDB is bad for you 2020-05-12 18:24:12 -04:00
zbentley 9fb2104911 Merge branch 'master' of github.com:klaviyo/pipenv 2020-05-12 18:02:02 -04:00
zbentley bbdb3236d0 Address reviewer comments 2020-05-12 18:01:49 -04:00
Dan Ryan dad1c2031e Merge pull request #4248 from pypa/bugfix/4231 2020-05-11 10:29:53 -04:00
Dan Ryan c7425e7508 Skip tests that build extensions on windows
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-09 10:55:01 -04:00
Dan Ryan 362a730fac Fix environment comparison code and add tests
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-09 00:41:49 -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
Zac Bentley 3a2f579cd4 Merge branch 'master' into master 2020-05-08 08:58:38 -04:00
zbentley b40ebc8644 Use 'six' reload polyfill 2020-05-07 20:11:15 -04:00
zbentley 64fe4df9ee Fix PYENV_YES variable 2020-05-07 20:03:33 -04:00
zbentley 7dc4633066 Missed a checkin; add load_dot_env to install subcommand 2020-05-07 17:51:49 -04:00
Dan Ryan 9ab617af77 Merge pull request #4243 from torsava/network-tests 2020-05-06 21:48:33 -04:00
zbentley 1b91f14957 Add news 2020-05-06 16:56:25 -04:00
zbentley f40d462741 Allow pyenv/asdf to be used even if they are not on PATH 2020-05-06 15:45:41 -04:00
Tomas Orsava de5cdf5949 Mark unit tests requiring network connection 2020-05-06 16:26:21 +02:00
Dan Ryan cdcf777c11 Merge pull request #4241 from pypa/bugfix/4217 2020-05-06 02:19:27 -04:00
Dan Ryan 2a72d42e3d Fix inadvertent build isolation setting
Signed-off-by: Dan Ryan <dan.ryan@canonical.com>
2020-05-06 01:39:05 -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
Frost Ming 02cca98d67 Merge pull request #4236 from pypa/bugfix/4232
Don't fallback to python unconstrained version
2020-05-05 09:53:52 +08:00
frostming bef684dc03 don't fallback to python unconstrained version 2020-05-04 20:51:15 +08:00
Frost Ming 3dcf0f33b9 Merge pull request #4230 from cocoatomo/patch-1
Lacking sphinxcontrib-spelling module
2020-05-03 15:43:38 +08:00
Frost Ming 24ab62ba67 Merge branch 'master' into patch-1 2020-05-03 09:28:44 +08:00