Remove deprecated support for build.py.props config filename.

build.py.props.5

@@ -1 +0,0 @@
-.so man5/tito.props.5

src/tito/cli.py

@@ -68,13 +68,8 @@ class ConfigLoader(object):
         rel_eng_dir = os.path.join(find_git_root(), "rel-eng")
         filename = os.path.join(rel_eng_dir, TITO_PROPS)
         if not os.path.exists(filename):
-            # HACK: Try the old filename location, pre-tito rename:
+            error_out("Unable to locate branch configuration: %s"
-            oldfilename = os.path.join(rel_eng_dir, "global.build.py.props")
+                "\nPlease run 'tito init'" % filename)
-            if os.path.exists(oldfilename):
-                filename = oldfilename
-            else:
-                error_out("Unable to locate branch configuration: %s"
-                    "\nPlease run 'tito init'" % filename)
 
         # Load the global config. Later, when we know what tag/package we're
         # building, we may also load that and potentially override some global
@@ -120,21 +115,11 @@ class ConfigLoader(object):
 
     def _read_project_config(self):
         """
-        Read and return project build properties if they exist.
+        Read project specific tito config if it exists.
 
-        How to describe this process... we're looking for a tito.props or
+        If no tag is specified we use tito.props from the current HEAD.
-        build.py.props (legacy name) file in the project directory.
+        If a tag is specified, we try to load a tito.props from that
-
+        tag.
-        If we're operating on a specific tag, we're looking for these same
-        file's contents back at the time the tag was created. (which we write
-        out to a temp file and use instead of the current file contents)
-
-        If we can find project specific config, we return the path to that
-        config file, and a boolean indicating if that file needs to be cleaned
-        up after reading.
-
-        If no project specific config can be found, settings come from the
-        global tito.props in rel-eng/, and we return None as the filepath.
         """
         debug("Determined package name to be: %s" % self.package_name)
 
@@ -146,16 +131,8 @@ class ConfigLoader(object):
         current_props_file = os.path.join(os.getcwd(), TITO_PROPS)
         if (os.path.exists(current_props_file)):
             properties_file = current_props_file
-        else:
-            # HACK: Check for legacy build.py.props naming, needed to support
-            # older tags:
-            current_props_file = os.path.join(os.getcwd(),
-                    "build.py.props")
-            if (os.path.exists(current_props_file)):
-                sys.stderr.write("Warning: build.py.props file is obsolete. Please rename it to 'tito.props'.\n")
-                properties_file = current_props_file
 
-        # Check for a build.py.props back when this tag was created and use it
+        # Check for a tito.props back when this tag was created and use it
         # instead. (if it exists)
         if self.tag:
             relative_dir = get_relative_project_dir(self.package_name, self.tag)
@@ -165,12 +142,6 @@ class ConfigLoader(object):
                     TITO_PROPS)
             debug(cmd)
             (status, output) = getstatusoutput(cmd)
-            if status > 0:
-                # Give it another try looking for legacy props filename:
-                cmd = "git show %s:%s%s" % (self.tag, relative_dir,
-                        "build.py.props")
-                debug(cmd)
-                (status, output) = getstatusoutput(cmd)
 
             temp_filename = "%s-%s" % (random.randint(1, 10000),
                     TITO_PROPS)

test/functional/multiproject_tests.py

@@ -128,19 +128,6 @@ class MultiProjectTests(TitoGitTestFixture):
         new_ver = get_latest_tagged_version(TEST_PKG_2)
         self.assertTrue(release_bumped(start_ver, new_ver))
 
-    def test_release_tagger_legacy_props_file(self):
-        # Test that build.py.props filename is still picked up:
-        os.chdir(os.path.join(self.repo_dir, 'pkg2'))
-        start_ver = get_latest_tagged_version(TEST_PKG_2)
-        run_command("git mv tito.props build.py.props")
-        index = self.repo.index
-        index.add(['pkg2/build.py.props'])
-        index.commit("Rename to build.py.props.")
-
-        tito('tag --debug --accept-auto-changelog')
-        new_ver = get_latest_tagged_version(TEST_PKG_2)
-        self.assertTrue(release_bumped(start_ver, new_ver))
-
     def test_build_tgz(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg1'))
         artifacts = tito('build --tgz')

tito.spec

@@ -55,7 +55,6 @@ rm -f $RPM_BUILD_ROOT%{python_sitelib}/*egg-info/requires.txt
 %{__gzip} -c tito.8 > %{buildroot}/%{_mandir}/man8/tito.8.gz
 %{__gzip} -c tito.props.5 > %{buildroot}/%{_mandir}/man5/tito.props.5.gz
 %{__gzip} -c releasers.conf.5 > %{buildroot}/%{_mandir}/man5/releasers.conf.5.gz
-%{__gzip} -c build.py.props.5 > %{buildroot}/%{_mandir}/man5/build.py.props.5.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man5/titorc.5.gz
 %doc %{_mandir}/man5/tito.props.5.gz
 %doc %{_mandir}/man5/releasers.conf.5.gz
-%doc %{_mandir}/man5/build.py.props.5.gz
 %doc %{_mandir}/man8/tito.8.gz
 %{_bindir}/tito
 %{_bindir}/tar-fixup-stamp-comment.pl