Merge branch 'gh-pages' into patch-6

Author: mlinksva

.github/workflows/build.yml

@@ -14,4 +14,6 @@ jobs:
       with:
         bundler-cache: true
     - name: Build and test site
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: bundle exec rake test

Gemfile

@@ -11,7 +11,7 @@ group :jekyll_plugins do
 end
 
 group :development, :test do
-  gem 'html-proofer'
+  gem 'html-proofer', '~> 4.0'
   gem 'parallel'
   gem 'rake'
   gem 'rubocop'

Rakefile

@@ -4,9 +4,19 @@ require 'html-proofer'
 
 task :test do
   sh 'bundle exec jekyll build'
-  HTMLProofer.check_directory('./_site/',
-                              check_html: true,
-                              hydra: { max_concurrency: 10 },
-                              url_ignore: [%r{https://developer.github.com}, %r{https://docs.github.com}, %r{https://help.github.com}],
-                              http_status_ignore: [429]).run
+  proofer = HTMLProofer.check_directory(
+    './_site/',
+    check_html: true,
+    check_external_hash: false,
+    hydra: { max_concurrency: 10 },
+    url_ignore: [%r{https://developer.github.com}, %r{https://docs.github.com}, %r{https://help.github.com}],
+    ignore_status_codes: [429]
+  )
+  token = ENV.fetch('GITHUB_TOKEN', nil)
+  unless token.nil?
+    proofer.before_request do |request|
+      request.options[:headers]['Authorization'] = "Bearer #{token}" if request.base_url == 'https://github.com'
+    end
+  end
+  proofer.run
 end

_data/civic_hackers.yml

@@ -197,6 +197,7 @@ Code For America:
   - code-for-tb
   - code4hr
   - code4newark
+  - code4nova
   - code4puertorico
   - code4sac
   - codeforabq
@@ -284,7 +285,6 @@ Code For America:
   - opentwincities
   - openwichita
   - openzagreb
-  - sarl-hackerspace
   - scodemeetup
   - sewardparkstories
   - sfbrigade

_data/governments.yml

@@ -290,6 +290,7 @@ Germany:
   - kdn-nrw
   - kreis-viersen
   - lobid
+  - OpenBfS
   - OpenNRW
   - regional-digital
   - robert-koch-institut
@@ -321,9 +322,9 @@ International:
   - EL-BID
   - IATI
   - ogpl
+  - WorldHealthOrganization
 
 Ireland:
-  - FSAIreland
   - HSEIreland
 
 Isle of Man:
@@ -401,7 +402,6 @@ New Zealand:
   - nz-mbie
   - nz-social-investment-agency
   - opcnz
-  - R9BetterAPIs
   - te-papa
 
 Norway:
@@ -413,7 +413,6 @@ Norway:
   - DirektoratetForByggkvalitet
   - dsb-norge
   - dss-web
-  - fylkesmannen
   - kartverket
   - knreise
   - KRD-KOMM-VL
@@ -461,7 +460,6 @@ Republic of Korea:
   - molit-korea
 
 Romania:
-  - gov-ithub
   - govro
   - MinistryOfLabor
 
@@ -719,7 +717,6 @@ U.S. City:
   - cityofboulder
   - cityofburlington
   - cityofchattanooga
-  - cityoffortworth
   - CityOfLosAngeles
   - cityofnewyork
   - CityOfPhiladelphia
@@ -924,13 +921,11 @@ U.S. Federal:
   - usgpo
   - usgs
   - USGS-Astrogeology
-  - USGS-CIDA
   - usgs-cmg
   - usgs-eros
   - USGS-OWI
   - USGS-R
   - USGS-WiM
-  - usindianaffairs
   - usnationalarchives
   - usopm
   - USPS
@@ -1023,7 +1018,6 @@ U.S. States:
   - twdb
   - TxDOT
   - UtahForestryFireStateLands
-  - VDEQ
   - VDGIF
   - Virginia-Department-of-Health
   - Virginia-House-of-Delegates
@@ -1052,9 +1046,6 @@ United Nations:
   - worldbank
   - WorldBank-Transport
 
-Uruguay:
-  - gubuy
-
 Venezuela:
   - CanaimaGNULinux
   - suscerte

_data/research.yml

@@ -12,6 +12,7 @@ France:
   - luli
 
 Germany:
+  - BAMresearch
   - baw-de
   - fraunhofer-iais
   - Fraunhofer-IIS
@@ -22,6 +23,7 @@ Germany:
   - MPI-IS
   - MPIB
   - mppmu
+  - TU-Berlin
 
 International:
   - CERN

_layouts/form-page.html

@@ -24,7 +24,7 @@ <h1 class="alt-h2 pt-4 pb-3 pt-sm-5">{{ page.title }}</h1>
 
 <!---for form --->
   <script src="{{ "/assets/js/utm_form-1.0.3.min.js" | relative_url  }}"></script>
-  <script src="//js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js"></script>
+  <script src="https://js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js"></script>
   <script src="{{ "/assets/js/validate.js" | relative_url }}"></script>
   <script src="{{ "/assets/js/geoip.js" | relative_url }}"></script>
 

script/alphabetize

@@ -10,7 +10,7 @@ require 'yaml'
 files = Dir["#{File.expand_path('../_data/', File.dirname(__FILE__))}/*.yml"]
 
 files.each do |file|
-  contents = File.open(file).read
+  contents = File.read(file)
   comment = contents.lines.first
 
   data = YAML.safe_load(contents)
@@ -25,5 +25,5 @@ files.each do |file|
   # Add extra line break between groups, indent arrays, and strip header
   formatted_output = comment + output.to_yaml.gsub(/^(.+?):$/, "\n\\1:").gsub(/^- /, '  - ').gsub(/\A---\n/m, '')
 
-  File.open(file, 'w') { |f| f.write(formatted_output) }
+  File.write(file, formatted_output)
 end

script/ensure-orgs

@@ -48,7 +48,7 @@ files.each do |file|
     data[group] = data[group] - not_orgs
   end
 
-  comment = File.open(file).read.lines.first
+  comment = File.read(file).lines.first
   output = comment
   output << "\n"
   output << data.to_yaml.sub(/\A---\n/, '').gsub(/^-/, '  -').gsub(/\n([^ ])/, "\n\n\\1")

script/fetch-cfa

@@ -31,7 +31,7 @@ module CFA
       org_file['Code for All'] = code_for_all_orgs
       org_file['Civic Hackers'] = civic_hackers - brigades - code_for_all_orgs + to_be_removed
 
-      comment = File.open(org_file_path).read.lines.first
+      comment = File.read(org_file_path).lines.first
       output = comment
       output << "\n"
       output << org_file.to_yaml.sub(/\A---\n/, '').gsub(/^-/, '  -').gsub(/\n([^ ])/, "\n\n\\1")