Update XStatic-bootswatch to 3.3.7.0

Also used xstatic-release script and fixed LICENSE reference

Change-Id: I9427ac7f124b47d4f2d9c3deb8e2806a189f2922

.gitignore

@@ -6,4 +6,4 @@
 .venv
 .tox
 build
-dist
+dist

MANIFEST.in

@@ -1,6 +1,5 @@
 include README.txt
-recursive-include xstatic/pkg/bootswatch *
-
+recursive-include xstatic *
 global-exclude *.pyc
 global-exclude *.pyo
 global-exclude *.orig

setup.cfg

@@ -0,0 +1,20 @@
+[metadata]
+name = XStatic-bootswatch
+description = bootswatch 3.3.7 (XStatic packaging standard)
+description-file = README.rst
+maintainer = Rob Cresswell
+maintainer-email = robert.cresswell@outlook.com
+home-page = http://bootswatch.com
+keywords = bootswatch xstatic
+license = MIT
+zip_safe = False
+namespace_packages =
+    xstatic
+    xstatic.pkg
+
+[files]
+packages =
+    xstatic
+
+[bdist_wheel]
+universal = True

setup.py

@@ -1,12 +1,10 @@
-
+from setuptools import setup, find_packages
 from xstatic.pkg import bootswatch as xs
 
 # The README.txt file should be written in reST so that PyPI can use
 # it to generate your project's PyPI page.
 long_description = open('README.txt').read()
 
