Fix setuptools issues with README/changelog

Rectify incorrectly documented dependencies (requirements.txt) Refactor build server configuration
Organice · Sep 6, 2016 · fa25976 · fa25976
1 parent c75f4da
commit fa25976
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,25 @@
 language: python
-python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
+python: "3.5"
+
+env:
+  matrix:
+    - TOXENV=flake8
+    - TOXENV=checkdocs
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=behave
+
 install:
-  - pip install flake8 tox coverage==3.7.1 coveralls
+  - pip install tox coveralls
 before_script:
-  - flake8
   - mkdir -p shippable/{codecoverage,testresults}
 script:
-  - tox -e py${TRAVIS_PYTHON_VERSION/\./}
+  - tox -e $TOXENV
 after_success:
-  - coverage report
-  - coverage xml
+  - coveralls || true
   - mv -v coverage.xml shippable/codecoverage/
   - mv -v tests/reports/* shippable/testresults/
-  - coveralls || true
 notifications:
   slack: organice:2v4ZfYaW6KonOr5RyJqjyU92
   webhooks:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,7 @@
+=======
+History
+=======
+
 0.4
 ===
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
+include CHANGELOG.rst
 include LICENSE
 include README.rst
 include requirements.txt

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,5 +1 @@
-=======
-History
-=======
-
 .. include:: ../CHANGELOG.rst
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,5 @@
 beautifulsoup4==4.5.1
-cmsplugin-zinnia==0.8.1
+git+https://github.com/django-blog-zinnia/cmsplugin-zinnia@7613c0d#egg=cmsplugin-zinnia-0.8.1
 cssselect==0.9.2
 defusedxml==0.4.1
 Django==1.8.14
@@ -12,7 +12,7 @@ django-cms==3.3.2
 django-contrib-comments==1.7.2
 django-formtools==1.0
 django-mptt==0.8.6
-django_organice_theme==0.4.1
+django-organice-theme==0.4.1
 django-sekizai==0.10.0
 Django-Select2==4.3.2
 django-simple-links==0.1.4
@@ -25,9 +25,9 @@ djangocms-admin-style==1.2.3
 djangocms-attributes-field==0.1.1
 djangocms-file==1.0
 djangocms-grid==1.3.0
-djangocms-inherit==0.2.1
+git+https://github.com/divio/djangocms-inherit@8af4e99#egg=djangocms-inherit-0.2.1
 djangocms-link==1.8.2
-djangocms_maps==0.6.0
+djangocms-maps==0.6.0
 djangocms-oembed==0.5
 djangocms-picture==1.0.0
 djangocms-table==1.2

diff --git a/setup.cfg b/setup.cfg
@@ -24,18 +24,27 @@ reports = no
 addopts = --basetemp=build --junitxml=tests/reports/unittests.xml --strict --verbose
 
 [tox]
-envlist = flake8,py27,py33,py34,behave
+envlist = flake8,py27,py33,py34,behave,checkdocs
 [testenv]
-commands = coverage run setup.py -q test -a tests/units
-deps = coverage==3.7.1
+commands =
+    coverage run setup.py -q test -a tests/units
+    coverage report
+    coverage xml
+deps =
+    coverage==3.7.1
 [testenv:behave]
-basepython = python
 deps = behave-django
 commands = python manage.py behave
 [testenv:flake8]
-basepython = python
 deps = flake8
 commands = flake8
+[testenv:checkdocs]
+deps =
+    collective.checkdocs
+    pygments
+commands =
+    python setup.py -q sdist
+    python setup.py checkdocs
 
 [run]  # Test coverage
 source = organice

diff --git a/setup.py b/setup.py
@@ -92,7 +92,7 @@ def replace_last(s, old, new, maxtimes=1):
     description=package.__doc__.strip(),
     long_description='\n'.join([
         read_file('README.rst'),
-        read_file('docs', 'changelog.rst')
+        read_file('CHANGELOG.rst')
     ]),
     keywords='cms, collaboration, blog, newsletter, django, python',