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

Fix #2850 — rewrite nikola auto with asyncio and aiohttp #2882

Merged
merged 16 commits into from Aug 1, 2017
Merged

Fix #2850 — rewrite nikola auto with asyncio and aiohttp #2882

merged 16 commits into from Aug 1, 2017

Conversation

Kwpolska
Copy link
Member

@Kwpolska Kwpolska commented Jul 30, 2017 •
edited

This is #2850, a more modern (and less hacky) version of nikola auto.

Work in progress. To do:

  • add a rebuild queue (currently, rebuilds may happen concurrently)
  • restore no-server option (do we need it?)
  • figure out what the liveCSS option means in LiveReload (it reloads CSS without reloading the entire page, let’s leave it enabled)
  • code style
  • test on Linux and Windows
  • test on Python 3.3 (dropped support), 3.4, 3.5, 3.6
  • stop depending on virtualenvs being active/nikola in $PATH

I don’t think we can merge it with nikola serve, because it requires extra dependencies.

Tested on:

  • Ubuntu 14.04, Python 3.4, using a remote server (it works!)
  • macOS, Python 3.5 (thanks @offby1)
  • macOS Sierra, Python 3.6
  • Arch Linux, Python 3.6
  • Windows 7, Python 3.6
  • Kubuntu 16.04, Python 3.5 (thanks @altendky)

If anyone wants to help with testing: clone and install with extra requirements; create a demo site (nikola init -qd n), run nikola auto -b in the site, verify everything works (index; /pages/ path; any subpage), try editing a post and see if it works.

@Kwpolska Kwpolska added this to the v8.0.0 milestone Jul 30, 2017
@Kwpolska Kwpolska self-assigned this Jul 30, 2017
@Kwpolska Kwpolska requested a review from ralsina July 30, 2017 14:09
@Kwpolska
Fix #2850 — rewrite nikola auto with asyncio and aiohttp
b2a1bd8 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Add missing docstrings and clean up some things
b3dcf70 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Restore support for --no-server
6a3c68e 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Fix some more style complaints
50b4855 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Drop support for Python 3.3
9b95fbe 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Fix code style
41a16e0 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Add rebuild queue
ef86201 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Display directory indexes if there is no index.html file
27dab0a 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Update comment wording [ci skip]
d5941cb 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska Kwpolska changed the title [WIP] Fix #2850 — rewrite nikola auto with asyncio and aiohttp Fix #2850 — rewrite nikola auto with asyncio and aiohttp Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Add missing docstring
4a72631 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Python 3.4 compatibility; asyncio is guaranteed to exist
496a4ad 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Bytestrings for the command are unnecessary and break Windows
c049af5 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Windows: fix event loop setting, fix backslashes, decrease timeout
7d32a9a 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Python 3.5 does not support open()ing Path objects either (thanks @of…
6837ee2 
…fby1)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 30, 2017
@getnikola getnikola deleted a comment Jul 30, 2017
@Kwpolska
Remove wheelhouse in favor of official wheels
86adc66 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@getnikola getnikola deleted a comment Jul 31, 2017
@getnikola getnikola deleted a comment Jul 31, 2017
@Kwpolska
auto: Avoid depending on nikola executable in $PATH
0fdadf5 
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@Kwpolska
Copy link
Member Author

@ralsina, @felixfontein, this is finished — reviews welcome.

@getnikola getnikola deleted a comment Jul 31, 2017
@getnikola getnikola deleted a comment Jul 31, 2017
@felixfontein
Copy link
Contributor

I don't use nikola auto so I cannot comment much on this, but I went through the change and it looks good to me.

Just a minor thing: in case you change conf.py (like changing the name of the posts folders), nikola auto will not start watching the new folders, right? I guess implementing that would require a lot of extra work (and the previous version didn't do that either) and is a very infrequent usecase, but I thought I'd still ask :)

@Kwpolska
Copy link
Member Author

@felixfontein Yes, that’s a edge case that would be pretty hard to support.

ralsina
ralsina approved these changes Jul 31, 2017
View reviewed changes
Copy link
Member

@ralsina ralsina left a comment

Choose a reason for hiding this comment

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

Awesome work!

@Kwpolska Kwpolska merged commit 47d57ee into master Aug 1, 2017
@Kwpolska Kwpolska deleted the auto-aiohttp branch August 1, 2017 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ralsina ralsina ralsina approved these changes

Assignees

@Kwpolska Kwpolska

Labels
enhancement
Projects
None yet
Milestone
v8.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Kwpolska @felixfontein @ralsina