Merge pull request #33 from django-compressor/develop
Merge development changes for update on PyPI
This commit is contained in:
Carlton Gibson
40
.travis.yml
40
.travis.yml
@@ -1,30 +1,34 @@
|
||||
sudo: false
|
||||
language: python
|
||||
python:
|
||||
- 3.5
|
||||
env:
|
||||
- TOXENV=flake8-py27
|
||||
- TOXENV=flake8-py33
|
||||
- TOXENV=py26-dj14
|
||||
- TOXENV=py27-dj14
|
||||
- TOXENV=py26-dj15
|
||||
- TOXENV=py26-dj16
|
||||
- TOXENV=py27-dj15
|
||||
- TOXENV=py27-dj16
|
||||
- TOXENV=py32-dj15
|
||||
- TOXENV=py32-dj16
|
||||
- TOXENV=py33-dj15
|
||||
- TOXENV=py33-dj16
|
||||
- TOXENV=py27-dj17
|
||||
- TOXENV=flake8-py34
|
||||
- TOXENV=py27-dj18
|
||||
- TOXENV=py27-dj19
|
||||
- TOXENV=py32-dj17
|
||||
- TOXENV=py27-dj110
|
||||
- TOXENV=py32-dj18
|
||||
- TOXENV=py32-dj19
|
||||
- TOXENV=py33-dj17
|
||||
- TOXENV=py33-dj18
|
||||
- TOXENV=py33-dj19
|
||||
- TOXENV=py34-dj17
|
||||
- TOXENV=py34-dj18
|
||||
- TOXENV=py34-dj19
|
||||
- TOXENV=py34-dj110
|
||||
- TOXENV=py35-dj19
|
||||
- TOXENV=py35-dj110
|
||||
matrix:
|
||||
fast_finish: true
|
||||
allow_failures:
|
||||
- env: TOXENV=py27-dj110
|
||||
- env: TOXENV=py34-dj110
|
||||
- env: TOXENV=py35-dj110
|
||||
install:
|
||||
- pip install tox
|
||||
# Virtualenv < 14 is required to keep the Python 3.2 builds running.
|
||||
- pip install tox "virtualenv<14"
|
||||
|
||||
script:
|
||||
- tox
|
||||
notifications:
|
||||
irc: "irc.freenode.org#django-compressor"
|
||||
after_success:
|
||||
- pip install codecov
|
||||
- codecov
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
django-appconf
|
||||
==============
|
||||
|
||||
.. image:: https://secure.travis-ci.org/jezdez/django-appconf.png?branch=develop
|
||||
.. image:: http://codecov.io/github/django-compressor/django-appconf/coverage.svg?branch=develop
|
||||
:alt: Code Coverage
|
||||
:target: http://codecov.io/github/django-compressor/django-appconf?branch=develop
|
||||
|
||||
.. image:: https://secure.travis-ci.org/django-compressor/django-appconf.png?branch=develop
|
||||
:alt: Build Status
|
||||
:target: http://travis-ci.org/jezdez/django-appconf
|
||||
:target: http://travis-ci.org/django-compressor/django-appconf
|
||||
|
||||
A helper class for handling configuration defaults of packaged Django
|
||||
apps gracefully.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from __future__ import absolute_import
|
||||
from .base import AppConf # noqa
|
||||
|
||||
__version__ = "1.0"
|
||||
__version__ = "1.0.2"
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import sys
|
||||
|
||||
import six
|
||||
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
from django.utils import six
|
||||
|
||||
from .utils import import_attribute
|
||||
|
||||
@@ -123,11 +122,6 @@ class AppConf(six.with_metaclass(AppConfMetaClass)):
|
||||
def configured_data(self):
|
||||
return self._meta.configured_data
|
||||
|
||||
# For Python < 2.6:
|
||||
@property
|
||||
def __members__(self):
|
||||
return self.__dir__()
|
||||
|
||||
def __getattr__(self, name):
|
||||
if self._meta.proxy:
|
||||
return getattr(self._meta.holder, name)
|
||||
|
||||
@@ -1,6 +1,15 @@
|
||||
Changelog
|
||||
=========
|
||||
|
||||
1.0.2 (2016-04-19)
|
||||
------------------
|
||||
|
||||
* Minor fixes to test setup
|
||||
|
||||
* Update supported Django and Python versions, in line with Django's
|
||||
own supported versions.
|
||||
|
||||
|
||||
1.0 (2015-02-15)
|
||||
----------------
|
||||
|
||||
|
||||
2
setup.py
2
setup.py
@@ -29,7 +29,7 @@ setup(
|
||||
license='BSD',
|
||||
url='http://django-appconf.readthedocs.org/',
|
||||
packages=['appconf'],
|
||||
install_requires=['six'],
|
||||
install_requires=[],
|
||||
classifiers=[
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Web Environment',
|
||||
|
||||
@@ -2,6 +2,7 @@ from __future__ import absolute_import
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
from django.test import TestCase
|
||||
from django.test.utils import override_settings
|
||||
|
||||
from .models import (AppConf, TestConf, PrefixConf,
|
||||
YetAnotherPrefixConf, SeparateConf,
|
||||
@@ -52,12 +53,8 @@ class TestConfTests(TestCase):
|
||||
def test_dir_members(self):
|
||||
custom_conf = TestConf()
|
||||
self.assertTrue('TESTS_SIMPLE_VALUE' in dir(settings))
|
||||
if hasattr(settings, '__members__'): # django 1.5 removed __members__
|
||||
self.assertTrue('TESTS_SIMPLE_VALUE' in settings.__members__)
|
||||
self.assertTrue('SIMPLE_VALUE' in dir(custom_conf))
|
||||
self.assertTrue('SIMPLE_VALUE' in custom_conf.__members__)
|
||||
self.assertFalse('TESTS_SIMPLE_VALUE' in dir(custom_conf))
|
||||
self.assertFalse('TESTS_SIMPLE_VALUE' in custom_conf.__members__)
|
||||
|
||||
def test_custom_holder(self):
|
||||
CustomHolderConf()
|
||||
@@ -68,6 +65,18 @@ class TestConfTests(TestCase):
|
||||
self.assertTrue('TESTS_CONFIGURE_METHOD_VALUE2' in dir(settings))
|
||||
self.assertEqual(settings.TESTS_CONFIGURE_METHOD_VALUE2, False)
|
||||
|
||||
# Pair of tests checking override_settings compat.
|
||||
# See:
|
||||
# https://github.com/django-compressor/django-appconf/issues/29
|
||||
# https://github.com/django-compressor/django-appconf/issues/30
|
||||
@override_settings(TESTS_SIMPLE_VALUE=False)
|
||||
def test_override_settings_once(self):
|
||||
self.assertEqual(settings.TESTS_SIMPLE_VALUE, False)
|
||||
|
||||
@override_settings(TESTS_SIMPLE_VALUE=False)
|
||||
def test_override_settings_twice(self):
|
||||
self.assertEqual(settings.TESTS_SIMPLE_VALUE, False)
|
||||
|
||||
|
||||
class PrefixConfTests(TestCase):
|
||||
|
||||
|
||||
25
tox.ini
25
tox.ini
@@ -4,18 +4,18 @@ usedevelop = True
|
||||
minversion = 1.8
|
||||
envlist =
|
||||
flake8-py27,
|
||||
flake8-py33,
|
||||
py{26,27}-dj14,
|
||||
py{26,27,32,33}-dj{15,16},
|
||||
py{27,32,33,34}-dj{17,18,19},
|
||||
flake8-py34,
|
||||
py{27,32,33,34}-dj18,
|
||||
py{27,34,35}-dj19,
|
||||
py{27,34,35}-dj110
|
||||
|
||||
[testenv]
|
||||
basepython =
|
||||
py26: python2.6
|
||||
py27: python2.7
|
||||
py32: python3.2
|
||||
py33: python3.3
|
||||
py34: python3.4
|
||||
py35: python3.5
|
||||
pypy: pypy
|
||||
usedevelop = true
|
||||
setenv =
|
||||
@@ -23,15 +23,12 @@ setenv =
|
||||
DJANGO_SETTINGS_MODULE=tests.test_settings
|
||||
deps =
|
||||
flake8
|
||||
coverage
|
||||
py{27,33,34,35,pypy}: coverage
|
||||
py32: coverage==3.7.1 # latest coverage support py3.2
|
||||
django-discover-runner
|
||||
dj13: https://github.com/django/django/archive/stable/1.3.x.zip#egg=django
|
||||
dj14: https://github.com/django/django/archive/stable/1.4.x.zip#egg=django
|
||||
dj15: https://github.com/django/django/archive/stable/1.5.x.zip#egg=django
|
||||
dj16: https://github.com/django/django/archive/stable/1.6.x.zip#egg=django
|
||||
dj17: https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
|
||||
dj18: https://github.com/django/django/archive/stable/1.8.x.zip#egg=django
|
||||
dj19: https://github.com/django/django/archive/master.zip#egg=django
|
||||
dj18: https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
|
||||
dj19: https://github.com/django/django/archive/stable/1.9.x.tar.gz#egg=django
|
||||
dj110: https://github.com/django/django/archive/master.tar.gz#egg=django
|
||||
|
||||
commands =
|
||||
coverage run {envbindir}/django-admin.py test -v2 {posargs:tests}
|
||||
@@ -41,7 +38,7 @@ commands =
|
||||
commands = flake8 appconf
|
||||
deps = flake8
|
||||
|
||||
[testenv:flake8-py33]
|
||||
[testenv:flake8-py34]
|
||||
commands = flake8 appconf
|
||||
deps = flake8
|
||||
|
||||
|
||||
Reference in New Issue
Block a user