Skip to content

Commit

Permalink
Version 0.3.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
sobolevn committed Dec 4, 2017
1 parent ef61187 commit d30fa7d
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 16 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: python

python:
- 2.7
- 3.4
- 3.5
- 3.6

Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
Changelog
---------

0.3.0
~~~~~

Improvements:

* Added `Django==2.0`
* Removed old versions of `Django` from test matrix
* Removed `python3.4` from test matrix
* Documentation updates
* Adds more `flake8` plugins to enforce strict style

Bugs:

* Fixes Windows problems via `#21 <https://github.com/sobolevn/django-split-settings/pull/21>`_


0.2.5
~~~~~

Expand All @@ -17,6 +33,7 @@ Bugs:

* Updated `README.rst` to be compatible with `PyPI`


0.2.4
~~~~~

Expand All @@ -30,6 +47,7 @@ Bugs:
* Removed `run_coveralls.py`, added `after_success` section in `.travis.yml`
* Changed the `README.rst` to be shorter


0.2.3
~~~~~

Expand All @@ -41,6 +59,7 @@ Bugs:
* Added tests for `[email protected]` in `tox` and `travis`
* Removed `3.2` and `3.3` from `setup.py` since these versions were not tested anyway


0.2.2
~~~~~

Expand All @@ -49,6 +68,7 @@ Bugs:
* Removed example
* Changed how `MANIFEST.in` is defined


0.2.1
~~~~~

Expand All @@ -58,28 +78,33 @@ Bugs:
* Added ``run_coveralls.py`` to work on both ``CI`` and local tests.
* Style fixes.


0.2.0
~~~~~

* Now ``tox`` is used for testing.
* Added ``coverage`` information and badge.
* Removed ``pep8`` utility, now using ``pylint``.


0.1.3
~~~~~

* Python 3.5 support, Django 1.9 test-support, documentation updates.


0.1.2
~~~~~

* Fixed Python 3 compatibility. Fixed `issue #7`_.


0.1.1
~~~~~

* Fixed `issue #1`_: now works with Gunicorn, too


0.1.0
~~~~~

Expand Down
5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ Read this `medium`_ post for more information.
Requirements
------------

We support ``django`` versions from ``1.5`` up to the most recent one.
While this package will most likely work with the most versions of ``django``, we do not officially support any versions except the latest release and the current LTS version, which are ``1.11`` and ``2.0`` right now.

This package has no dependencies itself.


Expand All @@ -44,6 +45,8 @@ Install by using ``pip``:
pip install django-split-settings
We also recommend to try `pipenv <https://docs.pipenv.org/>`_ to handle dependencies.


Usage
-----
Expand Down
16 changes: 7 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,16 @@
'flake8-builtins',
'flake8-commas',
'flake8-quotes',
'flake8<3.3.0', # fixes dependency resolution
'flake8-pep3101',
'flake8-comprehensions',
'flake8-blind-except',
'pep8-naming',
'flake8', # fixes dependency resolution
'pytest-flake8',

# This line should be the last one:
# https://github.com/pytest-dev/pytest-runner/issues/11
'pytest==3.0.7', # should be the last
'pytest', # should be the last line
]

SETUP_REQUIRES = [
Expand Down Expand Up @@ -71,18 +75,12 @@
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 1.5',
'Framework :: Django :: 1.6',
'Framework :: Django :: 1.7',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
'Framework :: Django :: 2.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Libraries :: Python Modules',
Expand Down
2 changes: 1 addition & 1 deletion split_settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
settings files.
"""

__version__ = '0.2.5'
__version__ = '0.3.0'

__all__ = ['__version__']
7 changes: 4 additions & 3 deletions split_settings/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def include(*args, **kwargs):
# optional)
files_to_include = glob.glob(pattern)
if not files_to_include and not isinstance(conf_file, _Optional):
raise IOError('No such file: %s' % pattern)
raise IOError('No such file: {}'.format(pattern))

for included_file in files_to_include:
included_file = os.path.abspath(included_file)
Expand All @@ -103,8 +103,9 @@ def include(*args, **kwargs):

# add dummy modules to sys.modules to make runserver autoreload
# work with settings components
module_name = ('_split_settings.%s' %
conf_file[:conf_file.rfind('.')].replace('/', '.'))
module_name = '_split_settings.{}'.format(
conf_file[:conf_file.rfind('.')].replace('/', '.'),
)

module = types.ModuleType(str(module_name))
module.__file__ = included_file
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27-dj15, py{27,34}-dj{16,17}, py{27,34,35,36}-dj{18,19,110,111}
envlist = py{27,35,36}-dj111, py{35,36}-dj20

[testenv]
recreate = False
Expand All @@ -12,5 +12,6 @@ deps =
dj19: Django<1.10
dj110: Django<1.11
dj111: Django<1.12
dj20: Django<2.1
commands =
python setup.py test

0 comments on commit d30fa7d

Please sign in to comment.