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

Merge data_produced branch #6

Merged
merged 11 commits into from
Dec 16, 2024
Merged

Merge data_produced branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b5b8fd
Split up data column into "Data used" and "Data produced", for now in…
jrvosse Dec 13, 2024
dcb8659
rename readme.md -> README.md for consistency and jekyll exclude rule
jrvosse Dec 13, 2024
66aac57
Make jekyll ignore README and Rproj files
jrvosse Dec 13, 2024
15e8f5b
Make jekyll ignore data-prep folder
jrvosse Dec 13, 2024
e19b478
remove jekyll generated files from git versioning
jrvosse Dec 13, 2024
ba7b9eb
git ignore generated folder by jekyll
jrvosse Dec 13, 2024
dbdf5af
Added data produced column
jrvosse Dec 14, 2024
199f071
Use raw csv data directly in html
jrvosse Dec 14, 2024
c978306
Use raw csv data directly in html for liss as well
jrvosse Dec 14, 2024
0654edb
Remove data-prep scripts now site runs on the raw csv files
jrvosse Dec 14, 2024
49dae3a
Added missing gems and upped version
jrvosse Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ po/*~

# RStudio Connect folder
rsconnect/

# Jekyll generated:
_site
3 changes: 2 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source "https://rubygems.org"
gem "jekyll", "~> 4.3.3"
gem "jekyll", "~> 4.3.4"
group :jekyll_plugins do
gem "jekyll-feed"
gem "jekyll-seo-tag"
Expand All @@ -10,3 +10,4 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do
end
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
gem "csv"
122 changes: 61 additions & 61 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ GEM
bigdecimal (3.1.8)
colorator (1.1.0)
concurrent-ruby (1.3.4)
csv (3.2.8)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
Expand All @@ -22,28 +23,28 @@ GEM
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux-musl)
forwardable-extended (2.6.0)
google-protobuf (4.27.4)
google-protobuf (4.29.1)
bigdecimal
rake (>= 13)
google-protobuf (4.27.4-aarch64-linux)
google-protobuf (4.29.1-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.4-arm64-darwin)
google-protobuf (4.29.1-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.4-x86-linux)
google-protobuf (4.29.1-x86-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.4-x86_64-darwin)
google-protobuf (4.29.1-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.4-x86_64-linux)
google-protobuf (4.29.1-x86_64-linux)
bigdecimal
rake (>= 13)
http_parser.rb (0.8.0)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand All @@ -67,8 +68,8 @@ GEM
jekyll (>= 3.8, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
Expand All @@ -83,60 +84,58 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.6)
strscan
rouge (4.3.0)
rexml (3.3.9)
rouge (4.5.1)
safe_yaml (1.0.5)
sass-embedded (1.77.8)
google-protobuf (~> 4.26)
sass-embedded (1.83.0)
google-protobuf (~> 4.28)
rake (>= 13)
sass-embedded (1.77.8-aarch64-linux-android)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-aarch64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-aarch64-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-aarch64-mingw-ucrt)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-androideabi)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-gnueabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm-linux-musleabihf)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-arm64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-riscv64-linux-android)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-riscv64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-riscv64-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-cygwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-android)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-linux-musl)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86-mingw-ucrt)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-cygwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-darwin)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-android)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-gnu)
google-protobuf (~> 4.26)
sass-embedded (1.77.8-x86_64-linux-musl)
google-protobuf (~> 4.26)
strscan (3.1.0)
sass-embedded (1.83.0-aarch64-linux-android)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-aarch64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-aarch64-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-aarch64-mingw-ucrt)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-androideabi)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-gnueabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-musleabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-riscv64-linux-android)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-riscv64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-riscv64-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86-cygwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86-linux-android)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86-mingw-ucrt)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-cygwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-linux-android)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-linux-musl)
google-protobuf (~> 4.28)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.5.0)
webrick (1.8.1)
unicode-display_width (2.6.0)
webrick (1.9.1)

PLATFORMS
aarch64-linux
Expand Down Expand Up @@ -168,8 +167,9 @@ PLATFORMS
x86_64-linux-musl

DEPENDENCIES
csv
http_parser.rb (~> 0.6.0)
jekyll (~> 4.3.3)
jekyll (~> 4.3.4)
jekyll-feed
jekyll-seo-tag
tzinfo (>= 1, < 3)
Expand Down
2 changes: 2 additions & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ email: "[email protected]"
baseurl: "/ODISSEI-code-library" # the subpath of your site, e.g. /blog
url: "https://odissei-data.github.io" # the base hostname & protocol for your site, e.g. http://example.com

exclude: ["README.md", "**/README.md", "*.Rproj", "data-prep/"]

# Build settings
plugins:
- jekyll-feed
Expand Down
Loading
Loading