Commit Graph

4362 Commits

Author SHA1 Message Date
Dan Ryan 540b628ced Merge branch 'master' into patch-2 2018-06-03 17:13:10 -04:00
Dan Ryan 19b05b4e63 Merge pull request #2298 from pypa/windows-find-executable-pathext
Respect PATHEXT when looking for Win executable
2018-06-03 17:09:23 -04:00
Joakim Uddholm be3070027a Merge branch 'master' into patch-2 2018-06-03 15:41:32 +02:00
Tzu-ping Chung d48e97e1a8 Respect PATHEXT when looking for Win executable
... as idiomatic in Windows programming.
2018-06-03 15:51:37 +08:00
Tzu-ping Chung f91f53b5cc Merge pull request #2262 from pypa/nelfin-fix-2229
Nelfin fix 2229
2018-06-01 11:04:22 +08:00
Andrew Haigh 5788db3312 Fix IndexError parsing comments from pip freeze
Ref #2229. This change only fixes the issue seen when calling `pipenv
clean`. A future refactor should consolidate these behaviours (or use
the actual parsing of lines from pip, i.e. FrozenRequirement, if we can
rely on this API).
2018-06-01 07:24:34 +08:00
Andrew Haigh eb839e52b6 Add test of behaviour in issue #2229
requirements.txt files (and by extension pipfreeze) can contain comment
lines, but the stdout of pip freeze is used in a number of places with
the assumption that every line contains a dependency declaration. This
change adds an integration test that could trigger one of these cases
that was the cause of the behaviour seen in issue #2229.
2018-06-01 07:24:34 +08:00
Joakim Uddholm e8eba9931c Install git in dockerfile for git dependencies.
In my Pipfile I have the following package, while I'm waiting on the package authors' pypi release of a PR I made.
```
python-nomad = {git = "https://github.com/jrxFive/python-nomad"}
```

However when building my docker image I get the following:
```
Error [Errno 2] No such file or directory: 'git': 'git' while executing command git clone -q https://github.com/jrxFive/python-nomad /tmp/pip-build-yl5dapck/python-nomad
Cannot find command 'git'
```

I tried with the following Dockerfile
```Dockerfile
FROM kennethreitz/pipenv

RUN apt-get update & apt-get install git

COPY . /app

