Commit Graph

4391 Commits

Author SHA1 Message Date
Erin O'Connell 6caed81e62 added support for mounted drives via unc paths. 2018-06-09 01:03:01 -06:00
Dan Ryan 1468b07c80 Merge pull request #2314 from pypa/2310-prepare-vcs-deps-before-resolving
Prepare vcs deps before resolution
2018-06-08 17:01:42 -04:00
Dan Ryan 7fc92d906b Merge branch 'master' into 2310-prepare-vcs-deps-before-resolving 2018-06-08 09:40:16 -04:00
Dan Ryan 0fa7bd8bd9 Merge pull request #2281 from JacobHenner/add_pypi_mirrors
Allow users to override default PyPI index URLs with PyPI mirror URLs
2018-06-08 00:47:35 -04:00
Jacob Henner af91eb68bb Add support for PyPI mirrors
Adds support for the --pypi-mirror command line parameter and the
PIPENV_PYPI_MIRROR environment variable for most pipenv operations.
This permits pipenv to function without pypi.org, which is necessary for
users:

    1. behind restrictive networks
    2. facing strict artifact sourcing policies
    3. experiencing poor performance connecting to pypi.org
    4. who've configured a local cache for performance reasons

When specified, the value of this parameter replaces all instances of
pypi.org and pypi.python.org within pipenv operations without modifying
or requring the modification of Pipfiles.

- Resolves #2075
2018-06-07 18:24:18 -04:00
Dan Ryan b6cac22c2f Merge branch 'master' into 2310-prepare-vcs-deps-before-resolving 2018-06-07 18:09:23 -04:00
Dan Ryan a9461cc2e5 Merge pull request #2304 from pypa/tweak-resolver
Resolver Tweaks
2018-06-07 18:09:13 -04:00
Dan Ryan 8af6317aea Merge branch 'master' into 2310-prepare-vcs-deps-before-resolving 2018-06-07 17:31:03 -04:00
Dan Ryan 92286b57a7 Merge branch 'master' into tweak-resolver 2018-06-07 17:20:24 -04:00
Tzu-ping Chung 2b37861f45 Merge pull request #2311 from muxator/patch-2
punctuation: removed unnecessary comma
2018-06-08 01:16:15 +08:00
Tzu-ping Chung b80dc95fdf Merge branch 'master' into patch-2 2018-06-08 01:04:21 +08:00
Tzu-ping Chung e00fce7335 Merge pull request #2309 from pypa/requirementtxt-fix
Don't search for requirements.txt if using pipfile
2018-06-08 01:04:11 +08:00
Tzu-ping Chung 0d5ab61760 Merge branch 'master' into requirementtxt-fix 2018-06-08 00:57:27 +08:00
Tzu-ping Chung 066dc938bb Merge pull request #2307 from greysteil/fix-typo
Fix typo (actually_resolve_reps -> actually_resolve_deps)
2018-06-08 00:18:39 +08:00
Dan Ryan cdde5b12bb Prepare vcs deps before resolution
- Ensure that VCS dependencies run through the RequirementPreparer
  before we call `get_dist()` on them.
- Fixes #2310

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-07 00:50:44 -04:00
muxator 0ab11ccb68 punctuation: removed unnecessary comma 2018-06-06 10:18:50 +02:00
Dan Ryan 83e1ba9a2d Don't search for requirements.txt if using pipfile
- Also don't search for requirements.txt if taking in a package name
- Fixes #2222

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-06 01:35:19 -04:00
Dan Ryan 157ebb1a60 Create temp src dir if not using environment
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-05 23:57:09 -04:00
Dan Ryan c8f4228533 Fix resolver bug
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-05 18:40:42 -04:00
Grey Baker 39ca6b272a Fix typo (actually_resolve_reps -> actually_resolve_deps) 2018-06-05 14:56:14 +01:00
Dan Ryan 54dd40473c Disable json resolver and tweak vcs resolution
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-05 01:05:44 -04:00
Dan Ryan e937d85515 Merge pull request #2301 from pypa/bugfix/2219-system-creates-virtualenv
Dont create virtualenvs with `--system --deploy`
2018-06-03 22:25:38 -04:00
Dan Ryan 8932f453e1 Dont create virtualenvs with --system --deploy
- Fixes #2219, #2273

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-03 21:25:59 -04:00
Dan Ryan 6e7d362e92 Merge pull request #2263 from pypa/better-activate-this-error
Provide better error message for activate_this.py
2018-06-03 21:13:00 -04:00
Dan Ryan 6d6e85b656 Merge branch 'master' into better-activate-this-error 2018-06-03 21:12:47 -04:00
Dan Ryan 62e01b43cc Merge pull request #2268 from pypa/bugfix/cli-graph
Fix pipenv graph
2018-06-03 21:11:52 -04:00
Dan Ryan 97115ee253 Merge branch 'master' into bugfix/cli-graph 2018-06-03 17:12:39 -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
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
Dan Ryan 3ce4299af7 Merge branch 'master' into better-activate-this-error 2018-05-29 00:22:00 -04:00
Dan Ryan 2a12340d7f Merge branch 'master' into bugfix/cli-graph 2018-05-28 18:56:35 -04: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