Merge branch 'master' into fix-2169

getnikola · Aug 8, 2016 · a93de01 · a93de01
2 parents 7a8e260 + 33eedce
commit a93de01
Show file tree

Hide file tree

Showing 243 changed files with 9,280 additions and 1,917 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,19 +23,19 @@ install:
   - "if [[ $NMODE == 'nikola' ]]; then scripts/getwheelhouse.sh $(scripts/getpyver.py short); fi"
   - "if [[ $NMODE == 'nikola' ]]; then pip install -r requirements-tests.txt; if [[ \"$?\" == '1' ]]; then cat /home/travis/.pip/pip.log; false; fi; fi"
   - "if [[ $NMODE == 'nikola' ]]; then pip install .; fi"
-  - "if [[ $NMODE == 'nikola' ]]; then scripts/getbaseline.sh $(scripts/getpyver.py short); fi"
-  - "if [[ $NMODE == 'flake8' ]]; then pip install flake8 pep257; fi"
+  - "if [[ $NMODE == 'flake8' ]]; then pip install flake8 pydocstyle; fi"
 # We run tests and nikola (to see if the command is executable) OR flake8.
 # We run `nikola` and `nikola help` because things may break due to human
 # errors in argument parsing (cf. 96e78dd)
 # 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 == 'nikola' ]]; then scripts/baseline.sh check; fi"
   - "if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi"
-  - "if [[ $NMODE == 'flake8' ]]; then pep257 --count --match-dir='(?!^\\\\.)(?!data).*' nikola/; fi"
+  - "if [[ $NMODE == 'flake8' ]]; then pydocstyle --count --match-dir='(?!^\\\\.)(?!data).*' nikola/; fi"
 after_success:
   - "if [[ $NMODE == 'nikola' ]]; then coveralls; fi"
 notifications:

diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -3,26 +3,31 @@
 * `Alex Popescu <https://github.com/al3xandru>`_
 * `Alex Walters <https://github.com/tritium21>`_
 * `Andreas Linz <https://github.com/KLINGTdotNET>`_
+* `André Felipe Dias <https://github.com/andredias>`_
 * `Areski Belaid <https://github.com/areski>`_
 * `Aru Sahni <https://github.com/arusahni>`_
 * `Aurelien Naldi <https://github.com/aurelien-naldi>`_
 * `Ben Mather <https://github.com/bwhmather>`_
 * `Boris Kaul <https://github.com/localvoid>`_
+* `Brad Miller <https://github.com/bnmnetp>`_
 * `Brandon W. Maister <https://github.com/quodlibetor>`_
 * `Bussonnier Matthias <https://gtihub.com/carreau>`_
 * `Carlos Martín Sánchez <https://github.com/carlosvin>`_
 * `Carsten Grohmann <https://github.com/CarstenGrohmann>`_
 * `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>`_
 * `Daniel Aleksandersen <https://github.com/Aeyoun>`_
 * `Daniel Devine <https://github.com/DDevine>`_
 * `Daniel F. Moisset <https://github.com/dmoisset>`_
-* `David Beath <https://github.com/DBeath>`_
+* `dastagg <https://github.com/dastagg>`_
+* `dastagg <https://github.com/dastagg>`_
 * `David Barragán Merino <https://github.com/bameda>`_
+* `David Beath <https://github.com/DBeath>`_
 * `Dhruv Baldawa <https://github.com/dhruvbaldawa>`_
 * `Dirk Engling <https://github.com/erdgeist>`_
 * `Dmitry Verkhoturov <https://github.com/paskal>`_
@@ -31,9 +36,12 @@
 * `Eduardo Schettino <https://github.com/schettino72>`_
 * `Edwin Steele <https://github.com/edwinsteele>`_
 * `Emilien Klein <https://github.com/e2jk>`_
