From dbb4e763ee1d2e9533281800953cbde50281dc0c Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 27 Mar 2015 15:35:04 +0000 Subject: [PATCH] version 0.9 shall now be known as version 1.0 --- CHANGELOG.txt | 2 +- docs/releases/{0.9.rst => 1.0.rst} | 2 +- docs/releases/index.rst | 2 +- wagtail/project_template/requirements.txt | 2 +- wagtail/utils/deprecation.py | 4 ++-- wagtail/wagtailadmin/edit_handlers.py | 4 ++-- wagtail/wagtailadmin/tests/test_edit_handlers.py | 6 +++--- wagtail/wagtailcore/__init__.py | 2 +- wagtail/wagtailimages/forms.py | 4 ++-- wagtail/wagtailimages/tests/tests.py | 6 +++--- 10 files changed, 17 insertions(+), 17 deletions(-) rename docs/releases/{0.9.rst => 1.0.rst} (99%) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e5651f540..4b68e6aa1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,7 @@ Changelog ========= -0.9 (xx.xx.xxxx) +1.0 (xx.xx.xxxx) ~~~~~~~~~~~~~~~~ * Added StreamField, a model field for freeform page content diff --git a/docs/releases/0.9.rst b/docs/releases/1.0.rst similarity index 99% rename from docs/releases/0.9.rst rename to docs/releases/1.0.rst index 760b7b0b1..bf79f94af 100644 --- a/docs/releases/0.9.rst +++ b/docs/releases/1.0.rst @@ -1,5 +1,5 @@ ========================================== -Wagtail 0.9 release notes - IN DEVELOPMENT +Wagtail 1.0 release notes - IN DEVELOPMENT ========================================== .. contents:: diff --git a/docs/releases/index.rst b/docs/releases/index.rst index 8c6fd48d9..ad48e0909 100644 --- a/docs/releases/index.rst +++ b/docs/releases/index.rst @@ -4,7 +4,7 @@ Release notes .. toctree:: :maxdepth: 1 - 0.9 + 1.0 0.8.6 0.8.5 0.8.4 diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt index 2ff3ab199..cccb37a38 100644 --- a/wagtail/project_template/requirements.txt +++ b/wagtail/project_template/requirements.txt @@ -1,6 +1,6 @@ # Minimal requirements Django>=1.7.1,<1.8 -wagtail==0.8.6 +wagtail==1.0b1 # Recommended components (require additional setup): # psycopg2==2.5.2 diff --git a/wagtail/utils/deprecation.py b/wagtail/utils/deprecation.py index dee19d6c9..27ebbc979 100644 --- a/wagtail/utils/deprecation.py +++ b/wagtail/utils/deprecation.py @@ -1,6 +1,6 @@ -class RemovedInWagtail10Warning(DeprecationWarning): +class RemovedInWagtail11Warning(DeprecationWarning): pass -class RemovedInWagtail11Warning(PendingDeprecationWarning): +class RemovedInWagtail12Warning(PendingDeprecationWarning): pass diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 4990485b0..67ef7e5a4 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -22,7 +22,7 @@ from taggit.managers import TaggableManager from wagtail.wagtailadmin import widgets from wagtail.wagtailcore.models import Page from wagtail.wagtailcore.utils import camelcase_to_underscore, resolve_model_string -from wagtail.utils.deprecation import RemovedInWagtail11Warning +from wagtail.utils.deprecation import RemovedInWagtail12Warning # Form field properties to override whenever we encounter a model field @@ -670,7 +670,7 @@ class InlinePanel(object): "InlinePanel no longer needs to be passed a model parameter. " "InlinePanel({classname}, '{relname}') should be changed to InlinePanel('{relname}')".format( classname=args[0].__name__, relname=self.relation_name - ), RemovedInWagtail11Warning, stacklevel=2) + ), RemovedInWagtail12Warning, stacklevel=2) else: raise TypeError("InlinePanel() takes exactly 1 argument (%d given)" % len(args)) diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index 0e38456ed..74128b3c5 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -22,7 +22,7 @@ from wagtail.wagtailcore.models import Page, Site from wagtail.wagtailcore.fields import RichTextArea from wagtail.tests.models import PageChooserModel, EventPageChooserModel, EventPage, EventPageSpeaker, SimplePage from wagtail.tests.utils import WagtailTestUtils -from wagtail.utils.deprecation import RemovedInWagtail11Warning +from wagtail.utils.deprecation import RemovedInWagtail12Warning class TestGetFormForModel(TestCase): @@ -532,9 +532,9 @@ class TestInlinePanel(TestCase, WagtailTestUtils): with warnings.catch_warnings(record=True) as w: SpeakerInlinePanelDef = InlinePanel(EventPage, 'speakers', label="Speakers") - # Check that a RemovedInWagtail11Warning has been triggered + # Check that a RemovedInWagtail12Warning has been triggered self.assertEqual(len(w), 1) - self.assertTrue(issubclass(w[-1].category, RemovedInWagtail11Warning)) + self.assertTrue(issubclass(w[-1].category, RemovedInWagtail12Warning)) self.assertTrue("InlinePanel(EventPage, 'speakers') should be changed to InlinePanel('speakers')" in str(w[-1].message)) SpeakerInlinePanel = SpeakerInlinePanelDef.bind_to_model(EventPage) diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/wagtailcore/__init__.py index fbeaf156c..f9f71d50f 100644 --- a/wagtail/wagtailcore/__init__.py +++ b/wagtail/wagtailcore/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.9.dev0' +__version__ = '1.0b1' default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig' diff --git a/wagtail/wagtailimages/forms.py b/wagtail/wagtailimages/forms.py index e3db916c8..7c08b172d 100644 --- a/wagtail/wagtailimages/forms.py +++ b/wagtail/wagtailimages/forms.py @@ -4,7 +4,7 @@ from django import forms from django.forms.models import modelform_factory from django.utils.translation import ugettext as _ -from wagtail.utils.deprecation import RemovedInWagtail11Warning +from wagtail.utils.deprecation import RemovedInWagtail12Warning from wagtail.wagtailimages.formats import get_image_formats from wagtail.wagtailimages.fields import WagtailImageField @@ -29,7 +29,7 @@ def get_image_form(model): "Custom image models without an 'admin_form_fields' attribute are now deprecated. " "Add admin_form_fields = (tuple of field names) to {classname}".format( classname=model.__name__ - ), RemovedInWagtail11Warning, stacklevel=2) + ), RemovedInWagtail12Warning, stacklevel=2) return modelform_factory( model, diff --git a/wagtail/wagtailimages/tests/tests.py b/wagtail/wagtailimages/tests/tests.py index b94df4e6b..f1f7bbbd9 100644 --- a/wagtail/wagtailimages/tests/tests.py +++ b/wagtail/wagtailimages/tests/tests.py @@ -12,7 +12,7 @@ from django.db import models from taggit.forms import TagField, TagWidget -from wagtail.utils.deprecation import RemovedInWagtail11Warning +from wagtail.utils.deprecation import RemovedInWagtail12Warning from wagtail.tests.models import CustomImageWithAdminFormFields, CustomImageWithoutAdminFormFields from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailimages.utils import generate_signature, verify_signature @@ -283,9 +283,9 @@ class TestGetImageForm(TestCase, WagtailTestUtils): with warnings.catch_warnings(record=True) as w: form = get_image_form(CustomImageWithoutAdminFormFields) - # Check that a RemovedInWagtail11Warning has been triggered + # Check that a RemovedInWagtail12Warning has been triggered self.assertEqual(len(w), 1) - self.assertTrue(issubclass(w[-1].category, RemovedInWagtail11Warning)) + self.assertTrue(issubclass(w[-1].category, RemovedInWagtail12Warning)) self.assertTrue("Add admin_form_fields = (tuple of field names) to CustomImageWithoutAdminFormFields" in str(w[-1].message)) # All fields, including the not editable one should be on the form