diff options
| author | goodwillcoding <goodwillcoding@webhippo.net> | 2014-04-20 23:54:02 -0400 |
|---|---|---|
| committer | goodwillcoding <goodwillcoding@webhippo.net> | 2014-04-20 23:54:02 -0400 |
| commit | 2f66ff514717b29bf1cd5fea668164ac67d70cea (patch) | |
| tree | 6c1e6acbaf1fbd87828459e8b0dafd87c29d1be6 | |
| parent | d8b2960afcf45b1dbb8cde40e9b582a70751ae95 (diff) | |
| parent | 64b65d11bc414ca91cf266a888445a3cedb65efd (diff) | |
| download | pyramid-2f66ff514717b29bf1cd5fea668164ac67d70cea.tar.gz pyramid-2f66ff514717b29bf1cd5fea668164ac67d70cea.tar.bz2 pyramid-2f66ff514717b29bf1cd5fea668164ac67d70cea.zip | |
Merge pull request #1313 from goodwillcoding/scaffold_version
Issue: #1300, pyramid versiona and scaffold docs, add correct handling for dev docs which now points to 'master' docs
| -rw-r--r-- | pyramid/scripts/pcreate.py | 18 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_pcreate.py | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py index d6d6952cc..4c1f432fb 100644 --- a/pyramid/scripts/pcreate.py +++ b/pyramid/scripts/pcreate.py @@ -88,13 +88,19 @@ class PCreateCommand(object): # get pyramid package version pyramid_version = self.pyramid_dist.version - # map pyramid package version of the documentation branch - # 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() + ## map pyramid package version of the documentation branch ## + # if version ends with 'dev' then docs version is 'master' + if self.pyramid_dist.version[-3:] == 'dev': + pyramid_docs_branch = 'master' else: - pyramid_docs_branch = 'latest' + # if not version is not 'dev' find the version.major_version string + # and combine it with '-branch' + version_match = re.match(r'(\d+\.\d+)', self.pyramid_dist.version) + if version_match is not None: + pyramid_docs_branch = "%s-branch" % version_match.group() + # if can not parse the version then default to 'latest' + else: + 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 8d90ac442..2488e9595 100644 --- a/pyramid/tests/test_scripts/test_pcreate.py +++ b/pyramid/tests/test_scripts/test_pcreate.py @@ -183,7 +183,7 @@ class TestPCreateCommand(unittest.TestCase): scaffold.vars, {'project': 'Distro', 'egg': 'Distro', 'package': 'distro', 'pyramid_version': '0.12dev', - 'pyramid_docs_branch': '0.12-branch'}) + 'pyramid_docs_branch': 'master'}) def test_scaffold_with_dev_pyramid_long_version(self): cmd = self._makeOne('-s', 'dummy', 'Distro') @@ -196,7 +196,7 @@ class TestPCreateCommand(unittest.TestCase): scaffold.vars, {'project': 'Distro', 'egg': 'Distro', 'package': 'distro', 'pyramid_version': '0.10.1dev', - 'pyramid_docs_branch': '0.10-branch'}) + 'pyramid_docs_branch': 'master'}) class Test_main(unittest.TestCase): |