+* `ermeaney <https://github.com/ermeaney>`_
 * `Evgeni Golov <https://github.com/evgeni>`_
 * `Felix Fontein <https://github.com/felixfontein>`_
 * `Felix Schwarz <https://github.com/FelixSchwarz>`_
+* `Florian Finkernagel <https://github.com/TyberiusPrime>`_
+* `follower <https://github.com/follower>`_
 * `Grzegorz Śliwiński <https://github.com/fizyk>`_
 * `Guillermo O. Freschi <https://github.com/Tordek>`_
 * `Hardening <https://github.com/hardening>`_
@@ -44,6 +52,7 @@
 * `Juanjo Conti <https://github.com/jjconti>`_
 * `Kade For <https://github.com/kadefor>`_
 * `Kay Hayen <https://github.com/kayhayen>`_
+* `lbiaggi <https://github.com/lbiaggi>`_
 * `Leandro Poblet <https://github.com/DoctorMalboro>`_
 * `Luis Miguel Morillas <https://github.com/lmorillas>`_
 * `Manuel Kaufmann <https://github.com/humitos>`_
@@ -60,17 +69,24 @@
 * `Michael McNeil Forbes <https://github.com/mforbes>`_
 * `Michal Petrucha <https://github.com/koniiiik>`_
 * `Miguel Ángel García <https://github.com/magmax>`_
+* `mrabbitt <https://github.com/mrabbitt>`_
 * `Neil MartinsenBurrell <https://github.com/neilmb>`_
 * `Niko Wenselowski <https://github.com/okin>`_
 * `Nikola Kotur <https://github.com/kotnik>`_
+* `nlaurens <https://github.com/nlaurens>`_
+* `notfoss <https://github.com/notfoss>`_
 * `Ondřej Grover <https://github.com/smartass101>`_
 * `Onno Broekmans <https://github.com/onnodb>`_
 * `Pablo Seminario <https://github.com/pabluk>`_
 * `Patrick Wildt <https://github.com/Bluerise>`_
 * `Paul Ivanov <https://github.com/ivanov>`_
 * `Pelle Nilsson <https://github.com/pellenilsson>`_
+* `phora <https://github.com/phora>`_
 * `Pierpaolo Da Fieno <https://github.com/numshub>`_
+* `pmav99 <https://github.com/pmav99>`_
 * `Puneeth Chaganti <https://github.com/punchagan>`_
+* `pwm1234 <https://github.com/pwm1234>`_
+* `rafacarrascosa <https://github.com/rafacarrascosa>`_
 * `Raimon Esteve <https://github.com/raimonesteve>`_
 * `Ramiro Morales <https://github.com/ramiro>`_
 * `Roberto Alsina <https://github.com/ralsina>`_
@@ -82,29 +98,17 @@
 * `Sean Pue <https://github.com/seanpue>`_
 * `Simon van der Veldt <https://github.com/simonvanderveldt>`_
 * `Stefan Näwe <https://github.com/snaewe>`_
+* `Sukil Etxenike <https://github.com/sukiletxe>`_
 * `Thibauld Nion <https://github.com/tibonihoo>`_
 * `Thomas Burette <https://github.com/tburette>`_
 * `Tim Chase <https://github.com/Gumnos>`_
+* `Timo Kankare <https://github.com/tikank>`_
 * `Tolu Sonaike <https://github.com/tolusonaike>`_
 * `Troy Toman <https://github.com/troytoman>`_
 * `Udo Spallek <https://github.com/udono>`_
 * `Yamila Moreno <https://github.com/yamila-moreno>`_
-* `Yaşar Arabacı <https://github.com/yasar11732>`_
+* `yarko <https://github.com/yarko>`_
 * `Yasuhiko Shiga <https://github.com/quoth>`_
+* `Yaşar Arabacı <https://github.com/yasar11732>`_
 * `Zhaojun Meng <https://github.com/zhaojunmeng>`_