CMD [ "./start_worker.sh" ]
```
Apparently the `ONBUILD` commands in the parent pipenv image run before I get to install via apt.
2018-05-29 17:57:12 +02:00
Tzu-ping Chung e135f7c06f Merge pull request #2267 from pypa/feature/better-resolver
Feature/better resolver
2018-05-28 17:26:53 +09:00
Dan Ryan b60548172b Update patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-28 00:55:17 -04:00
Tzu-ping Chung a5e69e4a61 Comments 2018-05-28 13:37:34 +09:00
Dan Ryan 824f822bc7 Don't shell escape posix-style paths
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 14:34:21 -04:00
Dan Ryan 311c90d191 Fix lockfile filename parsing
- convert to string properly
2018-05-27 14:26:30 -04:00
Dan Ryan e993ee874d Use filesystem compatible encodings for strings
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 13:52:39 -04:00
Dan Ryan cc68b365e0 formatting cleanup and posix style paths
- fix for windows vcs urls

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 13:35:25 -04:00
Dan Ryan 6737ab8b03 SpecifierSet logic fix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 13:00:08 -04:00
Dan Ryan a4d838902c Logic fix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 12:56:46 -04:00
Dan Ryan 8548fbbb3e It is important to check for python_requires
- The specifierset will fail otherwise
 - We don't want to include only things that have this
   -- we want to _exclude_ things that do not match it

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 02:35:46 -04:00
Dan Ryan 9e661519e0 Probably write unicode strings...
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 02:27:58 -04:00
Dan Ryan eae8ac919c Update piptools patch
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 02:23:07 -04:00
Dan Ryan 892be4650e Merge branch 'feature/better-resolver' of github.com:pypa/pipenv into feature/better-resolver 2018-05-27 02:19:57 -04:00
Dan Ryan 1d54a32dc5 Add sources and caches to pip calls
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-27 02:19:32 -04:00
Tzu-ping Chung f91371aa55 Code clean up
This shouldn't affect any functionalities, only clean up some generator
usages to reduce repeated looping through requirements.
2018-05-27 14:02:00 +09:00
Dan Ryan f532b2eb86 Use pipenv cache dir for caching wheels
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 23:39:34 -04:00
Dan Ryan 297d3a05f3 Merge pull request #2269 from pypa/bugfix/windows-relpaths
Update requirementslib to fix windows paths
2018-05-26 21:05:38 -04:00
Dan Ryan 84c0b09193 Fix marker parsing bug
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 21:03:34 -04:00
Dan Ryan bba2f38d91 Patch piptools to use current environment python
- Fixes #2088, #2234, #1901
- Fully leverage piptools' compile functionality by using constraints
  in the same `RequirementSet` during resolution
- Use `PIP_PYTHON_PATH` for compatibility check to filter out
  `requires_python` markers
- Fix vcs resolution
- Update JSON API endpoints
- Enhance resolution for editable dependencies
- Minor fix for adding packages to pipfiles

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 21:03:34 -04:00
Dan Ryan 7abc2fd3a1 Use piptools constraints files more properly
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 21:02:51 -04:00
Dan Ryan d55e400379 Better handling of wheels / update requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 19:57:41 -04:00
Dan Ryan 513bdfb0d2 Update requirementslib to fix windows paths
- Fixes #2256

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-26 17:47:28 -04:00
Dan Ryan 9550056344 Merge pull request #2261 from pypa/venv-in-project-without-project
Fix venv discovery
2018-05-25 03:17:56 -04:00
Tzu-ping Chung 1e0882c74d Fix venv discovery
If we don't have a project, we don't have an associated environment.
2018-05-25 14:12:55 +09:00
Dan Ryan e41c0659fd Merge pull request #1962 from techalchemy/feature/requirements-refactor
Requirements Refactor (ready to merge, after conflict resolution)
2018-05-24 00:41:28 -04:00
Dan Ryan aa4ca1bfd4 Fix special case resolution with ignore python
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 23:55:09 -04:00
Dan Ryan e2dae9b50e Handle prep failures for dist preparation
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:54:35 -04:00
Dan Ryan fddde1cce3 Fix requirements cleanup
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:16:19 -04:00
Dan Ryan c154350934 Update requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:03:31 -04:00
Dan Ryan 4c53e6e72f Update vendored requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:03:31 -04:00
Dan Ryan 60e108cb17 Move requirements tests to requirement library
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:03:31 -04:00
Dan Ryan c58bf55385 Vendor pyparsing for packaging
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:03:30 -04:00
Dan Ryan 56f3d6191e Use vendored requirementslib for requirements
- Also update patch for pip

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:03:28 -04:00
Dan Ryan c406063755 Vendor requirementslib and cut old requirements
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:01:43 -04:00
Dan Ryan c50259f494 Update vendoring task
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:00:16 -04:00
Dan Ryan 4ce55b4c1f Add attrs to vendored deps and rebuild
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 22:00:13 -04:00
Dan Ryan b2085cb058 Mark pipenv check as flaky
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:59:50 -04:00
Dan Ryan eb4423b208 Fix test references to old requirements parser
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:59:50 -04:00
Dan Ryan 3167285286 Update tests for new requirements format
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:59:50 -04:00
Dan Ryan 5bd3e2dcfa Implement new requirement parser
- Leverage functionality where possible to avoid rework

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:59:47 -04:00
Dan Ryan cf1220ddeb vendor attrs
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:44:52 -04:00
Dan Ryan ef1b4bccd7 Implement requirements refactor
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-05-23 21:44:52 -04:00