PyconUK / pyconuk.github.io

OLD REPOS - DO NOT USE. PyCon UK website
http://www.pyconuk.org/
3 stars 9 forks source link

Jekyll to wok #62

Closed inglesp closed 9 years ago

inglesp commented 9 years ago

Please do not merge

This Pull Request changes the static site generator from Jekyll to wok, which is Python-based. It turns out it that this was less than an hour's work[0]. The changes to the workflow are described in the new README.

The main motivator for this has been that both @snim2 and @ntoll have been frustrated by the current tool chain in the past day. While these changes won't prevent tool chain problems in the future, we should now have fewer moving parts, and those moving parts should be more familiar.

A second benefit to the change is that we can use reStructuredText directly, instead of HTML, which should simplify the schedule, at least.

A third benefit is that we can now say we're Python Powered -- I'm not fussed about this personally, but it might reduce some of the grousing on the mailing list!

This is not yet ready for merging, since I would like several people to test that the new workflow works, and that nothing has been lost in the migration. I've tried to split the changes into meaningful chunks for review (hint: you can suppress whitespace in diffs on GitHub by appending ?w=1 to a url).

Finally, there's going to be a bit of git branch juggling to ensure that GitHub serves the content of the new output directory. I'm going to follow these notes and will do a dry run with another site, but I can't guarantee that there won't be any down time for the site. I will endeavour to do this sober.

Eating stilton and drinking Malbec'ly yours,

Peter.

[0] Getting the link checker to work properly is where my evening has actually gone, and it still doesn't work yet. When it does, we can remove the Ruby-based link checker from the Travis checks, and be happy.

ghickman commented 9 years ago

@inglesp – this looks great, thanks for putting in the time!

A few things from looking at the diff:

inglesp commented 9 years ago

Thanks @ghickman.

ntoll commented 9 years ago

This is a great start. Obviously there is much to do. I think we all owe @inglesp a pint at Pycon. ;-)

ghickman commented 9 years ago

@ntoll – :+1:

@inglesp – oops, sorry I missed the requirements.txt in the diff stat!

snim2 commented 9 years ago

I'm really impressed you did this so fast, thanks!

Build and serve works fine on my machine with your Makefile, except the Registration page [http://localhost:8000/register/] goes to a 404.

I have an new commit to add to this PR, can I push it to your PR branch? I couldn't figure this out from the GitHub docs :(

inglesp commented 9 years ago

@snim2: Well spotted, thanks! I think that you should be able to make a pull request against the jekyll-to-wok branch in my repo, but you wouldn't be able to push to that branch. Does that make sense?

@ntoll: Can you expand on "much to do"?

snim2 commented 9 years ago

@inglesp I think I've sent you a PR to the right place, hopefully.

We all owe you a good Merlot :+1:

ntoll commented 9 years ago

@inglesp it was only based on your "it's not ready to merge" comments. I have no doubt it's awesome code. ;-)

ntoll commented 9 years ago

Also, Stilton++ ;-)

inglesp commented 9 years ago

Closing, since work is now happening at https://github.com/PyconUK/pyconuk.org.