Merge pull request #5150 from pypa/drop-importlib_metadata_resources

Remove importlib_metadata and importlib_resources
pypa · Jun 30, 2022 · 3b41a22 · 3b41a22
2 parents 4b977e4 + 57f38c5
commit 3b41a22
Show file tree

Hide file tree

Showing 57 changed files with 149 additions and 3,729 deletions.
diff --git a/Makefile b/Makefile
@@ -38,9 +38,10 @@ install-virtualenvs.stamp: ${INSTALL_TARGETS}
 	@touch install-virtualenvs.stamp
 
 .PHONY: ramdisk
+ramdisk: SIZE ?= 4g
 ramdisk:
 	sudo mkdir -p /mnt/ramdisk
-	sudo mount -t tmpfs -o size=2g tmpfs /mnt/ramdisk
+	sudo mount -t tmpfs -o size=$(SIZE) tmpfs /mnt/ramdisk
 	sudo chown -R ${USER}:${USER} /mnt/ramdisk
 
 .PHONY: ramdisk-virtualenv
@@ -71,7 +72,7 @@ submodules:
 .PHONY: tests
 tests: parallel ?= -n auto
 tests: submodules test-install
-	. $(get_venv_path)/bin/activate && \
+	source $(get_venv_path)/bin/activate && \
 		pipenv run pytest -ra $(parallel) -vvv --full-trace --tb=long
 
 .PHONY: vendor

diff --git a/Pipfile b/Pipfile
@@ -6,7 +6,6 @@ sphinxcontrib-spelling = "==7.*"
 click = "==8.0.3"
 pytest_pypi = {path = "./tests/pytest-pypi", editable = true}
 stdeb = {version="*", markers="sys_platform == 'linux'"}
-importlib-metadata = {version = "==4.8.3", markers = "python_version < '3.10'"}
 zipp = {version = "==3.6.0", markers = "python_version < '3.10'"}
 pre-commit = "==2.*"
 atomicwrites = {version = "*", markers="sys_platform == 'win32'"}

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pipenv/vendor/importlib_metadata/LICENSE b/pipenv/vendor/importlib_metadata/LICENSE