merged master

getnikola · May 14, 2016 · ef10f2d · ef10f2d
2 parents 715b45b + f09b1cd
commit ef10f2d
Show file tree

Hide file tree

Showing 64 changed files with 2,902 additions and 443 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ install:
 # WARNING: if you edit this, make sure to replicate your changes in dodo.py and appveyor.yml.
 script:
   - "if [[ $NMODE == 'nikola' ]]; then py.test --doctest-modules nikola/; fi"
-  - "if [[ $NMODE == 'nikola' ]]; then py.test --cov nikola --cov-report term-missing tests/; fi"
+  - "if [[ $NMODE == 'nikola' ]]; then py.test tests/; fi"
   - "if [[ $NMODE == 'nikola' ]]; then nikola; fi"
   - "if [[ $NMODE == 'nikola' ]]; then nikola help; fi"
   - "if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi"

diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -15,6 +15,7 @@
 * `Casey M. Bessette <https://github.com/caseybessette>`_
 * `Chris Lee <https://github.com/clee>`_
 * `Chris Warrick <https://github.com/Kwpolska>`_
+* `Christopher Arndt <https:/github.com/SpotlightKid>`_
 * `Claudio Canepa <https://github.com/ccanepa>`_
 * `Damien Tournoud <https://github.com/damz>`_
 * `Damián Avila <https://github.com/damianavila>`_

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,11 +4,36 @@ New in master
 Features
 --------
 
