Update both Python and Ruby dependencies

.gitignore

@@ -1,4 +1,7 @@
-_site
-.sass-cache
-.jekyll-metadata
+__pycache__/
 _downloads/**
+_site/
+.jekyll-cache/
+.jekyll-metadata/
+.sass-cache/
+*.pyc

Dockerfile

@@ -8,10 +8,10 @@ WORKDIR /source/
 COPY . /source/
 RUN pip install -r requirements.txt
 # Validate that what was installed was what was expected
-RUN pip freeze 2>/dev/null | grep -v "deployer" > requirements.installed \
-        && diff -u requirements.txt requirements.installed 1>&2 \
-        || ( echo "!! ERROR !! requirements.txt defined different packages or versions for installation" \
-                && exit 1 ) 1>&2
+RUN pip freeze 2>/dev/null > requirements.installed \
+    && diff -u --strip-trailing-cr requirements.txt requirements.installed 1>&2 \
+    || ( echo "!! ERROR !! requirements.txt defined different packages or versions for installation" \
+        && exit 1 ) 1>&2
 
 RUN python -m fetch_downloads
 
@@ -25,15 +25,14 @@ COPY Gemfile Gemfile.lock /source/
 
 RUN apk --no-cache add \
         build-base \
+        libstdc++ \
         ruby \
         ruby-bigdecimal \
         ruby-dev \
         ruby-json \
         ruby-rdoc \
     && echo "gem: --no-ri --no-rdoc --no-document" > ~/.gemrc \
     && gem update --system \
-    && gem install http_parser.rb -v 0.6.0 -- --use-system-libraries \
-    && gem install safe_yaml -v 1.0.4 -- --use-system-libraries \
     && bundle update --bundler \
     && bundle install \
     && apk --no-cache del \

Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem "jekyll", "~> 3.8.5"
+gem "jekyll", "~> 4.1.1"
 
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.11.0"
-  gem "jekyll-paginate-v2", "~> 2.0"
+  gem "jekyll-feed", "~> 0.15.0"
+  gem "jekyll-paginate-v2", "~> 3.0.0"
 end

Gemfile.lock

@@ -1,69 +1,73 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.7)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
-    jekyll-paginate-v2 (2.0.0)
-      jekyll (~> 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-watch (2.1.2)
+      terminal-table (~> 1.8)
+    jekyll-feed (0.15.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-paginate-v2 (3.0.0)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    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)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.7.2)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    rexml (3.2.4)
+    rouge (3.22.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)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.8.5)
-  jekyll-feed (~> 0.11.0)
-  jekyll-paginate-v2 (~> 2.0)
+  jekyll (~> 4.1.1)
+  jekyll-feed (~> 0.15.0)
+  jekyll-paginate-v2 (~> 3.0.0)
 
 BUNDLED WITH
-   1.17.1
+   2.1.4

_config.yml

@@ -17,13 +17,10 @@ plugins:
 exclude:
   - Dockerfile
   - fetch-downloads.py
-  - Gemfile
-  - Gemfile.lock
   - nginx.default.conf
   - requirements.base
   - requirements.txt
   - thirdparty
-  - vendor
 
 defaults:
   - scope:

fetch_downloads/__main__.py

@@ -78,7 +78,10 @@ async def main():
                 local_folder = "openttd-nightlies"
 
             await handle_version(
-                folder=version["folder"], local_folder=local_folder, version=version["version"], name=name,
+                folder=version["folder"],
+                local_folder=local_folder,
+                version=version["version"],
+                name=name,
             )
 
     await session.close()

requirements.txt

@@ -1,10 +1,8 @@
 aiohttp==3.6.2
 async-timeout==3.0.1
-attrs==19.3.0
+attrs==20.1.0
 chardet==3.0.4
-idna==2.8
-idna-ssl==1.1.0
-multidict==4.7.4
-PyYAML==5.3
-typing-extensions==3.7.4.1
-yarl==1.4.2
+idna==2.10
+multidict==4.7.6
+PyYAML==5.3.1
+yarl==1.5.1