Merge cefef74 into e731bc1

HISTORY.rst

@@ -39,31 +39,6 @@ History
 * Fixed issue with thumbnails not being preserved in admin form
 * Pinned django-taggit version
 
-******************
-1.0.0 (unreleased)
-******************
-
-* Added Djando 2.0, 2.1
-* Added django CMS 3.6
-* Dropped Django <1.11
-* Dropped django CMS <3.5
-* Dropped Python 3.4
-
-*******************
-0.9.10 (2019-07-02)
-*******************
-
-* Fixed allow_unicode kwarg for AutoSlugField
-* Fixed sphinx conf isort
-* Set category as requested or not depending on the permalink setting
-
-******************
-0.9.9 (2019-04-05)
-******************
-
-* Fixed issue with thumbnails not being preserved in admin form
-* Pinned django-taggit version
-
 ******************
 0.9.8 (2019-01-13)
 ******************

Makefile

@@ -1,11 +1,12 @@
-.PHONY: clean-pyc clean-build docs
+.PHONY: clean-pyc clean-build docs livehtml
+PYTHON = python
 
 help:
 	@echo "clean-build - remove build artifacts"
 	@echo "clean-pyc - remove Python file artifacts"
 	@echo "lint - check style with flake8"
 	@echo "test - run tests quickly with the default Python"
-	@echo "test-all - run tests on every Python version with tox"
+	@echo "testall - run tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
 	@echo "release - package and upload a release"
 	@echo "sdist - package"
@@ -27,20 +28,24 @@ lint:
 	tox -epep8,isort
 
 test:
-	python setup.py test
+	python cms_helper.py djangocms_blog test
 
 test-all:
 	tox
 
 coverage:
 	coverage erase
-	coverage run setup.py test
+	coverage run cms_helper.py djangocms_blog
 	coverage report -m
 
-release: clean
-	python setup.py clean --all sdist bdist_wheel
-	twine upload dist/*
 
 sdist: clean
 	python setup.py sdist
 	ls -l dist
+
+release: clean
+	python setup.py clean --all sdist bdist_wheel
+	python -mtwine upload dist/*
+
+livehtml:
+	sphinx-autobuild -b html -p5000 -H0.0.0.0 -E -j auto  -d docs/_build/doctrees --poll docs docs/_build/html

README.rst

@@ -29,6 +29,7 @@ See `installation documentation`_
 Features
 ********
 
+See `features documentation`_  for all the features details
 
 * Placeholder content editing
 * Frontend editing using django CMS 3.x frontend editor
@@ -53,6 +54,7 @@ Known djangocms-blog websites
 
 See DjangoPackages for an updated list https://www.djangopackages.com/packages/p/djangocms-blog/
 
+.. _features documentation: http://djangocms-blog.readthedocs.io/en/latest/features/
 .. _installation documentation: http://djangocms-blog.readthedocs.io/en/latest/installation.html
 .. _cmsplugin-filer migration documentation: http://djangocms-blog.readthedocs.io/en/latest/cmsplugin_filer.html