Merge 21a0a31 into 1603a77

inveniosoftware · May 5, 2020 · 8edf6e8 · 8edf6e8
2 parents 1603a77 + 21a0a31
commit 8edf6e8
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 232 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,10 +26,6 @@ var/
 .installed.cfg
 *.egg
 
-# Example application
-examples/instance/
-examples/static/
-
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -61,5 +57,3 @@ docs/_build/
 
 # PyBuilder
 target/
-examples/instance/
-examples/static/
diff --git a/.travis.yml b/.travis.yml
@@ -27,11 +27,13 @@ env:
 python:
   - "3.6"
   - "3.7"
+  - "3.8"
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: REQUIREMENTS=devel
+    - python: 3.8
 
 before_install:
   - "pip uninstall -y six"

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,12 @@
 Changes
 =======
 
+Version 1.2.1 (Release TBD)
+----------------------------------
+
+- set Sphinx ``<3`` because of errors related to application context
+- stop using example app
+
 Version 1.2.0 (Release 2020-03-13)
 ----------------------------------
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -15,28 +15,18 @@ include .tx/config
 include LICENSE
 include babel.ini
 include docs/requirements.txt
-include examples/requirements.txt
 include pytest.ini
 recursive-include docs *.bat
 recursive-include docs *.py
 recursive-include docs *.rst
 recursive-include docs Makefile
 recursive-include examples *.csv
-recursive-include examples *.html
 recursive-include examples *.ipynb
-recursive-include examples *.ipynb
-recursive-include examples *.jpg
 recursive-include examples *.jpg
 recursive-include examples *.json
-recursive-include examples *.json
 recursive-include examples *.md
 recursive-include examples *.pdf
 recursive-include examples *.png
-recursive-include examples *.png
-recursive-include examples *.py
-recursive-include examples *.sh
-recursive-include examples *.sh
-recursive-include examples *.xml
 recursive-include examples *.xml
 recursive-include examples *.zip
 recursive-include invenio_previewer *.bcmap

diff --git a/examples/app-setup.sh b/examples/app-setup.sh
diff --git a/examples/app-teardown.sh b/examples/app-teardown.sh
diff --git a/examples/app.py b/examples/app.py
diff --git a/examples/requirements.txt b/examples/requirements.txt
diff --git a/examples/templates/index.html b/examples/templates/index.html
diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
 
 extras_require = {
     'docs': [
-        'Sphinx>=1.5.1',
+        'Sphinx>=1.5.1,<3',
     ],
     'files': [
         'invenio-files-rest>=1.0.0',
@@ -133,10 +133,9 @@
         'Programming Language :: Python',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Development Status :: 5 - Production/Stable',
     ],