Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b6f349a512d
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09d86241ecdd
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on Oct 18, 2016

  1. various updates

    ralsina committed Oct 18, 2016
    Copy the full SHA
    50645a6 View commit details
  2. Copy the full SHA
    09d8624 View commit details
2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ New in master
Bugfixes
--------

* Don't crash if plugins is a file (Issue #2539)

Features
--------

2 changes: 1 addition & 1 deletion nikola/__main__.py
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ def main(args=None):
req_missing(['freezegun'], 'perform invariant builds')

if config:
if os.path.exists('plugins') and not os.path.exists('plugins/__init__.py'):
if os.path.isdir('plugins') and not os.path.exists('plugins/__init__.py'):
with open('plugins/__init__.py', 'w') as fh:
fh.write('# Plugin modules go here.')

File renamed without changes.
7 changes: 3 additions & 4 deletions snapcraft/edge/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -11,11 +11,10 @@ apps:

parts:
nikola:
plugin: copy
files:
nikola.sh: nikola.sh
plugin: dump
source: script/
nikola-source:
plugin: python3
plugin: python
source: git://github.com/getnikola/nikola.git
requirements: requirements.txt
stage-packages:
3 changes: 3 additions & 0 deletions snapcraft/requirements.txt
Original file line number Diff line number Diff line change
@@ -25,3 +25,6 @@ natsort>=3.5.2
requests>=2.2.0
husl>=4.0.2
piexif>=1.0.3
phpserialize==1.3
webassets==0.11.1

File renamed without changes.
7 changes: 3 additions & 4 deletions snapcraft/stable/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -11,11 +11,10 @@ apps:

parts:
nikola:
plugin: copy
files:
nikola.sh: nikola.sh
plugin: dump
source: script/
nikola-source:
plugin: python3
plugin: python
source: git://github.com/getnikola/nikola.git
source-tag: v7.8.1
requirements: requirements.txt