From 35223f1e913edd34ced3db1936fbcd2d60206432 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 26 Aug 2023 14:23:22 -0700 Subject: [PATCH 1/4] Updates for version 3.3.0 with minimum Ruby version 3.0. --- .github/workflows/ci.yml | 4 ++-- README.md | 10 +++++----- VERSION | 2 +- sparql.gemspec | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ac8b1a1..00b888b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby] + ruby: ['3.0', 3.1, 3.2, ruby-head, jruby] steps: - name: Clone repository uses: actions/checkout@v3 @@ -33,6 +33,6 @@ jobs: run: ruby --version; bundle exec rspec spec || $ALLOW_FAILURES - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2 - if: "matrix.ruby == '3.0'" + if: "matrix.ruby == '3.2'" with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 18a9aeae..b63fe5d9 100755 --- a/README.md +++ b/README.md @@ -397,14 +397,14 @@ Full documentation available on [Rubydoc.info][SPARQL doc] ## Dependencies -* [Ruby](https://ruby-lang.org/) (>= 2.6) -* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.2) -* [SPARQL::Client](https://rubygems.org/gems/sparql-client) (~> 3.1) +* [Ruby](https://ruby-lang.org/) (>= 3.0) +* [RDF.rb](https://rubygems.org/gems/rdf) (~> 3.3) +* [SPARQL::Client](https://rubygems.org/gems/sparql-client) (~> 3.3) * [SXP](https://rubygems.org/gems/sxp) (~> 1.2) * [Builder](https://rubygems.org/gems/builder) (~> 3.2) * [JSON](https://rubygems.org/gems/json) (~> 2.6) -* Soft dependency on [Linked Data][] (>= 3.1) -* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.12) +* Soft dependency on [Linked Data][] (>= 3.3) +* Soft dependency on [Nokogiri](https://rubygems.org/gems/nokogiri) (~> 1.15) Falls back to REXML for XML parsing Builder for XML serializing. Nokogiri is much more efficient * Soft dependency on [Equivalent XML](https://rubygems.org/gems/equivalent-xml) (>= 0.6) Equivalent XML performs more efficient comparisons of XML Literals when Nokogiri is included diff --git a/VERSION b/VERSION index 34cde569..15a27998 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.6 +3.3.0 diff --git a/sparql.gemspec b/sparql.gemspec index 041a0537..8bb45b4c 100755 --- a/sparql.gemspec +++ b/sparql.gemspec @@ -27,21 +27,21 @@ Gem::Specification.new do |gem| gem.executables = %w(sparql) gem.require_paths = %w(lib) - gem.required_ruby_version = '>= 2.6' + gem.required_ruby_version = '>= 3.0' gem.requirements = [] - gem.add_runtime_dependency 'rdf', '~> 3.2', '>= 3.2.11' - gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.2', '>= 3.2.1' - gem.add_runtime_dependency 'ebnf', '~> 2.3', '>= 2.3.5' + gem.add_runtime_dependency 'rdf', '~> 3.3' + gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.3' + gem.add_runtime_dependency 'ebnf', '~> 2.4' gem.add_runtime_dependency 'builder', '~> 3.2', '>= 3.2.4' gem.add_runtime_dependency 'logger', '~> 1.5' gem.add_runtime_dependency 'sxp', '~> 1.2', '>= 1.2.4' gem.add_runtime_dependency 'sparql-client', '~> 3.2', '>= 3.2.2' - gem.add_runtime_dependency 'rdf-xsd', '~> 3.2' + gem.add_runtime_dependency 'rdf-xsd', '~> 3.3' - gem.add_development_dependency 'sinatra', '~> 3.0', '>= 3.0.5' + gem.add_development_dependency 'sinatra', '~> 3.1' gem.add_development_dependency 'rack', '>= 2.2', '< 4' gem.add_development_dependency 'rack-test', '~> 2.1' - gem.add_development_dependency 'rdf-spec', '~> 3.2' + gem.add_development_dependency 'rdf-spec', '~> 3.3' gem.add_development_dependency 'linkeddata', '~> 3.2' gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' From 6f5ee6370791c6bdfd1b7bbec283183904ed0171 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sat, 26 Aug 2023 15:16:46 -0700 Subject: [PATCH 2/4] Fix examples which were fetching from remote repositories. --- README.md | 4 ++-- etc/from_default.rq | 2 +- etc/input.sse | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b63fe5d9..e5ae4491 100755 --- a/README.md +++ b/README.md @@ -308,7 +308,7 @@ a full set of RDF formats. ### Command line processing sparql execute --dataset etc/doap.ttl etc/from_default.rq - sparql execute -e "SELECT * FROM WHERE { ?s ?p ?o }" + sparql execute --dataset etc/doap.ttl -e "SELECT * FROM WHERE { ?s ?p ?o }" # Generate SPARQL Algebra Expression (SSE) format sparql parse etc/input.rq @@ -316,7 +316,7 @@ a full set of RDF formats. # Generate SPARQL Query from SSE sparql parse --sse etc/input.sse --format sparql - sparql parse --sse --format sparql -e "(dataset () (bgp (triple ?s ?p ?o))))" + sparql parse --sse --format sparql -e "(dataset () (bgp (triple ?s ?p ?o))))" # Run query using SSE input sparql execute --dataset etc/doap.ttl --sse etc/input.sse diff --git a/etc/from_default.rq b/etc/from_default.rq index 820aa35f..708e57bd 100644 --- a/etc/from_default.rq +++ b/etc/from_default.rq @@ -1 +1 @@ -SELECT * FROM WHERE { ?s ?p ?o } +SELECT * FROM WHERE { ?s ?p ?o } diff --git a/etc/input.sse b/etc/input.sse index f443d6e8..667113f4 100644 --- a/etc/input.sse +++ b/etc/input.sse @@ -1 +1 @@ -(dataset () (bgp (triple ?s ?p ?o)))) +(dataset () (bgp (triple ?s ?p ?o)))) From d7206d0f0d39d74c380576cd5472a6bf1afddda2 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Sun, 27 Aug 2023 14:00:54 -0700 Subject: [PATCH 3/4] Update dependencies. --- sparql.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sparql.gemspec b/sparql.gemspec index 8bb45b4c..cb7bb4b8 100755 --- a/sparql.gemspec +++ b/sparql.gemspec @@ -34,15 +34,15 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'ebnf', '~> 2.4' gem.add_runtime_dependency 'builder', '~> 3.2', '>= 3.2.4' gem.add_runtime_dependency 'logger', '~> 1.5' - gem.add_runtime_dependency 'sxp', '~> 1.2', '>= 1.2.4' - gem.add_runtime_dependency 'sparql-client', '~> 3.2', '>= 3.2.2' + gem.add_runtime_dependency 'sxp', '~> 1.3' + gem.add_runtime_dependency 'sparql-client', '~> 3.3' gem.add_runtime_dependency 'rdf-xsd', '~> 3.3' gem.add_development_dependency 'sinatra', '~> 3.1' gem.add_development_dependency 'rack', '>= 2.2', '< 4' gem.add_development_dependency 'rack-test', '~> 2.1' gem.add_development_dependency 'rdf-spec', '~> 3.3' - gem.add_development_dependency 'linkeddata', '~> 3.2' + gem.add_development_dependency 'linkeddata' gem.add_development_dependency 'rspec', '~> 3.12' gem.add_development_dependency 'rspec-its', '~> 1.3' gem.add_development_dependency 'yard' , '~> 0.9' From e5c360f9d5a7852184903ac2330e41108a2f80a6 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 28 Aug 2023 12:10:17 -0700 Subject: [PATCH 4/4] Update dependencies. --- Gemfile | 59 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/Gemfile b/Gemfile index 03b450d1..ab4e06e2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,37 +1,40 @@ -source "https://rubygems.org" +source 'https://rubygems.org' gemspec -gem 'ebnf', github: "dryruby/ebnf", branch: "develop" -gem 'rdf', github: "ruby-rdf/rdf", branch: "develop" -gem 'rdf-aggregate-repo', github: "ruby-rdf/rdf-aggregate-repo", branch: "develop" -gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop" -gem 'sparql-client', github: "ruby-rdf/sparql-client", branch: "develop" -gem 'sxp', github: "dryruby/sxp.rb", branch: "develop" +gem 'ebnf', github: 'dryruby/ebnf', branch: 'develop' +gem 'rdf', github: 'ruby-rdf/rdf', branch: 'develop' +gem 'rdf-aggregate-repo', github: 'ruby-rdf/rdf-aggregate-repo', branch: 'develop' +gem 'rdf-xsd', github: 'ruby-rdf/rdf-xsd', branch: 'develop' +gem 'sparql-client', github: 'ruby-rdf/sparql-client', branch: 'develop' +gem 'sxp', github: 'dryruby/sxp.rb', branch: 'develop' group :development do - gem 'json-ld', github: "ruby-rdf/json-ld", branch: "develop" - gem 'json-ld-preloaded',github: "ruby-rdf/json-ld-preloaded", branch: "develop" - gem 'linkeddata', github: "ruby-rdf/linkeddata", branch: "develop" - gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic", branch: "develop" - gem 'rdf-json', github: "ruby-rdf/rdf-json", branch: "develop" - gem 'rdf-microdata', github: "ruby-rdf/rdf-microdata", branch: "develop" - gem 'rdf-n3', github: "ruby-rdf/rdf-n3", branch: "develop" - gem 'rdf-normalize', github: "ruby-rdf/rdf-normalize", branch: "develop" - gem 'rdf-rdfa', github: "ruby-rdf/rdf-rdfa", branch: "develop" - gem 'rdf-reasoner', github: "ruby-rdf/rdf-reasoner", branch: "develop" - gem 'rdf-rdfxml', github: "ruby-rdf/rdf-rdfxml", branch: "develop" - gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop" - gem 'rdf-tabular', github: "ruby-rdf/rdf-tabular", branch: "develop" - gem 'rdf-trig', github: "ruby-rdf/rdf-trig", branch: "develop" - gem 'rdf-trix', github: "ruby-rdf/rdf-trix", branch: "develop" - gem 'rdf-turtle', github: "ruby-rdf/rdf-turtle", branch: "develop" - gem 'rdf-vocab', github: "ruby-rdf/rdf-vocab", branch: "develop" - gem 'ld-patch', github: "ruby-rdf/ld-patch", branch: "develop" - gem 'shex', github: "ruby-rdf/shex", branch: "develop" + gem 'json-ld', github: 'ruby-rdf/json-ld', branch: 'develop' + gem 'json-ld-preloaded',github: 'ruby-rdf/json-ld-preloaded', branch: 'develop' + gem 'ld-patch', github: 'ruby-rdf/ld-patch', branch: 'develop' + gem 'linkeddata', github: 'ruby-rdf/linkeddata', branch: 'develop' + gem 'rdf-hamster-repo', github: 'ruby-rdf/rdf-hamster-repo', branch: 'develop' + gem 'rdf-isomorphic', github: 'ruby-rdf/rdf-isomorphic', branch: 'develop' + gem 'rdf-json', github: 'ruby-rdf/rdf-json', branch: 'develop' + gem 'rdf-microdata', github: 'ruby-rdf/rdf-microdata', branch: 'develop' + gem 'rdf-n3', github: 'ruby-rdf/rdf-n3', branch: 'develop' + gem 'rdf-normalize', github: 'ruby-rdf/rdf-normalize', branch: 'develop' + gem 'rdf-ordered-repo', github: 'ruby-rdf/rdf-ordered-repo', branch: 'develop' + gem 'rdf-rdfa', github: 'ruby-rdf/rdf-rdfa', branch: 'develop' + gem 'rdf-rdfxml', github: 'ruby-rdf/rdf-rdfxml', branch: 'develop' + gem 'rdf-reasoner', github: 'ruby-rdf/rdf-reasoner', branch: 'develop' + gem 'rdf-spec', github: 'ruby-rdf/rdf-spec', branch: 'develop' + gem 'rdf-tabular', github: 'ruby-rdf/rdf-tabular', branch: 'develop' + gem 'rdf-trig', github: 'ruby-rdf/rdf-trig', branch: 'develop' + gem 'rdf-trix', github: 'ruby-rdf/rdf-trix', branch: 'develop' + gem 'rdf-turtle', github: 'ruby-rdf/rdf-turtle', branch: 'develop' + gem 'rdf-vocab', github: 'ruby-rdf/rdf-vocab', branch: 'develop' + gem 'shacl', github: 'ruby-rdf/shacl', branch: 'develop' + gem 'shex', github: 'ruby-rdf/shex', branch: 'develop' gem 'erubis', '>= 2.7.0' gem 'htmlentities', '>= 4.3.4' - gem "equivalent-xml", '>= 0.6.0' + gem 'equivalent-xml', '>= 0.6.0' end group :debug do @@ -44,6 +47,6 @@ end group :test do gem 'rake' - gem 'simplecov', '~> 0.21', platforms: :mri + gem 'simplecov', '~> 0.22', platforms: :mri gem 'simplecov-lcov', '~> 0.8', platforms: :mri end