[PIP Fix] Installing the default optional extra no matter what

wheelnext · Jan 21, 2025 · 8e4404a · 8e4404a
1 parent f522e85
commit 8e4404a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "Build Demo Plugin - Flavor A",
             "type": "debugpy",
             "request": "launch",
-            "cwd": "${workspaceFolder}/demo_pep_771_flavorA",
+            "cwd": "${workspaceFolder}/demoA",
             "console": "integratedTerminal",
             "justMyCode": false,
             "module": "build",
@@ -22,7 +22,7 @@
             "name": "Build Demo Plugin - Flavor B",
             "type": "debugpy",
             "request": "launch",
-            "cwd": "${workspaceFolder}/demo_pep_771_flavorB",
+            "cwd": "${workspaceFolder}/demoB",
             "console": "integratedTerminal",
             "justMyCode": false,
             "module": "build",
@@ -36,26 +36,30 @@
             "name": "Install Demo Plugin - Flavor A",
             "type": "debugpy",
             "request": "launch",
-            "cwd": "${workspaceFolder}/demo_pep_771_flavorA/dist",
+            "cwd": "${workspaceFolder}/mockhouse/pep-771/pep-771-demo-a",
             "console": "integratedTerminal",
             "justMyCode": false,
             "module": "pip",
             "args": [
                 "install",
-                "demo_pep_771_flavorA-1.0.0-py3-none-any.whl"
+                "--no-cache",
+                "--force-reinstall",
+                "pep_771_demo_a-1.0.0-py3-none-any.whl"
             ],
         },
         {
             "name": "Install Demo Plugin - Flavor B",
             "type": "debugpy",
             "request": "launch",
-            "cwd": "${workspaceFolder}/demo_pep_771_flavorB/dist",
+            "cwd": "${workspaceFolder}/mockhouse/pep-771/pep-771-demo-b",
             "console": "integratedTerminal",
             "justMyCode": false,
             "module": "pip",
             "args": [
                 "install",
-                "demo_pep_771_flavorB-1.0.0-py3-none-any.whl"
+                "--no-cache",
+                "--force-reinstall",
+                "pep_771_demo_b-1.0.0-py3-none-any.whl"
             ],
         },
         {
@@ -88,5 +92,20 @@
                 "pep-771-demo-a[flask]"
             ],
         },
+        {
+            "name": "Install Demo Plugin with Minimal",
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/",
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "module": "pip",
+            "args": [
+                "install",
+                "--verbose",
+                "--force-reinstall",
+                "pep-771-demo-a[minimal]"
+            ],
+        },
     ]
 }
diff --git a/README.md b/README.md
@@ -36,12 +36,6 @@ pip --version
 
 pip freeze | grep setuptools
 >>> setuptools @ git+/~https://github.com/wheel-next/setuptools.git@...
-
-pip freeze | grep validate-pyproject
->>> validate-pyproject @ git+/~https://github.com/wheel-next/validate-pyproject.git@...
-
-pip freeze | grep importlib_metadata
->>> importlib_metadata @ git+/~https://github.com/wheel-next/importlib_metadata.git@...
 ```
 
 2. Install the demo package:

diff --git a/mockhouse b/mockhouse
diff --git a/pep_771/pyproject.toml b/pep_771/pyproject.toml
@@ -12,6 +12,4 @@ authors = [
 dependencies = [
   "setuptools @ git+/~https://github.com/wheel-next/setuptools.git@pep_771",
   "pip @ git+/~https://github.com/wheel-next/pip.git@pep_771",
-  "validate-pyproject @ git+/~https://github.com/wheel-next/validate-pyproject.git@pep_771",
-  "importlib_metadata @ git+/~https://github.com/wheel-next/importlib_metadata.git@pep_771",
 ]
diff --git a/pip b/pip