-from setuptools import setup, find_packages
-
 setup(
     name=xs.PACKAGE_NAME,
     version=xs.PACKAGE_VERSION,
@@ -20,7 +18,7 @@
     url=xs.HOMEPAGE,
     platforms=xs.PLATFORMS,
     packages=find_packages(),
-    namespace_packages=['xstatic', 'xstatic.pkg', ],
+    namespace_packages=['xstatic', 'xstatic.pkg'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[],

xstatic/pkg/bootswatch/__init__.py

@@ -15,7 +15,7 @@
                                # please use a all-lowercase valid python
                                # package name
 
-VERSION = '3.3.6' # version of the packaged files, please use the upstream
+VERSION = '3.3.7' # version of the packaged files, please use the upstream
                   # version number
 BUILD = '0' # our package build number, so we can release new builds
              # with fixes for xstatic stuff.
@@ -28,14 +28,14 @@
 KEYWORDS = 'bootswatch xstatic'
 
 # XStatic-* package maintainer:
-MAINTAINER = 'Diana Whitten'
-MAINTAINER_EMAIL = 'hurgleburgler@gmail.com'
+MAINTAINER = 'Rob Cresswell'
+MAINTAINER_EMAIL = 'robert.cresswell@outlook.com'
 
 # this refers to the project homepage of the stuff we packaged:
 HOMEPAGE = 'http://bootswatch.com'
 
 # this refers to all files:
-LICENSE = '(same as %s)' % DISPLAY_NAME
+LICENSE = 'MIT'
 
 from os.path import join, dirname
 BASE_DIR = join(dirname(__file__), 'data')

xstatic/pkg/bootswatch/data/README.md

@@ -1,18 +1,35 @@
 Bootswatch
 ==========
 
-Bootswatch is a collection of free themes for [Bootstrap](http://getbootstrap.com/). Check it out at [bootswatch.com](http://bootswatch.com).
+[![Bootswatch Logo](./assets/img/logo-dark.png)](http://bootswatch.com)
+
+Bootswatch is a collection of open source themes for [Bootstrap](http://getbootstrap.com/). Check it out at [bootswatch.com](http://bootswatch.com).
 
 Usage
 -----
-Download the `bootstrap.min.css` file associated with a theme and replace Bootstrap's default stylesheet.
+Download the `bootstrap.min.css` file associated with a theme and replace Bootstrap's default stylesheet. You must still include Bootstrap's JavaScript file to have functional dropdowns, modals, etc.
+
+The themes are also hosted on [BootstrapCDN](http://www.bootstrapcdn.com/bootswatch/). 
+
+You can import a theme into your styles using either LESS or SASS.
+
+LESS:
+
+```
+@import "bootstrap/less/bootstrap.less";
+@import "bootswatch/theme/variables.less";
+@import "bootswatch/theme/bootswatch.less";
 
-The themes are also hosted on [BootstrapCDN](http://www.bootstrapcdn.com/bootswatch/).
+```
 
- Rails users should check out:
+SASS:
 
-* [twitter-bootswatch-rails](https://github.com/scottvrosenthal/twitter-bootswatch-rails) if using _LESS_.
-* [bootswatch-rails](https://github.com/maxim/bootswatch-rails) if using _SASS_.
+```
+@import "bootswatch/theme/variables";
+@import "bootstrap-sass-official/assets/stylesheets/bootstrap";
+@import "bootswatch/theme/bootswatch";
+
+```
 
 
 Customization
@@ -28,21 +45,19 @@ Check out the [Help page](http://bootswatch.com/help/) for more details on build
 API
 -----
 
-A simple API is available for integrating your platform with Bootswatch. Send your request to `http://api.bootswatch.com/3/`.
-
-The swatch objects are returned in an array called `themes`, each one with the following properties:  `name`, `description`, `preview`, `thumbnail`, `css`, `cssMin`, `less`, and `lessVariables`.
-
-More info at http://bootswatch.com/help/#api
+A simple API is available for integrating your platform with Bootswatch. More info at http://bootswatch.com/help/#api
 
 Contributing
 -----
 It's through your contributions that Bootswatch will continue to improve. You can contribute in several ways.
 
-Bug Reports: Provide a detailed report of any bugs you encounter and open an issue on [GitHub](https://github.com/thomaspark/bootswatch/issues).
+**Issues:** Provide a detailed report of any bugs you encounter and open an issue on [GitHub](https://github.com/thomaspark/bootswatch/issues).
+
+**Documentation:** If you'd like to fix a typo or beef up the docs, you can fork the project, make your changes, and submit a pull request.
 
-Documentation: If you'd like to fix a typo or beef up the docs, you can fork the project, make your changes, and submit a pull request.
+**Code:** Make a fix and submit it as a pull request. When making changes, it's important to keep the CSS, LESS and SASS versions in sync. To do this, be sure to edit the LESS source files for the particular theme, then run the  tasks `grunt swatch` and `grunt:convert_less` to build the CSS and LESS.
 
-Fixes: You're more than welcome to make a fix and submit it as a pull request. When making changes, it's important to keep the CSS, LESS and SASS versions in sync. To do this, be sure to edit the LESS source files for the particular theme, then run the  tasks `grunt swatch` and `grunt:convert_less` to build the CSS and LESS.
+**Donation:** Donations are gratefully accepted via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=F22JEM3Q78JC2) and [Gratipay](https://gratipay.com/bootswatch/).
 
 Author
 ------
@@ -64,6 +79,6 @@ Thanks
 
 Copyright and License
 ----
-Copyright 2014 Thomas Park
+Copyright 2014-2016 Thomas Park
 
 Code released under the MIT License.

xstatic/pkg/bootswatch/data/cerulean/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Cerulean 3.3.5
+// Cerulean 3.3.7
 // Bootswatch
 // -----------------------------------------------------
 

xstatic/pkg/bootswatch/data/cerulean/_variables.scss

@@ -1,5 +1,5 @@
 $bootstrap-sass-asset-helper: false !default;
-// Cerulean 3.3.6
+// Cerulean 3.3.7
 // Variables
 // --------------------------------------------------
 
@@ -68,7 +68,7 @@ $line-height-computed:    floor(($font-size-base * $line-height-base)) !default;
 //** By default, this inherits from the `<body>`.
 $headings-font-family:    $font-family-base !default;
 $headings-font-weight:    500 !default;
-$headings-line-height:    1.1 !default;
+$headings-line-height:    1.2 !default;
 $headings-color:          #317EAC !default;
 
 
@@ -112,7 +112,7 @@ $component-active-color:    #fff !default;
 //** Global background color for active items (e.g., navs or dropdowns).
 $component-active-bg:       $brand-primary !default;
 
-//** Width of the `border` for generating carets that indicator dropdowns.
+//** Width of the `border` for generating carets that indicate dropdowns.
 $caret-width-base:          4px !default;
 //** Carets increase slightly in size for larger components.
 $caret-width-large:         5px !default;

xstatic/pkg/bootswatch/data/cerulean/bootstrap.css

@@ -1,13 +1,13 @@
 /*!
- * bootswatch v3.3.6
+ * bootswatch v3.3.7
  * Homepage: http://bootswatch.com
- * Copyright 2012-2015 Thomas Park
+ * Copyright 2012-2016 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
 /*!
- * Bootstrap v3.3.6 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
@@ -1109,7 +1109,6 @@ a:focus {
   text-decoration: underline;
 }
 a:focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1189,7 +1188,7 @@ h6,
 .h6 {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: 500;
-  line-height: 1.1;
+  line-height: 1.2;
   color: #317eac;
 }
 h1 small,
@@ -2540,7 +2539,6 @@ select[size] {
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -3032,7 +3030,6 @@ select[multiple].input-lg {
 .btn.focus,
 .btn:active.focus,
 .btn.active.focus {
-  outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }

xstatic/pkg/bootswatch/data/cerulean/bootswatch.less

@@ -1,4 +1,4 @@
-// Cerulean 3.3.5
+// Cerulean 3.3.7
 // Bootswatch
 // -----------------------------------------------------