Skip to content

Commit

Permalink
Finish 3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gkellogg committed Mar 6, 2021
2 parents 0c86e8e + 27a2ca0 commit ee980e1
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 28 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
@@ -0,0 +1 @@
repo_token: Yru5qnQnb3gwAJQk2jg83tkdo1LBkiWu1
44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,44 @@
# This workflow runs continuous CI across different versions of ruby on all branches and pull requests to develop.

name: CI
on:
push:
branches: [ '**' ]
pull_request:
branches: [ develop ]
workflow_dispatch:

jobs:
tests:
name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
if: "contains(github.event.commits[0].message, '[ci skip]') == false"
runs-on: ubuntu-latest
env:
CI: true
BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
strategy:
fail-fast: false
matrix:
ruby:
- 2.4
- 2.5
- 2.6
- 2.7
- 3.0
- ruby-head # Until net-http-persistent updated
#- jruby # No Nokogumbo on JRuby
gemfile:
- Gemfile
- Gemfile-pure
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Install dependencies
run: bundle install --jobs 4 --retry 3
- name: Run tests
run: bundle exec rspec spec

2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -10,10 +10,12 @@ rvm:
- 2.5
- 2.6
- 2.7
- ruby-head
- jruby
cache: bundler
sudo: false
matrix:
allow_failures:
- rvm: jruby
- rvm: ruby-head
dist: trusty
8 changes: 5 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -28,9 +28,11 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to manage devel
enough, be assured we will eventually add you in there.
* Do note that in order for us to merge any non-trivial changes (as a rule
of thumb, additions larger than about 15 lines of code), we need an
explicit [public domain dedication][PDD] on record from you.
explicit [public domain dedication][PDD] on record from you,
which you will be asked to agree to on the first commit to a repo within the organization.
Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.

