Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v8: cleanup and a few features #2838

Merged
merged 30 commits into from
Jun 16, 2017
Merged

v8: cleanup and a few features #2838

merged 30 commits into from
Jun 16, 2017
+276 −1,350

Conversation

Kwpolska
Copy link
Member

This is the groundwork for Nikola v8. Opinions, nitpicks, etc. always welcome.

When this merges, the master branch is going to be v8, while v7-maintenance is where bugfixes for v7 can happen.

Kwpolska added 18 commits June 12, 2017 15:01
@Kwpolska
Remove deprecated stuff for v8
9e5f114 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Drop insecure post encryption feature
6e953a1 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Drop Python 2 support
fafbc1f 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Remove ineffective __future__ imports
7961ae2 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Prevent use of Python 2
312277e 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Create Python 3-only wheels
29fc4c3 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Restore TRANSLATIONS_PATTERN defaults
20cd32f 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix #1838 — use PRETTY_URLS by default
909583c 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Remove with_dependencies argument from apply_shortcodes calls
1318d51 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Delete install_theme command
5669526 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Drop annotations support (annotateit.org closed down in March 2017)
4dff674 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix tests (PRETTY_URLS, shortcodes)
6f7ac4c 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Enable STRIP_INDEXES by default
2936d63 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix code style
8873429 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix #2834 — use Jupyter name more consistently
a8d536d 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Use html4css1.css and nikola_rst.css instead of rst.css in more places
f8a1a88 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix #2093 — support CODE_COLOR_SCHEME in Jupyter notebooks
65234a1
@Kwpolska
Add changelogs for all v8 stuff
f8622a8
@Kwpolska Kwpolska added this to the v8.0.0 milestone Jun 13, 2017
@Kwpolska
Code style + python 2 cleanup
d60e346 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jun 13, 2017
@getnikola getnikola deleted a comment Jun 13, 2017
@getnikola getnikola deleted a comment Jun 13, 2017
@getnikola getnikola deleted a comment Jun 13, 2017
@getnikola getnikola deleted a comment Jun 13, 2017
@getnikola getnikola deleted a comment Jun 13, 2017
felixfontein
felixfontein reviewed Jun 13, 2017
View reviewed changes
nikola/__init__.py Outdated
import os
import sys

__version__ = '7.8.8'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be changed to '8.0.0'? Or will that happen later?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We generally change version numbers right before release. I’ll make it 8.0.0.dev0.

@getnikola getnikola deleted a comment Jun 14, 2017
@getnikola getnikola deleted a comment Jun 14, 2017
@Kwpolska Kwpolska requested review from ralsina and felixfontein June 14, 2017 10:34
@Kwpolska
Copy link
Member Author

If no-one objects, I’m merging this on Friday.

Kwpolska added 6 commits June 14, 2017 12:58
@Kwpolska
Fix json.dump argument order
72fc94d
@Kwpolska
Fix #2841 — use correct hash for MathJax and always include KaTeX aut…
6188ef0 
…o render

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Change version number to 8.0.0.dev0
bbcefa1 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix code style
658f37a 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Fix sitemap behavior with future posts under Windows
ef92dff 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Remove reference to ancient history
9ea0962 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jun 14, 2017
@getnikola getnikola deleted a comment Jun 14, 2017
felixfontein
felixfontein requested changes Jun 14, 2017
View reviewed changes
Copy link
Contributor

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (except two things; one should clearly be changed, the other I'm not sure why you changed it)

nikola/plugin_categories.py
@@ -315,11 +314,6 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
# This function used to have some different APIs in different places.
raise NotImplementedError()

# TODO remove in v8
def compile_html(self, source, dest, is_two_file=True):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The self.compile_html(...) call a few lines up should be replaced by raise NotImplementedError().

nikola/plugins/compile/html.py
@@ -49,7 +48,7 @@ def compile_string(self, data, source_path=None, is_two_file=True, post=None, la
if not is_two_file:
_, data = self.split_metadata(data)
new_data, shortcodes = sc.extract_shortcodes(data)
return self.site.apply_shortcodes_uuid(new_data, shortcodes, filename=source_path, with_dependencies=True, extra_context=dict(post=post))
return self.site.apply_shortcodes_uuid(new_data, shortcodes, filename=source_path, extra_context={'post': post})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you removing with_dependencies=True here and at other places?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't notice that you changed the API in nikola.py since apparently github was hiding its diff and so I couldn't find it. I now saw it when checking out the branch and looking in there...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, the compile_string in php.py was bad; I added a commit to fix it.

@getnikola getnikola deleted a comment Jun 15, 2017
@Kwpolska
Remove backwards compatibility from compile() (h/t @felixfontein)
d71da82 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska requested a review from felixfontein June 15, 2017 18:03
@Kwpolska Kwpolska merged commit 4f2574c into master Jun 16, 2017
@Kwpolska Kwpolska deleted the v8-cleanup branch June 16, 2017 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein

@ralsina ralsina

Assignees

@ralsina ralsina

Labels
breaks backwards compatibility
Projects
None yet
Milestone
v8.0.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Kwpolska @fgallaire @felixfontein @ralsina