Merge pull request #3298 from pypa/bugfix/3148

Fix direct url dependency resolution

Author: techalchemy

.azure-pipelines/jobs/run-tests.yml

@@ -16,8 +16,9 @@ steps:
     export PIP_PROCESS_DEPENDENCY_LINKS="1"
     echo "Path $PATH"
     echo "Installing Pipenv…"
-    pip install -e "$(pwd)" --upgrade
+    pip install -e "$(pwd)[test]" --upgrade
     pipenv install --deploy --dev
+    pipenv run pip install -e "$(pwd)[test]" --upgrade
     echo pipenv --venv && echo pipenv --py && echo pipenv run python --version
   displayName: Make Virtualenv
 

.azure-pipelines/jobs/run-vendor-scripts.yml

@@ -10,9 +10,8 @@ jobs:
     maxParallel: 4
     matrix:
       ${{ if eq(parameters.vmImage, 'vs2017-win2016') }}:
-        # TODO remove once vs2017-win2016 has Python 3.7
         Python37:
-          python.version: '>= 3.7.0-b2'
+          python.version: '>= 3.7.2'
           python.architecture: x64
       ${{ if ne(parameters.vmImage, 'vs2017-win2016' )}}:
         Python37:
@@ -33,7 +32,7 @@ jobs:
       pip install certifi
       export GIT_SSL_CAINFO=$(python -m certifi)
       export LANG=C.UTF-8
-      python -m pip install --upgrade invoke requests parver bs4 vistir towncrier
+      python -m pip install --upgrade invoke requests parver bs4 vistir towncrier pip setuptools wheel --upgrade-strategy=eager
       python -m invoke vendoring.update
 
   - template: ./run-manifest-check.yml

.azure-pipelines/steps/create-virtualenv.yml

@@ -1,6 +1,6 @@
 steps:
 - script: |
     virtualenv D:\.venv
-    D:\.venv\Scripts\pip.exe install -e . && D:\.venv\Scripts\pipenv install --dev
+    D:\.venv\Scripts\pip.exe install -e .[test] && D:\.venv\Scripts\pipenv install --dev && D:\.venv\Scripts\pipenv run pip install -e .[test]
     echo D:\.venv\Scripts\pipenv --venv && echo D:\.venv\Scripts\pipenv --py && echo D:\.venv\Scripts\pipenv run python --version
   displayName: Make Virtualenv

.azure-pipelines/steps/install-dependencies.yml

@@ -1,3 +1,3 @@
 steps:
-- script: 'python -m pip install --upgrade pip && python -m pip install -e .'
+- script: 'python -m pip install --upgrade pip && python -m pip install -e .[test]'
   displayName: Upgrade Pip & Install Pipenv

.gitignore

@@ -153,3 +153,8 @@ venv.bak/
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 .vs/slnx.sqlite
+
+# mypy/typing section
+typeshed/
+.dmypy.json
+mypyhtml/

Pipfile

@@ -1,16 +1,11 @@
 [dev-packages]
-pipenv = {path = ".", editable = true}
+pipenv = {path = ".", editable = true, extras = ["test"]}
 "flake8" = ">=3.3.0,<4"
-pytest = "*"
-mock = "*"
 sphinx = "<=1.5.5"
 twine = "*"
 sphinx-click = "*"
-pytest-xdist = "*"
 click = "*"
-pytest-pypy = {path = "./tests/pytest-pypi", editable = true}
-pytest-tap = "*"
-flaky = "*"
+pytest-pypi = {path = "./tests/pytest-pypi", editable = true}
 stdeb = {version="*", markers="sys_platform == 'linux'"}
 black = {version="*", markers="python_version >= '3.6'"}
 pytz = "*"

Pipfile.lock

@@ -0,0 +1 @@
+Fixed a bug which caused editable package resolution to sometimes fail with an unhelpful setuptools-related error message.

news/2722.bugfix.rst

@@ -0,0 +1 @@
+Dependency resolution now writes hashes for local and remote files to the lockfile.

news/3053.bugfix.rst

@@ -0,0 +1 @@
+Fixed a bug which prevented ``pipenv graph`` from correctly showing all dependencies when running from within ``pipenv shell``.