Merge branch 'release/1.0' into develop

sergei-maertens · Jan 15, 2016 · dbe99f0 · dbe99f0
2 parents 1eaa8e8 + b275b0d
commit dbe99f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.0
+---
+Added DEFAULT_JS_EXTENSIONS setting, as present in ``jspm``.
+Added Django 1.9 to the build matrix.
+
 0.3.4
 -----
 Fixes some mistakes from 0.3.3. Mondays...

diff --git a/setup.py b/setup.py
@@ -42,14 +42,17 @@ def read_file(name):
     platforms=['any'],
     url='https://github.com/sergei-maertens/django-systemjs',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Stable',
         'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
         'Intended Audience :: Developers',
         'Operating System :: Unix',
         'Operating System :: MacOS',
         'Operating System :: Microsoft :: Windows',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Application Frameworks'
     ]
 )
diff --git a/systemjs/__init__.py b/systemjs/__init__.py
@@ -1 +1 @@
-__version__ = '0.3.4'
+__version__ = '1.0'