Skip to content

Commit

Permalink
use current version for older releases
Browse files Browse the repository at this point in the history
  • Loading branch information
tino097 committed Jun 11, 2018
1 parent 30ca7aa commit 5d44bf7
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 4 deletions.
36 changes: 33 additions & 3 deletions doc/conf.py
Expand Up @@ -183,10 +183,26 @@ def get_status_of_this_version():
return 'unsupported'


def get_current_release_tag():
''' Return the name of the tag for the current release
e.g.: "ckan-2.7.4"
'''
release_tags_ = get_release_tags()

current_tag = "ckan-{}".format(version)

if release_tags_.__contains__(current_tag):
return current_tag
else:
return 'COULD_NOT_DETECT_TAG_VERSION'


def get_latest_release_tag():
'''Return the name of the git tag for the latest stable release.
e.g.: "ckan-2.1.1"
e.g.: "ckan-2.7.4"
This requires git to be installed.
Expand All @@ -212,6 +228,19 @@ def get_latest_release_version():
return version


def get_current_release_version():
'''Return the version number of the current release.
e.g. "2.1.1"
'''
version = get_current_release_tag()[len('ckan-'):]

# TODO: We could assert here that latest_version matches X.Y.Z.

return version


def get_latest_package_name(distro='trusty'):
'''Return the filename of the Ubuntu package for the latest stable release.
Expand Down Expand Up @@ -266,7 +295,8 @@ def write_substitutions_file(**kwargs):
f.write('.. |{name}| replace:: {substitution}\n'.format(
name=name, substitution=substitution))


current_release_tag = get_current_release_tag()
current_release_version = get_current_release_version()
latest_release_tag_value = get_latest_release_tag()
latest_release_version = get_latest_release_version()
latest_minor_version = latest_release_version[:3]
Expand All @@ -276,7 +306,7 @@ def write_substitutions_file(**kwargs):

write_substitutions_file(
latest_release_tag=latest_release_tag_value,
latest_release_version=get_latest_release_version(),
latest_release_version=latest_release_version,
latest_package_name_precise=get_latest_package_name('precise'),
latest_package_name_trusty=get_latest_package_name('trusty'),
latest_package_name_xenial=get_latest_package_name('xenial'),
Expand Down
2 changes: 1 addition & 1 deletion doc/maintaining/installing/install-from-docker-compose.rst
Expand Up @@ -71,7 +71,7 @@ Clone CKAN into a directory of your choice::
This will use the latest CKAN master, which may not be stable enough for production use.
To use a stable version, checkout the respective tag, e.g.::

git checkout tags/ckan-2.6.2
git checkout tags/|latest_release_tag|

----------------------
2. Build Docker images
Expand Down

0 comments on commit 5d44bf7

Please sign in to comment.