Drop support for 'tag_svn_version' distribution option. Fixes #619.

4 files changed, 14 insertions, 24 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 149d270f..264b939a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+v33.0.0
+-------
+
+* #619: Removed support for the ``tag_svn_revision``
+  distribution option. If Subversion tagging support is
+  still desired, consider adding the functionality to
+  setuptools_svn in setuptools_svn #2.
+
 v32.3.1
 -------
 
diff --git a/docs/conf.py b/docs/conf.py
index fae8e632..c1854ed8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -157,6 +157,10 @@ link_files = {
                 url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
             ),
             dict(
+                pattern=r"setuptools_svn #(?P<setuptools_svn>\d+)",
+                url='{GH}/jaraco/setuptools_svn/issues/{setuptools_svn}',
+            ),
+            dict(
                 pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
                 with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
             ),
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 6f8fd874..98a87300 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -32,11 +32,6 @@ from setuptools.glob import glob
 
 from pkg_resources.extern import packaging
 
-try:
-    from setuptools_svn import svn_utils
-except ImportError:
-    pass
-
 
 def translate_pattern(glob):
     """
@@ -147,7 +142,6 @@ class egg_info(Command):
         self.egg_base = None
         self.egg_info = None
         self.tag_build = None
-        self.tag_svn_revision = 0
         self.tag_date = 0
         self.broken_egg_info = False
         self.vtags = None
@@ -165,7 +159,6 @@ class egg_info(Command):
         # when PYTHONHASHSEED=0
         egg_info['tag_build'] = self.tags()
         egg_info['tag_date'] = 0
-        egg_info['tag_svn_revision'] = 0
         edit_config(filename, dict(egg_info=egg_info))
 
     def finalize_options(self):
@@ -282,22 +275,10 @@ class egg_info(Command):
         version = ''
         if self.tag_build:
             version += self.tag_build
-        if self.tag_svn_revision:
-            warnings.warn(
-                "tag_svn_revision is deprecated and will not be honored "
-                "in a future release"
-            )
-            version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
             version += time.strftime("-%Y%m%d")
         return version
 
-    @staticmethod
-    def get_svn_revision():
-        if 'svn_utils' not in globals():
-            return "0"
-        return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info, "SOURCES.txt")
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 75ae18df..a32b981d 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -88,9 +88,8 @@ class TestEggInfo(object):
         assert '[egg_info]' in content
         assert 'tag_build =' in content
         assert 'tag_date = 0' in content
-        assert 'tag_svn_revision = 0' in content
 
-        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+        expected_order = 'tag_build', 'tag_date',
 
         self._validate_content_order(content, expected_order)
 
@@ -117,7 +116,6 @@ class TestEggInfo(object):
             [egg_info]
             tag_build =
             tag_date = 0
-            tag_svn_revision = 0
             """),
         })
         dist = Distribution()
@@ -131,9 +129,8 @@ class TestEggInfo(object):
         assert '[egg_info]' in content
         assert 'tag_build =' in content
         assert 'tag_date = 0' in content
-        assert 'tag_svn_revision = 0' in content
 
-        expected_order = 'tag_build', 'tag_date', 'tag_svn_revision'
+        expected_order = 'tag_build', 'tag_date',
 
         self._validate_content_order(content, expected_order)