Commit Graph

4431 Commits

Author SHA1 Message Date
Dan Ryan 463cf778cf Merge branch 'bugfix/windows-requirements-paths' of github.com:pypa/pipenv into bugfix/windows-requirements-paths 2018-06-13 18:54:20 -04:00
Tzu-ping Chung 4e4dfe2afa Clean up URL quote-unquote logic 2018-06-14 01:35:13 +08:00
Tzu-ping Chung ba23f5c819 Cherry-pick requirementslib@dae7cb2 2018-06-14 01:10:13 +08:00
Dan Ryan 1e99d0d132 Merge branch 'bugfix/windows-requirements-paths' of github.com:pypa/pipenv into bugfix/windows-requirements-paths 2018-06-13 11:49:35 -04:00
Dan Ryan ca05f2f3d6 Test fix and merge
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 11:49:17 -04:00
Tzu-ping Chung c781e55aa6 Apply patch from requirementslib upstream 2018-06-13 22:54:25 +08:00
Tzu-ping Chung 250ba9c36f Make use of relpath 2018-06-13 20:39:50 +08:00
Tzu-ping Chung c7568ebd58 Apply sarugaku/requirementslib#8 2018-06-13 20:05:29 +08:00
Dan Ryan ff134497b1 Fixes for windows paths, parsing
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-13 01:00:55 -04:00
Dan Ryan 15f091783b Fix VCS test
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 20:33:25 -04:00
Dan Ryan e376deea0d Requirementslib fixes
- Fixes #2344

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 19:41:27 -04:00
Dan Ryan 1525daea73 Parse windows paths and git repositories correctly
- Fix a bug affecting VCS repositories on all platforms not being
  turned into requirements correctly for handoff to piptools / pip
- Fix a bug with parsing paths on windows which caused us to mix
  posix-style and windows-style formatting in relative paths as well as
  cut off drives in certain circumstances

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 16:10:48 -04:00
Tzu-ping Chung e5ec2ed4fa More tests 2018-06-13 01:06:07 +08:00
Tzu-ping Chung 45004214bf Add failing test cases 2018-06-13 00:34:41 +08:00
Dan Ryan 9e04a85b8c I have fixed the test.
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 03:38:26 -04:00
Dan Ryan caf09662d6 Use constraint lines to update requirements
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 03:05:01 -04:00
Dan Ryan 50be8c31fa Cleanup resolver imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-12 02:43:21 -04:00
Dan Ryan d519718e55 Improved named requirement handling
- Use requirement.requirement.line objects when generating constraints
  for pip

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 23:49:57 -04:00
Erin O'Connell 0f59c74ac0 try except for first time run of lock 2018-06-11 18:30:04 -06:00
Dan Ryan 863ebbd89e Merge pull request #2287 from skurfer/shell-history
Cleaner shell history
2018-06-11 17:35:47 -04:00
Dan Ryan 487d58adcf Merge branch 'master' into shell-history 2018-06-11 13:03:28 -04:00
Dan Ryan eb7d4cde14 Merge pull request #2302 from pypa/bugfix/2260
Update requirementslib
2018-06-11 12:59:50 -04:00
Dan Ryan bc8639b181 Add ruamel.ordereddict wheel for cp27mu
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:31:49 -04:00
Dan Ryan 133344dbe1 Relative import fix
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:12:54 -04:00
Dan Ryan 8feb349cf5 Remove legacy file from requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:08:44 -04:00
Dan Ryan ebb14a290b Fix more relative imports
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan c76db9274d Update requirementslib - fix relative import
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan 9d4c9b1f62 Add init file to requirementslib vendor dir
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan e4290ed5d8 Include vendored pipfile in requirementslib
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan 3bb81d06c3 Update requirementslib ahead of #2158
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan d86fe41497 Return all sources for Requirement generation
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan 5b12b2cd9e Update Requirementslib calls with new API
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan df0b68d464 Update parsing of editable paths
- handle requirement parse errors more gracefully
- strip quotes
- pass through non-installable paths

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-11 00:06:49 -04:00
Dan Ryan a77363cd33 Update requirementslib
- Fixes #2260
2018-06-11 00:06:49 -04:00
Tzu-ping Chung 426dddc12e Merge pull request #2315 from pypa/resolver-refactor
Refactor and cleanup some locking code
2018-06-11 12:06:26 +08:00
Dan Ryan be75afb2a9 Add a space for markers that we transform
- Cleanup stale comments
- Deterministic ordering for locking

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-08 17:08:57 -04:00
Dan Ryan 0eb9c4c165 Typo... we want the key, not the whole entry
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-08 17:08:57 -04:00
Dan Ryan 168c93cfc1 Check marker key before generating string
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-08 17:08:57 -04:00
Dan Ryan 469db93005 Put a space between marker name and value
Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-08 17:08:57 -04:00
Dan Ryan 025f66899b Refactor and cleanup some locking code
- This has been driving me mad.

Signed-off-by: Dan Ryan <dan@danryan.co>
2018-06-08 17:08:55 -04: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