diff options
| -rw-r--r-- | pyramid/scripts/pcreate.py | 16 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_pcreate.py | 10 |
2 files changed, 11 insertions, 15 deletions
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index ffa459588..d6d6952cc 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -89,18 +89,12 @@ class PCreateCommand(object): pyramid_version = self.pyramid_dist.version # map pyramid package version of the documentation branch - # if version ends with 'dev' then docs version is latest' - if self.pyramid_dist.version[-3:] == 'dev': - pyramid_docs_branch = 'latest' + # by finding the version.major version + vmatch = re.match(r'(\d+\.\d+)', self.pyramid_dist.version) + if vmatch is not None: + pyramid_docs_branch = "%s-branch" % vmatch.group() else: - # find the version.major version - major_version = re.match(r'(\d+\.\d+)', self.pyramid_dist.version) - # if can not find the version then default docs version to 'latest' - # otherwise the docs version is 'version.major_version-branch' - if major_version is None: - pyramid_docs_branch = 'latest' - else: - pyramid_docs_branch = "%s-branch" % major_version.group() + pyramid_docs_branch = 'latest' vars = { 'project': project_name, diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py index 8c697bf2a..8d90ac442 100644 --- a/pyramid/tests/test_scripts/test_pcreate.py +++ b/pyramid/tests/test_scripts/test_pcreate.py @@ -176,25 +176,27 @@ class TestPCreateCommand(unittest.TestCase): cmd = self._makeOne('-s', 'dummy', 'Distro') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] - cmd.pyramid_dist = DummyDist("0.2dev") + cmd.pyramid_dist = DummyDist("0.12dev") result = cmd.run() self.assertEqual(result, 0) self.assertEqual( scaffold.vars, {'project': 'Distro', 'egg': 'Distro', 'package': 'distro', - 'pyramid_version': '0.2dev', 'pyramid_docs_branch':'latest'}) + 'pyramid_version': '0.12dev', + 'pyramid_docs_branch': '0.12-branch'}) def test_scaffold_with_dev_pyramid_long_version(self): cmd = self._makeOne('-s', 'dummy', 'Distro') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] - cmd.pyramid_dist = DummyDist("0.2.1dev") + cmd.pyramid_dist = DummyDist("0.10.1dev") result = cmd.run() self.assertEqual(result, 0) self.assertEqual( scaffold.vars, {'project': 'Distro', 'egg': 'Distro', 'package': 'distro', - 'pyramid_version': '0.2.1dev', 'pyramid_docs_branch':'latest'}) + 'pyramid_version': '0.10.1dev', + 'pyramid_docs_branch': '0.10-branch'}) class Test_main(unittest.TestCase): |