v1.3.11: Fix bootstrap3 theme detection (#49)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Oct 3, 2017 · d34c720 · d34c720
1 parent 6fb53fd
commit d34c720
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.10
+:Version: 1.3.11
+
+1.3.11
+    * Fix bootstrap3 theme detection (Issue #49)
 
 1.3.10
     * Add `coil unlock` command

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.10'
+__version__ = '1.3.11'
diff --git a/docs/._COIL_NO_CONFIG b/docs/._COIL_NO_CONFIG
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,7 +2,10 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.10
+:Version: 1.3.11
+
+1.3.11
+    * Fix bootstrap3 theme detection (Issue #49)
 
 1.3.10
     * Add `coil unlock` command

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.10'
+version = '1.3.11'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.10'
+release = '1.3.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/release b/release
@@ -149,15 +149,15 @@ status 'Generating locales...'
 
 status 'Importing...'
 python -c "import $PROJECTLC"
-if [[ $? == 1 ]]; then
+if [[ $? != 0 ]]; then
     error "Import failed.  Fix your code or don't come back."
     exit 1
 fi
 
 if [[ -e tests ]]; then
     status 'Running tests...'
-    py.test tests/
-    if [[ $? == 1 ]]; then
+    pytest tests/
+    if [[ $? != 0 ]]; then
         error "Tests failed.  Fix your code or don't come back."
         exit 1
     fi

diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,2 @@
 [wheel]
-universal = 1
+universal = 0
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='coil',
-      version='1.3.10',
+      version='1.3.11',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',