-* `dastagg <https://github.com/dastagg>`_
-* `dastagg <https://github.com/dastagg>`_
-* `ermeaney <https://github.com/ermeaney>`_
-* `follower <https://github.com/follower>`_
-* `lbiaggi <https://github.com/lbiaggi>`_
-* `mrabbitt <https://github.com/mrabbitt>`_
-* `nlaurens <https://github.com/nlaurens>`_
-* `notfoss <https://github.com/notfoss>`_
-* `phora <https://github.com/phora>`_
-* `pmav99 <https://github.com/pmav99>`_
-* `pwm1234 <https://github.com/pwm1234>`_
-* `rafacarrascosa <https://github.com/rafacarrascosa>`_
-* `yarko <https://github.com/yarko>`_
 * `小明 <https://github.com/dongweiming>`_
-* `Brad Miller <https://github.com/bnmnetp>`_
-* `Florian Finkernagel <https://github.com/TyberiusPrime>`_
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,136 @@
 New in master
 =============
 
+Features
+--------
+* Update options of chart directive to Pygal 2.2.3
+
+
+New in v7.7.12
+==============
+
+Features
+--------
+
+* New Telugu translation by Chillar Anand
+* Add ``sections`` filtering in the post list directive
+  (Issue #2409)
+* Update Bootstrap to v3.3.7
+
+Bugfixes
+--------
+
+* Added code documentation to ReadTheDocs (Issue #2124)
+  (https://nikola.readthedocs.io/en/latest/)
+* Pass language to docutils so admonitions are translated (Issue #2422)
+* Put 2-file post metadata in the same place as the text file when
+  specifying a path in ``new_post``, ``new_page`` (Issue #2420)
+* Register dependencies in post-list shortcode (Issue #2412)
+* Support post-list shortcode better (Issue #2408)
+* Fix gallery links in base theme (Issue #2416)
+* Respect ``DEPLOY_DRAFTS`` and ``DEPLOY_FUTURE`` in ``github_deploy``
+  (Issue #2406)
+* Don’t remove ``<!DOCTYPE html>`` if typogrify filters are in use
+* Avoid infinite loop if bootstrap3 can't be loaded (Issue #2402)
+* Fixed image rotation to update image size correctly (Issue #2418)
+
+New in v7.7.11
+==============
+
+Bugfixes
+--------
+
+* Brown bag bug in image resizing (ralsina says my fault!)
+
+New in v7.7.10
+==============
+
+Features
+--------
+
+* New EXIF_WHITELIST option to filter EXIF data (Issue #2323)
+* Support ``date`` filtering in the post list directive
+  (Issue #1889)
+* Support ``doc`` shortcode (equivalent to reST ``doc`` role — part of
+  Issue #2170)
+* Added Albanian translation by Vango Stavro
+* Added ``post-(type)`` class to ``story.tmpl`` (uses the ``type``
+  meta field, defaults to ``post-text`` — same behavior as posts)
+* New ``compiled`` signal after post is compiled (Issue #2369)
+
+Bugfixes
+--------
+
+* Some images were copied ignoring the PRESERVE_EXIF_DATA option
+* Warn about possible outdated files after --clean-files (Issue #2017)
+* Improved EXIF orientation handling
+* Register post list template as a dependency (Issue #2391)
+* Fix section color hashing when using Python 2
+* Use ``en_US`` dictionary name with pyphen for better compatibility
+* Fix graceful degradation if ``pyphen`` lacks dictionaries
+* Add horizontal scrollbar to listings (via getnikola/nikola-themes#86)
+* Copy files when importing two-file posts instead of reading and
+  writing (useful for binary formats, eg. docx) (Issue #2380)
+* Using correct category titles for category hierarchies
+  (Issue #2384)
+
+New in v7.7.9
+=============
+
+(1000+ stars on GitHub — thanks!)
+
+Features
+--------
+
+* New ``sc`` or ``html`` reST role, which passes content unaltered (Issue #1854)
+* Point the user to our users site after 1st successful deploy (Issue #2096)
+* Option to disable color output using ``NIKOLA_MONO`` environment
+  variable (Issue #2360)
+* Improved locale detection in Windows (Issue #2343)
+* Added ``enclosure_length`` meta field for better interop (Issue #2338)
+* New Lithuanian translation by Antanas Lasys
+
+Bugfixes
+--------
+
+* Avoid conflicts caused by multiple copies of the same plugin (#2362)
+* Fix handling of some wordpress dumps (Issue #2340)
+* When using the plugin command, load ALL plugins (Issue #2359)
+* Fix plugin removal for plugins that are a package (Issue #2356)
+* Reload English messages for every theme to prevent caching (Issue #2347)
+* Cache theme messages after loading once (Issue #2344)
+* Add ``<link>`` tags to other languages even if the post is
+  untranslated (Google complained otherwise)
+* 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
+--------
+
+* 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)
+
+New in v7.7.7
+=============
+
 Features
 --------
 
@@ -12,6 +142,7 @@ Features
 Bugfixes
 --------
 
+* Fix Indonesian translation (Issue #2291)
 * Fix a JSON conversion bug in the WordPress importer (Issue #2264)
 * Don’t create download directories when not downloading WordPress
   attachments (Issue #2260)
@@ -1757,4 +1888,4 @@ Bugfixes
 * Fix for content displaying too wide
 * Changelog
 
-vim: tw=70 syntax=rst
+vim: cc=70 tw=70 syntax=rst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,11 @@
+graft bower_components
 graft docs
+graft logo
 graft nikola
+graft snapcraft
 graft scripts
 graft tests
+graft translations
 include *.txt
 include *.rst
 include *.py

diff --git a/README.rst b/README.rst
@@ -40,7 +40,7 @@ It has many features, but here are some of the nicer ones:
 * Syntax highlighting for almost any programming language or markup
 * Multilingual sites, `translated to 18 languages.`__
 * Doesn't reinvent wheels, leverages existing tools.
-* Python 2.7, 3.3 and 3.4 compatible.
+* Python 2.7, 3.3, 3.4 and 3.5 compatible.
 
 .. _Nikola Handbook: https://getnikola.com/handbook.html#why-static
 __ https://users.getnikola.com/

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,8 +8,9 @@ init:
   - "ECHO %PYTHON%"
   - ps: "ls C:/Python*"
 install:
+  - "%PYTHON%/python.exe -m pip install -U pip"
   - "%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.json b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "Nikola",
+  "name": "nikola",
   "version": "0.0.0",
   "homepage": "https://github.com/getnikola/nikola",
   "authors": [
@@ -9,7 +9,7 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "bootstrap": "~3.3.6",
+    "bootstrap": "~3.3.7",
     "jquery": "<2.0.0",
     "jquery-colorbox": "~1.6.0",
     "moment": "~2.10.3",

diff --git a/bower_components/bootstrap/.bower.json b/bower_components/bootstrap/.bower.json
@@ -29,16 +29,16 @@
     "test-infra"
   ],
   "dependencies": {
-    "jquery": "1.9.1 - 2"
+    "jquery": "1.9.1 - 3"
   },
-  "version": "3.3.6",
-  "_release": "3.3.6",
+  "version": "3.3.7",
+  "_release": "3.3.7",
   "_resolution": {
     "type": "version",
-    "tag": "v3.3.6",
-    "commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
+    "tag": "v3.3.7",
+    "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
   },
-  "_source": "git://github.com/twbs/bootstrap.git",
-  "_target": "~3.3.6",
+  "_source": "https://github.com/twbs/bootstrap.git",
+  "_target": "~3.3.7",
   "_originalSource": "bootstrap"
 }
diff --git a/bower_components/bootstrap/Gemfile b/bower_components/bootstrap/Gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'jekyll', '~> 3.1.2'
+  gem 'jekyll-sitemap', '~> 0.11.0'
+end