From 75e58efab88cdfde9a908c8992cb42e3a9cb2a24 Mon Sep 17 00:00:00 2001 From: Tim Heap Date: Thu, 18 Aug 2016 14:49:19 +1000 Subject: [PATCH] Move version from wagtail.wagtailcore to wagtail This is where developers expect it to be, similar to Django and other projects. The version info still exists at the old `wagtail.wagtailcore` location, for backwards compatibility. Fixes #2557 --- client/README.md | 2 +- docs/conf.py | 2 +- setup.py | 2 +- wagtail/__init__.py | 12 ++++++++++++ wagtail/contrib/wagtailfrontendcache/backends.py | 2 +- wagtail/utils/setup.py | 2 +- wagtail/wagtailcore/__init__.py | 12 ++---------- wagtail/wagtailcore/templatetags/wagtailcore_tags.py | 2 +- wagtail/wagtailcore/tests/test_jinja2.py | 3 ++- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/client/README.md b/client/README.md index 28af81e93..1f1bcb5d8 100644 --- a/client/README.md +++ b/client/README.md @@ -37,6 +37,6 @@ webpack ## How to release -The front-end is bundled at the same time as the Wagtail project, via `setuptools`. You'll need to set the `__semver__` property to a npm-compliant version number in `wagtail.wagtailcore`. +The front-end is bundled at the same time as the Wagtail project, via `setuptools`. diff --git a/docs/conf.py b/docs/conf.py index ccd71fe1e..88aa52628 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,7 +75,7 @@ copyright = u'2015, Torchbox' # built documents. # Get Wagtail version -from wagtail.wagtailcore import __version__, VERSION +from wagtail import __version__, VERSION # The short X.Y version. version = '{}.{}'.format(VERSION[0], VERSION[1]) diff --git a/setup.py b/setup.py index c3fb98d33..3c48fe13c 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import sys -from wagtail.wagtailcore import __version__ +from wagtail import __version__ from wagtail.utils.setup import assets, sdist, check_bdist_egg try: diff --git a/wagtail/__init__.py b/wagtail/__init__.py index e69de29bb..cea9f52d5 100644 --- a/wagtail/__init__.py +++ b/wagtail/__init__.py @@ -0,0 +1,12 @@ +from __future__ import absolute_import, unicode_literals + +from wagtail.utils.version import get_semver_version, get_version + +# major.minor.patch.release.number +# release must be one of alpha, beta, rc, or final +VERSION = (1, 7, 0, 'alpha', 0) + +__version__ = get_version(VERSION) + +# Required for npm package for frontend +__semver__ = get_semver_version(VERSION) diff --git a/wagtail/contrib/wagtailfrontendcache/backends.py b/wagtail/contrib/wagtailfrontendcache/backends.py index f841a6223..e15459523 100644 --- a/wagtail/contrib/wagtailfrontendcache/backends.py +++ b/wagtail/contrib/wagtailfrontendcache/backends.py @@ -7,7 +7,7 @@ from django.utils.six.moves.urllib.error import HTTPError, URLError from django.utils.six.moves.urllib.parse import urlencode, urlparse, urlunparse from django.utils.six.moves.urllib.request import Request, urlopen -from wagtail.wagtailcore import __version__ +from wagtail import __version__ logger = logging.getLogger('wagtail.frontendcache') diff --git a/wagtail/utils/setup.py b/wagtail/utils/setup.py index 8c8a58697..7fb585caf 100644 --- a/wagtail/utils/setup.py +++ b/wagtail/utils/setup.py @@ -9,7 +9,7 @@ from setuptools import Command from setuptools.command.bdist_egg import bdist_egg from setuptools.command.sdist import sdist as base_sdist -from wagtail.wagtailcore import __semver__ +from wagtail import __semver__ class assets_mixin(object): diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py index b7153f04b..4912ba37b 100644 --- a/wagtail/wagtailcore/__init__.py +++ b/wagtail/wagtailcore/__init__.py @@ -1,15 +1,7 @@ from __future__ import absolute_import, unicode_literals -from wagtail.utils.version import get_semver_version, get_version - -# major.minor.patch.release.number -# release must be one of alpha, beta, rc, or final -VERSION = (1, 7, 0, 'alpha', 0) - -__version__ = get_version(VERSION) - -# Required for npm package for frontend -__semver__ = get_semver_version(VERSION) +# Imported for historical reasons +from wagtail import __semver__, __version__ # noqa def setup(): diff --git a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py index 6b383e435..13dac2e6e 100644 --- a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py +++ b/wagtail/wagtailcore/templatetags/wagtailcore_tags.py @@ -5,7 +5,7 @@ from django.template.defaulttags import token_kwargs from django.utils.encoding import force_text from django.utils.safestring import mark_safe -from wagtail.wagtailcore import __version__ +from wagtail import __version__ from wagtail.wagtailcore.models import Page from wagtail.wagtailcore.rich_text import RichText, expand_db_html diff --git a/wagtail/wagtailcore/tests/test_jinja2.py b/wagtail/wagtailcore/tests/test_jinja2.py index 3a15d84df..30cca2f1c 100644 --- a/wagtail/wagtailcore/tests/test_jinja2.py +++ b/wagtail/wagtailcore/tests/test_jinja2.py @@ -4,8 +4,9 @@ from django.template import engines from django.template.loader import render_to_string from django.test import TestCase +from wagtail import __version__ from wagtail.tests.testapp.blocks import SectionBlock -from wagtail.wagtailcore import __version__, blocks +from wagtail.wagtailcore import blocks from wagtail.wagtailcore.models import Page, Site