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.

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

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

Conversation

@Kwpolska
Copy link
Member

Kwpolska commented Jun 13, 2017

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 Jun 11, 2017
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska added this to the v8.0.0 milestone Jun 13, 2017
@Kwpolska Kwpolska added this to In Progress in Version 8 Jun 13, 2017
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
import os
import sys

__version__ = '7.8.8'

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jun 13, 2017

Contributor

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

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Jun 14, 2017

Author Member

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 Jun 14, 2017
@Kwpolska
Copy link
Member Author

Kwpolska commented Jun 14, 2017

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

Kwpolska added 6 commits Jun 13, 2017
…o render

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska force-pushed the v8-cleanup branch from 5fbcbf4 to 9ea0962 Jun 14, 2017
@getnikola getnikola deleted a comment Jun 14, 2017
@getnikola getnikola deleted a comment Jun 14, 2017
Copy link
Contributor

felixfontein left a comment

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

@@ -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):

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jun 14, 2017

Contributor

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

@@ -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})

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jun 14, 2017

Contributor

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

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jun 15, 2017

Contributor

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...

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jun 15, 2017

Contributor

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

@getnikola getnikola deleted a comment Jun 15, 2017
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska requested a review from felixfontein Jun 15, 2017
@Kwpolska Kwpolska merged commit 4f2574c into master Jun 16, 2017
3 of 5 checks passed
3 of 5 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/travis-ci/push The Travis CI build failed
Details
codacy/pr Good work! A positive pull request.
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@Kwpolska Kwpolska deleted the v8-cleanup branch Jun 16, 2017
@Kwpolska Kwpolska moved this from In Progress to Done in Version 8 Jul 10, 2017
@fgallaire

This comment has been minimized.

Copy link

fgallaire commented on fafbc1f Oct 18, 2017

Why ??!!

This comment has been minimized.

Copy link
Member Author

Kwpolska replied Oct 18, 2017

  1. This was decided a long time ago, based on a poll that said most users wouldn’t mind.
  2. Python 3 is the future. Python 2 goes EOL in 2020. Django 2.0 drops support for Python 2 as well.
  3. Python 3 has sane Unicode and a few nifty features (we’re using typing and asyncio in a few places)
  4. Many Linux distros default to Python 3 (Arch Linux, Ubuntu, Fedora to name a few). Windows users have to install it already. macOS users don’t have much of a problem. It’s hard on RHEL but still doable.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Version 8
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.