+* Added ``enclosure_length`` meta field for better interop (Issue #2338)
+* New Lithuanian translation by Antanas Lasys
+
 Bugfixes
 --------
 
 * Don't call sys.exit() from plugins if possible (Issue #1839)
+* Create Persistor directories only if site is configured (Issue #2334)
+* Remove newlines in imported WordPress titles (Issue #2330)
+
+New in v7.7.8
+=============
+
+Features
+--------
+
+* Template-based shortcodes now receive positional arguments too (Issue #2319)
+
+Bugfixes
+--------
+
 * Warn if a tag appears multiple times in a post (Issue #2315)
+* Fix folder handling and redirects in ``nikola auto`` (Issue #2331)
+* Use state files in ``nikola github_deploy`` and ``nikola status``
+  (Issue #2317)
+* Add ``align`` options for ``youtube``, ``vimeo``, ``soundcloud``
+  reST directives (Issue #2304)
+* Update ``FILE_METADATA_REGEXP`` example in docs (Issue #2296)
+* Show “tags too similar” error instead of cryptic doit crash (Issue #2325)
+* Fix crashes when tag appears multiple times in a post (Issue #2315)
 * Use binary I/O for ``.svg`` files in galleries
 * Accept ``.svgz`` extension by default
 * Don't randomly load plugins when Nikola is called with no arguments (Issue #2297)

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ init:
   - ps: "ls C:/Python*"
 install:
   - "%PYTHON%/Scripts/pip.exe install --no-index -f https://users.getnikola.com/static/nikola-windows-wheels lxml"
-  - "%PYTHON%/Scripts/pip.exe install -r requirements-extras.txt pytest mock freezegun"
+  - "%PYTHON%/Scripts/pip.exe install -r requirements-extras.txt pytest coverage pytest-cov mock freezegun"
   - "%PYTHON%/Scripts/pip.exe install ."
 
 test_script:

diff --git a/bower_components/jquery/.bower.json b/bower_components/jquery/.bower.json
@@ -12,14 +12,14 @@
     "library"
   ],
   "homepage": "https://github.com/jquery/jquery-dist",
-  "version": "1.12.1",
-  "_release": "1.12.1",
+  "version": "1.12.3",
+  "_release": "1.12.3",
   "_resolution": {
     "type": "version",
-    "tag": "1.12.1",
-    "commit": "56ead6ffbf8560c521e7e94518d35db42b19f5f3"
+    "tag": "1.12.3",
+    "commit": "3a43d7e563314bf32970b773dd31ecf2b90813dd"
   },
-  "_source": "git://github.com/jquery/jquery-dist.git",
+  "_source": "https://github.com/jquery/jquery-dist.git",
   "_target": "<2.0.0",
   "_originalSource": "jquery"
 }
diff --git a/bower_components/jquery/dist/jquery.js b/bower_components/jquery/dist/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.12.1
+ * jQuery JavaScript Library v1.12.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2016-02-22T19:07Z
+ * Date: 2016-04-05T19:16Z
  */
 
 (function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
 
 
 var
-	version = "1.12.1",
+	version = "1.12.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -8198,7 +8198,8 @@ jQuery.fn.delay = function( time, type ) {
 } )();
 
 
-var rreturn = /\r/g;
+var rreturn = /\r/g,
+	rspaces = /[\x20\t\r\n\f]+/g;
 
 jQuery.fn.extend( {
 	val: function( value ) {
@@ -8278,7 +8279,9 @@ jQuery.extend( {
 
 					// Support: IE10-11+
 					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
 			}
 		},
 		select: {
@@ -8332,7 +8335,7 @@ jQuery.extend( {
 				while ( i-- ) {
 					option = options[ i ];
 
-					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
 
 						// Support: IE6
 						// When new option element is added to select box we need to
@@ -8751,8 +8754,11 @@ if ( !support.hrefNormalized ) {
 }
 
 // Support: Safari, IE9+
-// mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
 if ( !support.optSelected ) {
 	jQuery.propHooks.selected = {
 		get: function( elem ) {
@@ -8767,6 +8773,16 @@ if ( !support.optSelected ) {
 				}
 			}
 			return null;
+		},
+		set: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
 		}
 	};
 }
@@ -10349,13 +10365,6 @@ function createActiveXHR() {
 
 
 
-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
-jQuery.ajaxPrefilter( function( s ) {
-	if ( s.crossDomain ) {
-		s.contents.script = false;
-	}
-} );
-
 // Install script dataType
 jQuery.ajaxSetup( {
 	accepts: {
@@ -10542,21 +10551,6 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 
 
 
-// Support: Safari 8+
-// In Safari 8 documents created via document.implementation.createHTMLDocument
-// collapse sibling forms: the second one becomes a child of the first one.
-// Because of that, this security measure has to be disabled in Safari 8.
-// https://bugs.webkit.org/show_bug.cgi?id=137337
-support.createHTMLDocument = ( function() {
-	if ( !document.implementation.createHTMLDocument ) {
-		return false;
-	}
-	var doc = document.implementation.createHTMLDocument( "" );
-	doc.body.innerHTML = "<form></form><form></form>";
-	return doc.body.childNodes.length === 2;
-} )();
-
-
 // data: string of html
 // context (optional): If specified, the fragment will be created in this context,
 // defaults to document
@@ -10569,12 +10563,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
 		keepScripts = context;
 		context = false;
 	}
-
-	// document.implementation stops scripts or inline event handlers from
-	// being executed immediately
-	context = context || ( support.createHTMLDocument ?
-		document.implementation.createHTMLDocument( "" ) :
-		document );
+	context = context || document;
 
 	var parsed = rsingleTag.exec( data ),
 		scripts = !keepScripts && [];
@@ -10656,7 +10645,7 @@ jQuery.fn.load = function( url, params, callback ) {
 		// If it fails, this function gets "jqXHR", "status", "error"
 		} ).always( callback && function( jqXHR, status ) {
 			self.each( function() {
-				callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
 			} );
 		} );
 	}

diff --git a/bower_components/jquery/dist/jquery.min.js b/bower_components/jquery/dist/jquery.min.js
diff --git a/bower_components/jquery/dist/jquery.min.map b/bower_components/jquery/dist/jquery.min.map
diff --git a/bower_components/jquery/sizzle/LICENSE.txt b/bower_components/jquery/sizzle/LICENSE.txt
@@ -0,0 +1,36 @@
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/sizzle
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.