diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py index f4276a9ef..dc29ff08b 100644 --- a/ietf/dbtemplate/template.py +++ b/ietf/dbtemplate/template.py @@ -4,8 +4,9 @@ from docutils.core import publish_string from docutils.utils import SystemMessage import debug # pyflakes:ignore -from django.template.base import Template as DjangoTemplate, TemplateDoesNotExist, TemplateEncodingError -from django.template.loader import BaseLoader +from django.template import loaders +from django.template.base import Template as DjangoTemplate, TemplateEncodingError +from django.template.exceptions import TemplateDoesNotExist from django.utils.encoding import smart_unicode from ietf.dbtemplate.models import DBTemplate @@ -60,9 +61,9 @@ class RSTTemplate(PlainTemplate): e.args = tuple(args) raise e -class Loader(BaseLoader): - def __init__(self, *args, **kwargs): - super(Loader, self).__init__(self, *args, **kwargs) +class Loader(loaders.base.Loader): + def __init__(self, engine): + super(Loader, self).__init__(engine) self.is_usable = True def load_template(self, template_name, template_dirs=None): @@ -77,7 +78,7 @@ class Loader(BaseLoader): raise TemplateDoesNotExist(template_name) -_loader = Loader() +_loader = Loader(engine='django') def load_template_source(template_name, template_dirs=None): diff --git a/ietf/settings.py b/ietf/settings.py index f82887165..4607f2372 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -13,6 +13,8 @@ warnings.simplefilter("always", DeprecationWarning) warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report") warnings.filterwarnings("ignore", message="initial_data fixtures are deprecated. Use data migrations instead.", module="django.core.management.commands.loaddata") warnings.filterwarnings("ignore", message="The popen2 module is deprecated. Use the subprocess module.", module="ietf.utils.pipe") +warnings.filterwarnings("ignore", message="Reversing by dotted path is deprecated") +warnings.filterwarnings("ignore", message=r"Support for string view arguments to url\(\) is deprecated and will be removed in Django 1.10") try: import syslog diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py index 5a9a10e31..149d896c6 100644 --- a/ietf/settings_sqlitetest.py +++ b/ietf/settings_sqlitetest.py @@ -17,13 +17,13 @@ debug.debug = True ## To be removed after upgrade to Django 1.8 ## -from django.db.migrations.loader import MIGRATIONS_MODULE_NAME class DisableMigrations(object): def __contains__(self, item): return True def __getitem__(self, item): + from django.db.migrations.loader import MIGRATIONS_MODULE_NAME # The string below is significant. It has to include the value of # django.db.migrations.loader.MIGRATIONS_MODULE_NAME. Used by django # 1.7 code in django.db.migrations.loader.MigrationLoader to diff --git a/release-coverage.json.gz b/release-coverage.json.gz index 295c039a7..e6f327a3e 100644 Binary files a/release-coverage.json.gz and b/release-coverage.json.gz differ diff --git a/requirements.txt b/requirements.txt index 81b80afc3..e86c1e763 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ coverage>=4.0.1,!=4.0.2 #cssselect>=0.6.1 # for PyQuery decorator>=3.4.0 defusedxml>=0.4.1 # for TastyPie when ussing xml; not a declared dependency -Django>=1.8.16,<1.9 +Django>=1.9,<1.10 django-bootstrap3>=5.1.1,<7.0.0 # django-bootstrap 7.0 requires django 1.8 django-formtools>=1.0 # instead of django.contrib.formtools in 1.8 django-markup>=1.1 @@ -25,7 +25,6 @@ mock>=2.0.0 MySQL-python>=1.2.5 pathlib>=1.0 Pillow>=3.0 -pip>=6.1.1,<9.0 pyang>=1.6 pyflakes>=0.8.1 pyquery>=1.2.13,!=1.2.14 # Pyqyery 1.2.14 fails on some selectors or stacked selectors