diff --git a/CHANGES.rst b/CHANGES.rst index a53f838..04ef82f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,9 +4,10 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to `Semantic Versioning `_. -develop -------- -* Dropped support for Django 1.7 (didn't work anyway). +0.19.1 +------ +* Dropped support for Django 1.7 (support expired on December 1 2015, + see https://www.djangoproject.com/download/#supported-versions). * Require `setuptools>=18.5` at install time due to use of `python_platform_implementation` environment marker. * Moved repository to https://github.com/django-ddp/django-ddp (new diff --git a/MANIFEST.in b/MANIFEST.in index 046ad9d..377c556 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,10 @@ include .gitignore include Makefile exclude tox.ini graft dddp/test/meteor_todos -graft dddp/test/build -prune docs +prune dddp/test/build +prune dddp/test/meteor_todos/.meteor/local +graft docs +prune docs/_build +prune docs/node_modules exclude .travis.yml.sh exclude .travis.yml diff --git a/Makefile b/Makefile index 6396fa7..91e6e1b 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,10 @@ clean-docs: $(MAKE) -C docs/ clean clean-dist: - rm -f "${SDIST}" "${WHEEL}" + rm -rf "${SDIST}" "${WHEEL}" dddp/test/build/ dddp/test/meteor_todos/.meteor/local/ clean-pyc: - find . -type f -name \*.pyc -print0 | xargs -0 rm + find . -type f -name \*.pyc -print0 | xargs -0 rm -f docs: $(shell find docs/ -type f -name \*.rst) docs/conf.py docs/Makefile $(shell find docs/_static/ -type f) $(shell find docs/_templates/ -type f) README.rst CHANGES.rst $(MAKE) -C docs/ clean html @@ -33,11 +33,11 @@ dist: ${SDIST} ${WHEEL} ${SDIST}: dist.intermediate @echo "Testing ${SDIST}..." - tox --installpkg ${SDIST} + tox --notest --installpkg ${SDIST} ${WHEEL}: dist.intermediate @echo "Testing ${WHEEL}..." - tox --installpkg ${WHEEL} + tox --notest --installpkg ${WHEEL} dist.intermediate: $(shell find dddp -type f) tox -e dist diff --git a/dddp/__init__.py b/dddp/__init__.py index 8270b31..e027d7f 100644 --- a/dddp/__init__.py +++ b/dddp/__init__.py @@ -4,7 +4,7 @@ import sys from gevent.local import local from dddp import alea -__version__ = '0.18.1' +__version__ = '0.19.0' __url__ = 'https://github.com/django-ddp/django-ddp' default_app_config = 'dddp.apps.DjangoDDPConfig' diff --git a/docs/conf.py b/docs/conf.py index 3f4c805..d60fa22 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -88,9 +88,9 @@ copyright = u'2015, Tyson Clugg' # built documents. # # The short X.Y version. -version = '0.18' +version = '0.19' # The full version, including alpha/beta/rc tags. -release = '0.18.1' +release = '0.19.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index c310252..260f9bc 100644 --- a/setup.py +++ b/setup.py @@ -81,7 +81,7 @@ CLASSIFIERS = [ setuptools.setup( name='django-ddp', - version='0.18.1', + version='0.19.0', description=__doc__, long_description=open('README.rst').read(), author='Tyson Clugg', diff --git a/tox.ini b/tox.ini index 6de5cd3..ae3a0ab 100644 --- a/tox.ini +++ b/tox.ini @@ -118,16 +118,19 @@ deps = [testenv:dist] +install_command=sh -c 'pip install -U "setuptools>=18.5" "wheel>=0.25.0" "pip>=7.1.2" && pip install "$@" && sync' sh {opts} {packages} + +whitelist_externals=sh + commands = check-manifest --ignore "dddp/test/build*,dddp/test/meteor_todos/.meteor/local*" - {envpython} setup.py --quiet --no-user-cfg sdist --dist-dir={toxinidir}/dist/ - {envpython} setup.py --quiet --no-user-cfg bdist_wheel --dist-dir={toxinidir}/dist/ - cd docs && make html - -# the `dist` environment doesn't need our package installed -skip_install=True + {envpython} setup.py --no-user-cfg sdist --dist-dir={toxinidir}/dist/ + {envpython} setup.py --no-user-cfg bdist_wheel --dist-dir={toxinidir}/dist/ + sh -c "cd docs && sphinx-build -b html -d _build/doctrees -D latex_paper_size=a4 . _build/html" +usedevelop=True deps = + -rrequirements.txt -rrequirements-dev.txt check-manifest wheel