This is an automated email from the ASF dual-hosted git repository.
abukor pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new 29db135 Update Jekyll and site-tool
29db135 is described below
commit 29db13584cf2c66a6022c26bd0e14a2500685d48
Author: Attila Bukor <[email protected]>
AuthorDate: Thu Jul 30 01:00:08 2020 +0200
Update Jekyll and site-tool
site_tool fails to publish the site on Python 3 due to shell exec
returning bytes instead of string and calling strip() on it. This patch
decodes these bytes as UTF8 strings.
This patch also updates Jekyll as the previous version doesn't run on
modern Ruby version. Furthermore, GitHub Pages, which we use to review
rendered pages, also uses a more recent version and there can be
compatibility issues between them.
In this commit I also fix one such compatibility issue where the blog
menu item isn't active (bold) when a blog post or the blog index is
rendered. I also fixed the releases page activeness which wasn't caused
by an incompatibility, it was incorrect before the update as well.
Change-Id: Iebab0334b1c88e5fcfa4fee5b361e6ade314e407
Reviewed-on: http://gerrit.cloudera.org:8080/16256
Reviewed-by: Grant Henke <[email protected]>
Tested-by: Grant Henke <[email protected]>
---
.gitignore | 4 ++
Gemfile | 14 ++--
Gemfile.lock | 176 +++++++++++++++++++++-------------------------
_config.yml | 2 +-
_includes/top_common.html | 6 +-
_tools/kudu_util.py | 2 +-
site_tool | 2 +-
7 files changed, 95 insertions(+), 111 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7549f1a..2f922ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@ _publish
.bundle/
.gem/
+vendor/
+.jekyll-cache/
+.jekyll-metadata
# htmlproof creates this tmp dir
tmp
+
diff --git a/Gemfile b/Gemfile
index 44acbb9..4b65326 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,10 +21,7 @@ source 'https://rubygems.org'
# the TOC generation for the FAQ doesn't work.
gem 'kramdown'
-# We pin a slightly older version of jekyll which only requires
-# Ruby 1.9. Jekyll 3.0 requires Ruby 2.0 which is more painful to
-# install on some hosts.
-gem 'jekyll', '~> 2.5.3'
+gem 'jekyll'
# Jekyll requires a Javascript runtime:
# https://github.com/jekyll/jekyll/issues/2327
@@ -33,9 +30,10 @@ gem 'therubyracer' # V8 runtime installer for Jekyll
# Produce /feed.xml for the Jekyll blog.
gem 'jekyll-feed'
+gem 'jekyll-paginate'
+
# Used for 'site_tool proof'.
-# Pin to an old version which doesn't require ruby 2.0.
-gem 'html-proofer', '~> 2.6.4'
+gem 'html-proofer'
-gem 'fileutils', '~> 1.0.2'
-gem 'date', '~> 1.0.0'
+gem 'fileutils'
+gem 'date'
diff --git a/Gemfile.lock b/Gemfile.lock
index cfe621b..38946cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,122 +1,104 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (4.2.6)
- i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
- minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
- tzinfo (~> 1.1)
- addressable (2.4.0)
- blankslate (2.1.2.4)
- classifier-reborn (2.0.4)
- fast-stemmer (~> 1.0)
- coffee-script (2.4.1)
- coffee-script-source
- execjs
- coffee-script-source (1.10.0)
- colorator (0.1)
- colored (1.2)
- date (1.0.0)
- ethon (0.8.1)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ colorator (1.1.0)
+ concurrent-ruby (1.1.6)
+ date (3.0.1)
+ em-websocket (0.5.1)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0.6.0)
+ ethon (0.12.0)
ffi (>= 1.3.0)
- execjs (2.6.0)
- faraday (0.9.2)
- multipart-post (>= 1.2, < 3)
- fast-stemmer (1.0.2)
- ffi (1.9.10)
- fileutils (1.0.2)
- html-proofer (2.6.4)
- activesupport (~> 4.2)
+ eventmachine (1.2.7)
+ ffi (1.13.1)
+ fileutils (1.4.1)
+ forwardable-extended (2.6.0)
+ html-proofer (3.15.3)
addressable (~> 2.3)
- colored (~> 1.2)
- mercenary (~> 0.3.2)
- nokogiri (~> 1.5)
+ mercenary (~> 0.3)
+ nokogumbo (~> 2.0)
parallel (~> 1.3)
- typhoeus (~> 0.7)
+ rainbow (~> 3.0)
+ typhoeus (~> 1.3)
yell (~> 2.0)
- i18n (0.7.0)
- jekyll (2.5.3)
- classifier-reborn (~> 2.0)
- colorator (~> 0.1)
- jekyll-coffeescript (~> 1.0)
- jekyll-gist (~> 1.0)
- jekyll-paginate (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 2.6.1)
- mercenary (~> 0.3.3)
- pygments.rb (~> 0.6.0)
- redcarpet (~> 3.1)
+ http_parser.rb (0.6.0)
+ i18n (1.8.3)
+ concurrent-ruby (~> 1.0)
+ jekyll (4.1.1)
+ addressable (~> 2.4)
+ colorator (~> 1.0)
+ em-websocket (~> 0.5)
+ i18n (~> 1.0)
+ jekyll-sass-converter (~> 2.0)
+ jekyll-watch (~> 2.0)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
+ liquid (~> 4.0)
+ mercenary (~> 0.4.0)
+ pathutil (~> 0.9)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
- toml (~> 0.1.0)
- jekyll-coffeescript (1.0.1)
- coffee-script (~> 2.2)
- jekyll-feed (0.4.0)
- jekyll-gist (1.4.0)
- octokit (~> 4.2)
+ terminal-table (~> 1.8)
+ jekyll-feed (0.15.0)
+ jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.4.0)
- sass (~> 3.4)
- jekyll-watch (1.3.1)
+ jekyll-sass-converter (2.1.0)
+ sassc (> 2.0.1, < 3.0)
+ jekyll-watch (2.2.1)
listen (~> 3.0)
- json (1.8.6)
- kramdown (1.10.0)
+ kramdown (2.3.0)
+ rexml
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
libv8 (3.16.14.19)
- liquid (2.6.3)
- listen (3.0.6)
- rb-fsevent (>= 0.9.3)
- rb-inotify (>= 0.9.7)
- mercenary (0.3.5)
- mini_portile2 (2.0.0)
- minitest (5.8.4)
- multipart-post (2.0.0)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
- octokit (4.3.0)
- sawyer (~> 0.7.0, >= 0.5.3)
- parallel (1.6.2)
- parslet (1.5.0)
- blankslate (~> 2.0)
- posix-spawn (0.3.11)
- pygments.rb (0.6.3)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.2.0)
- rb-fsevent (0.9.7)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- redcarpet (3.3.4)
+ liquid (4.0.3)
+ listen (3.2.1)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
+ mercenary (0.4.0)
+ mini_portile2 (2.4.0)
+ nokogiri (1.10.10)
+ mini_portile2 (~> 2.4.0)
+ nokogumbo (2.0.2)
+ nokogiri (~> 1.8, >= 1.8.4)
+ parallel (1.19.2)
+ pathutil (0.16.2)
+ forwardable-extended (~> 2.6)
+ public_suffix (4.0.5)
+ rainbow (3.0.0)
+ rb-fsevent (0.10.4)
+ rb-inotify (0.10.1)
+ ffi (~> 1.0)
ref (2.0.0)
- safe_yaml (1.0.4)
- sass (3.4.21)
- sawyer (0.7.0)
- addressable (>= 2.3.5, < 2.5)
- faraday (~> 0.8, < 0.10)
+ rexml (3.2.4)
+ rouge (3.21.0)
+ safe_yaml (1.0.5)
+ sassc (2.4.0)
+ ffi (~> 1.9)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
- thread_safe (0.3.5)
- toml (0.1.2)
- parslet (~> 1.5.0)
- typhoeus (0.8.0)
- ethon (>= 0.8.0)
- tzinfo (1.2.2)
- thread_safe (~> 0.1)
- yajl-ruby (1.2.3)
- yell (2.0.5)
+ typhoeus (1.4.0)
+ ethon (>= 0.9.0)
+ unicode-display_width (1.7.0)
+ yell (2.2.2)
PLATFORMS
ruby
DEPENDENCIES
- date (~> 1.0.0)
- fileutils (~> 1.0.2)
- html-proofer (~> 2.6.4)
- jekyll (~> 2.5.3)
+ date
+ fileutils
+ html-proofer
+ jekyll
jekyll-feed
+ jekyll-paginate
kramdown
therubyracer
BUNDLED WITH
- 1.11.2
+ 2.1.4
diff --git a/_config.yml b/_config.yml
index ea2a258..0ef898c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,4 @@
-gems:
+plugins:
- jekyll-feed
- jekyll-paginate
exclude:
diff --git a/_includes/top_common.html b/_includes/top_common.html
index 6385c82..7d5b74c 100644
--- a/_includes/top_common.html
+++ b/_includes/top_common.html
@@ -19,7 +19,7 @@
<link rel="shortcut icon" href="{{site.github.url}}/img/logo-favicon.ico"
/>
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css";
/>
- {% if page.active_nav == 'blog' %}
+ {% if layout.active_nav == 'blog' %}
<link rel="alternate" type="application/atom+xml"
title="RSS Feed for Apache Kudu blog"
href="/feed.xml" />
@@ -61,10 +61,10 @@
<li {% if page.active_nav == 'docs' %}class="active"{% endif
%}>
<a href="{{site.github.url}}/docs/">Documentation</a>
</li>
- <li {% if page.active_nav == 'releases' %}class="active"{%
endif %}>
+ <li {% if page.active_nav == 'download' %}class="active"{%
endif %}>
<a href="{{site.github.url}}/releases/">Releases</a>
</li>
- <li {% if page.active_nav == 'blog' %}class="active"{% endif
%}>
+ <li {% if layout.active_nav == 'blog' %}class="active"{% endif
%}>
<a href="{{site.github.url}}/blog/">Blog</a>
</li>
<!-- NOTE: this dropdown menu does not appear on Mobile, so
don't add anything here
diff --git a/_tools/kudu_util.py b/_tools/kudu_util.py
index a24d7cf..dcef0d7 100644
--- a/_tools/kudu_util.py
+++ b/_tools/kudu_util.py
@@ -51,7 +51,7 @@ def check_output(*popenargs, **kwargs):
error = subprocess.CalledProcessError(retcode, cmd)
error.output = output
raise error
- return output
+ return output.decode("utf-8")
def confirm_prompt(prompt):
diff --git a/site_tool b/site_tool
index 4a87410..0ec1c83 100755
--- a/site_tool
+++ b/site_tool
@@ -95,7 +95,7 @@ def setup_bundle():
if not os.path.exists(BUNDLE_PATH):
try:
subprocess.check_call(
- ["gem", "install", "--no-ri", "--no-rdoc", "-q",
+ ["gem", "install", "--no-document", "-q",
"--install-dir", GEM_PATH, "bundler"])
except Exception as e:
logging.fatal("Could not install 'bundler' gem: " + str(e) + "\n" +
