-
Notifications
You must be signed in to change notification settings - Fork 446
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into continuous-import
- Loading branch information
Showing
739 changed files
with
130,248 additions
and
63,486 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
root = true | ||
|
||
[*] | ||
end_of_line = lf | ||
insert_final_newline = true | ||
charset = utf-8 | ||
indent_style = space | ||
indent_size = 4 | ||
|
||
[CHANGES.txt] | ||
max_line_length = 70 | ||
|
||
[*.py] | ||
trim_trailing_whitespace = true | ||
|
||
[nikola/data/themes/base/assets/css/theme.css] | ||
indent_style = tab | ||
|
||
[{appveyor.yml,.travis.yml}] | ||
indent_style = space | ||
indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<!-- | ||
Before creating an issue: | ||
* make sure you are using an up-to-date version of Nikola | ||
* search for existing issues that might be related | ||
If you are reporting a bug: | ||
* provide information about your environment (below) | ||
* include all the output you get, and any other information related to your problem | ||
Nikola v7.6.4, as provided by Debian/Ubuntu, is NOT SUPPORTED. | ||
If you are using this version, you should upgrade: https://getnikola.com/getting-started.html | ||
--> | ||
|
||
### Environment (if reporting a bug) | ||
|
||
**Python Version:** | ||
|
||
**Nikola Version:** | ||
|
||
**Operating System:** | ||
|
||
### Description: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
### Pull Request Checklist | ||
|
||
- [ ] I’ve read the [guidelines for contributing](https://github.com/getnikola/nikola/blob/master/CONTRIBUTING.rst). | ||
- [ ] I updated AUTHORS.txt and CHANGES.txt (if the change is non-trivial) and documentation (if applicable). | ||
- [ ] I tested my changes. | ||
|
||
### Description |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,3 +24,6 @@ __pycache__/ | |
|
||
# GitHub token | ||
.pypt/gh-token | ||
|
||
# | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,50 +1,49 @@ | ||
before_install: | ||
- "pip install --upgrade pip wheel" | ||
- pip install --upgrade pip wheel | ||
language: python | ||
cache: apt | ||
sudo: false | ||
addons: | ||
apt: | ||
packages: | ||
- language-pack-en-base | ||
- language-pack-pl-base | ||
apt: | ||
packages: | ||
- language-pack-en-base | ||
- language-pack-pl-base | ||
python: | ||
- "2.7" | ||
- "3.3" | ||
- "3.4" | ||
- "3.5" | ||
- '2.7' | ||
- '3.3' | ||
- '3.4' | ||
- '3.5' | ||
- '3.6' | ||
matrix: | ||
include: | ||
- python: "3.5" | ||
env: NMODE=flake8 | ||
- python: '3.6' | ||
env: NMODE=flake8 | ||
env: | ||
NMODE=nikola | ||
matrix: | ||
- NMODE=nikola | ||
global: | ||
secure: GqUDW0j4Ay8pS9tS/g5JBYGtgBG0g0oD2g4X9JXgVchiFj3GIRL+dwiXpgx3LELy7nCWF3EzClFxxMdVqqxizQ/I8xqiA0XL/rf5z/y+9d9nmKOxV8SV73n0eCgsHWkbdSLJ6MKs6s0Trlz9jLu/P+Bhfu2ttqkOH8WttfEf3VE= | ||
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 == '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. | ||
- 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 == 'flake8' ]]; then pip install flake8 pydocstyle; fi | ||
script: | ||
- "if [[ $NMODE == 'nikola' ]]; then py.test --doctest-modules nikola/; 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 pydocstyle --count --match-dir='(?!^\\\\.)(?!data).*' nikola/; 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 == 'nikola' ]]; then scripts/codacy_coverage.sh; fi | ||
- if [[ $NMODE == 'flake8' ]]; then flake8 nikola/; fi | ||
- if [[ $NMODE == 'flake8' ]]; then pydocstyle --count --match-dir='(?!^\\.)(?!data).*' nikola/; fi | ||
after_success: | ||
- "if [[ $NMODE == 'nikola' ]]; then coveralls; fi" | ||
notifications: | ||
irc: | ||
channels: | ||
- "chat.freenode.net#nikola" | ||
- chat.freenode.net#nikola | ||
template: | ||
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" | ||
- "Change view: %{compare_url}" | ||
- "Build details: %{build_url}" | ||
- '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}' | ||
- 'Change view: %{compare_url}' | ||
- 'Build details: %{build_url}' | ||
skip_join: true | ||
use_notice: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.