Remove tests.lib.path.Path.__sub__ (#7151)

Author: pradyunsg

tests/functional/test_install.py

@@ -407,7 +407,9 @@ def test_basic_install_relative_directory(script, data):
     package_folder = script.site_packages / 'fspkg'
 
     # Compute relative install path to FSPkg from scratch path.
-    full_rel_path = data.packages.joinpath('FSPkg') - script.scratch_path
+    full_rel_path = Path(
+        os.path.relpath(data.packages.joinpath('FSPkg'), script.scratch_path)
+    )
     full_rel_url = (
         'file:' + full_rel_path.replace(os.path.sep, '/') + '#egg=FSPkg'
     )
@@ -1554,11 +1556,13 @@ def test_target_install_ignores_distutils_config_install_prefix(script):
         ''' % str(prefix)))
     target = script.scratch_path / 'target'
     result = script.pip_install_local('simplewheel', '-t', target)
-    assert (
-        "Successfully installed simplewheel" in result.stdout and
-        (target - script.base_path) in result.files_created and
-        (prefix - script.base_path) not in result.files_created
-    ), str(result)
+
+    assert "Successfully installed simplewheel" in result.stdout
+
+    relative_target = os.path.relpath(target, script.base_path)
+    relative_script_base = os.path.relpath(prefix, script.base_path)
+    assert relative_target in result.files_created
+    assert relative_script_base not in result.files_created
 
 
 @pytest.mark.network

tests/functional/test_install_reqs.py

@@ -10,6 +10,7 @@
     requirements_file,
 )
 from tests.lib.local_repos import local_checkout
+from tests.lib.path import Path
 
 
 @pytest.mark.network
@@ -70,7 +71,9 @@ def test_relative_requirements_file(script, data):
     package_folder = script.site_packages / 'fspkg'
 
     # Compute relative install path to FSPkg from scratch path.
-    full_rel_path = data.packages.joinpath('FSPkg') - script.scratch_path
+    full_rel_path = Path(
+        os.path.relpath(data.packages.joinpath('FSPkg'), script.scratch_path)
+    )
     full_rel_url = 'file:' + full_rel_path + '#egg=FSPkg'
     embedded_rel_path = script.scratch_path.joinpath(full_rel_path)
 

tests/lib/__init__.py

@@ -447,7 +447,7 @@ def __init__(self, base_path, *args, **kwargs):
             self.user_bin_path = scripts_base.joinpath('Scripts')
         else:
             self.user_bin_path = self.user_base_path.joinpath(
-                self.bin_path - self.venv_path
+                os.path.relpath(self.bin_path, self.venv_path)
             )
 
         # Create a Directory to use as a scratch pad
@@ -483,7 +483,10 @@ def __init__(self, base_path, *args, **kwargs):
         for name in ["base", "venv", "bin", "lib", "site_packages",
                      "user_base", "user_site", "user_bin", "scratch"]:
             real_name = "%s_path" % name
-            setattr(self, name, getattr(self, real_name) - self.base_path)
+            relative_path = Path(os.path.relpath(
+                getattr(self, real_name), self.base_path
+            ))
+            setattr(self, name, relative_path)
 
         # Make sure temp_path is a Path object
         self.temp_path = Path(self.temp_path)

tests/lib/path.py

@@ -66,23 +66,6 @@ def __idiv__(self, path):
 
     __itruediv__ = __idiv__
 
-    def __sub__(self, path):
-        """
-        Makes this path relative to another path.
-
-        >>> path_obj - '/home/a'
-        >>> path_obj - path_obj2
-        """
-        return Path(os.path.relpath(self, path))
-
-    def __rsub__(self, path):
-        """
-        Returns path relative to this path.
-
-        >>> "/home/a" - path_obj
-        """
-        return Path(os.path.relpath(path, self))
-
     def __add__(self, path):
         """
         >>> Path('/home/a') + 'bc.d'