[YARD]: https://yardoc.org/
[YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
[pr]: https://github.com/ruby-rdf/rdf-rdfa/compare/
[PDD]: https://unlicense.org/#unlicensing-contributions
[pr]: https://github.com/ruby-rdf/rdf/compare/
7 changes: 3 additions & 4 deletions Gemfile
Expand Up @@ -5,8 +5,8 @@ gemspec
gem "rdf", github: "ruby-rdf/rdf", branch: "develop"
gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop"
gem "rdf-xsd", github: "ruby-rdf/rdf-xsd", branch: "develop"
gem "nokogiri", '~> 1.8'
gem "nokogumbo", '~> 2.0'
gem "nokogiri", '~> 1.10', platforms: [:mri, :jruby]
gem "nokogumbo", '~> 2.0', platforms: :mri
gem 'equivalent-xml', '~> 0.5'

group :development, :test do
Expand All @@ -25,9 +25,8 @@ group :development, :test do
end

group :test do
gem 'simplecov', platforms: :mri
gem 'simplecov', '~> 0.16', platforms: :mri
gem 'coveralls', '~> 0.8', platforms: :mri
gem 'psych', platforms: [:mri, :rbx]
end

group :debug do
Expand Down
9 changes: 0 additions & 9 deletions Gemfile-pure
Expand Up @@ -20,15 +20,6 @@ group :development, :test do
gem 'sparql', github: "ruby-rdf/sparql", branch: "develop"
gem 'sparql-client', github: "ruby-rdf/sparql-client", branch: "develop"
gem 'sxp', github: "dryruby/sxp.rb", branch: "develop"

# Until version >= 3.4.2 with support for Ruby 2.6
gem "webmock", git: "https://github.com/bblimke/webmock"
end

group :test do
gem 'simplecov', require: false
gem 'coveralls', require: false
gem 'psych', platforms: [:mri, :rbx]
end

group :debug do
Expand Down
12 changes: 7 additions & 5 deletions README.md
@@ -1,11 +1,11 @@
This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
# RDF::RDFa reader/writer

[RDFa][RDFa 1.1 Core] parser for RDF.rb.

[![Gem Version](https://badge.fury.io/rb/rdf-rdfa.png)](https://badge.fury.io/rb/rdf-rdfa)
[![Build Status](https://travis-ci.org/ruby-rdf/rdf-rdfa.png?branch=master)](https://travis-ci.org/ruby-rdf/rdf-rdfa)
[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg)](https://coveralls.io/r/ruby-rdf/rdf-rdfa)
[![Build Status](https://github.com/ruby-rdf/rdf-rdfa/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/rdf-rdfa/actions?query=workflow%3ACI)
[![Coverage Status](https://coveralls.io/repos/ruby-rdf/rdf-rdfa/badge.svg?branch=develop)](https://coveralls.io/github/ruby-rdf/rdf-rdfa?branch=develop)
[![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)

## DESCRIPTION
RDF::RDFa is an RDFa reader and writer for Ruby using the [RDF.rb][RDF.rb] library suite.
Expand Down Expand Up @@ -448,7 +448,9 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
list in the the `README`. Alphabetical order applies.
* Do note that in order for us to merge any non-trivial changes (as a rule
of thumb, additions larger than about 15 lines of code), we need an
explicit [public domain dedication][PDD] on record from you.
explicit [public domain dedication][PDD] on record from you,
which you will be asked to agree to on the first commit to a repo within the organization.
Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.

## License

Expand All @@ -465,7 +467,7 @@ see <https://unlicense.org/> or the accompanying [UNLICENSE](UNLICENSE) file.
[RDF.rb]: https://rubygems.org/gems/rdf
[YARD]: https://yardoc.org/
[YARD-GS]: https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
[PDD]: https://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
[PDD]: https://unlicense.org/#unlicensing-contributions
[RDFa 1.1 Core]: https://www.w3.org/TR/2012/REC-rdfa-core-20120607/ "RDFa 1.1 Core"
[RDFa Lite 1.1]: https://www.w3.org/TR/2012/REC-rdfa-lite-20120607/ "RDFa Lite 1.1"
[XHTML+RDFa 1.1]: https://www.w3.org/TR/2012/REC-xhtml-rdfa-20120607/ "XHTML+RDFa 1.1"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
3.1.2
3.1.3
11 changes: 5 additions & 6 deletions rdf-rdfa.gemspec
Expand Up @@ -21,24 +21,23 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = '>= 2.4'
gem.requirements = []

gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.2'
gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.5'
gem.add_runtime_dependency 'haml', '~> 5.1'
gem.add_runtime_dependency 'rdf', '~> 3.1', '>= 3.1.13'
gem.add_runtime_dependency 'rdf-vocab', '~> 3.1', '>= 3.1.11'
gem.add_runtime_dependency 'haml', '~> 5.2'
gem.add_runtime_dependency 'rdf-xsd', '~> 3.1'
gem.add_runtime_dependency 'rdf-aggregate-repo', '~> 3.1'
gem.add_runtime_dependency 'htmlentities', '~> 4.3'

gem.add_development_dependency 'json-ld', '~> 3.1'
gem.add_development_dependency 'rspec', '~> 3.9'
gem.add_development_dependency 'rspec', '~> 3.10'
gem.add_development_dependency 'rspec-its', '~> 1.3'
gem.add_development_dependency 'rdf-spec', '~> 3.1'
gem.add_development_dependency 'rdf-turtle', '~> 3.1'
gem.add_development_dependency 'rdf-vocab', '~> 3.1'
gem.add_development_dependency 'rdf-isomorphic', '~> 3.1'
gem.add_development_dependency 'rdf-tabular', '~> 3.1'
gem.add_development_dependency 'rdf-rdfxml', '~> 3.1'
gem.add_development_dependency 'sparql', '~> 3.1'
gem.add_development_dependency 'yard' , '~> 0.9.20'
gem.add_development_dependency 'yard' , '~> 0.9'

gem.post_install_message = nil
end
Expand Down

0 comments on commit ee980e1

Please sign in to comment.