Remove pytest pypi take 2

Pipfile

@@ -9,7 +9,6 @@ sphinx = "==4.*"
 sphinx-click = "==4.*"
 sphinxcontrib-spelling = "==7.*"
 click = "==8.0.3"
-pytest_pypi = {path = "./tests/pytest-pypi", editable = true}
 pypiserver = "==1.*"
 stdeb = {version="*", markers="sys_platform == 'linux'"}
 zipp = {version = "==3.6.0", markers = "python_version < '3.10'"}
@@ -20,6 +19,8 @@ typing-extensions = "==4.*"
 waitress = {version = "*", markers="sys_platform == 'win32'"}
 gunicorn = {version = "*", markers="sys_platform == 'linux'"}
 parse = "*"
+importlib-metadata = {version = "*", markers="python_version < '3.8'"}
+colorama= {version = "*", markers="sys_platform == 'win32'"}
 
 [packages]
 

pipenv/5556.removal.rst

@@ -0,0 +1 @@
+Remove pytest-pypi package since it's not used anymore

pyproject.toml

@@ -22,7 +22,6 @@ exclude = '''
   | pipenv/vendor
   | pipenv/patched
   | tests/pypi
-  | tests/pytest-pypi
   | tests/test_artifacts
   | get-pipenv.py
   | pyproject.toml
@@ -66,7 +65,6 @@ norecursedirs = [
     "tasks",
     "docs",
     "tests/test_artifacts",
-    "tests/pytest-pypi",
     "tests/pypi",
     "peeps",
 ]

tests/integration/conftest.py

@@ -26,10 +26,6 @@
     create_tracked_tempdir, handle_remove_readonly
 )
 
-from pytest_pypi.app import prepare_fixtures
-from pytest_pypi.app import prepare_packages as prepare_pypi_packages
-import pypiserver
-
 log = logging.getLogger(__name__)
 warnings.simplefilter("default", category=ResourceWarning)
 cli_runner = CliRunner(mix_stderr=False)
@@ -98,8 +94,6 @@ def check_for_mercurial():
 TESTS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 PYPI_VENDOR_DIR = os.path.join(TESTS_ROOT, 'pypi')
 WE_HAVE_HG = check_for_mercurial()
-prepare_fixtures(os.path.join(PYPI_VENDOR_DIR, "fixtures"))
-prepare_pypi_packages(PYPI_VENDOR_DIR)
 
 
 def pytest_runtest_setup(item):

tests/integration/test_lock.py

@@ -4,7 +4,6 @@
 
 import pytest
 
-import pytest_pypi.app
 from flaky import flaky
 from pipenv.vendor.vistir.misc import to_text
 from pipenv.utils.shell import temp_environ
@@ -64,12 +63,21 @@ def test_lock_includes_hashes_for_all_platforms(pipenv_instance_private_pypi):
     """ Locking should include hashes for *all* platforms, not just the
     platform we're running lock on. """
 
-    releases = pytest_pypi.app.packages['yarl'].releases
+    #releases = pytest_pypi.app.packages['yarl'].releases
+
+
+    releases = {'yarl-1.3.0-cp35-cp35m-manylinux1_x86_64.whl': '3890ab952d508523ef4881457c4099056546593fa05e93da84c7250516e632eb',
+                'yarl-1.3.0-cp35-cp35m-win_amd64.whl': 'b25de84a8c20540531526dfbb0e2d2b648c13fd5dd126728c496d7c3fea33310',
+                'yarl-1.3.0-cp36-cp36m-manylinux1_x86_64.whl': '5badb97dd0abf26623a9982cd448ff12cb39b8e4c94032ccdedf22ce01a64842',
+                'yarl-1.3.0-cp36-cp36m-win_amd64.whl': 'c6e341f5a6562af74ba55205dbd56d248daf1b5748ec48a0200ba227bb9e33f4',
+                'yarl-1.3.0-cp37-cp37m-win_amd64.whl': '73f447d11b530d860ca1e6b582f947688286ad16ca42256413083d13f260b7a0',
+                'yarl-1.3.0.tar.gz': '024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9',
+                }
     def get_hash(release_name):
         # Convert a specific filename to a hash like what would show up in a Pipfile.lock.
         # For example:
         # 'yarl-1.3.0-cp35-cp35m-manylinux1_x86_64.whl' -> 'sha256:3890ab952d508523ef4881457c4099056546593fa05e93da84c7250516e632eb'
-        return f"sha256:{releases[release_name].hash}"
+        return f"sha256:{releases[release_name]}"
 
     with pipenv_instance_private_pypi() as p:
         with open(p.pipfile_path, 'w') as f:
@@ -731,4 +739,4 @@ def test_pinned_pipfile_no_null_markers_when_extras(pipenv_instance_pypi):
         assert c.returncode == 0
         assert "dataclasses-json" in p.pipfile["packages"]
         assert "dataclasses-json" in p.lockfile["default"]
-        assert "markers" not in p.lockfile["default"]["dataclasses-json"]
+        assert "markers" not in p.lockfile["default"]["dataclasses-json"]