tnql 1.0.3 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +2 -0
- data/.github/workflows/lint.yml +23 -0
- data/.github/workflows/test.yml +71 -0
- data/CHANGELOG.md +22 -0
- data/README.md +1 -1
- data/code_safety.yml +22 -18
- data/gemfiles/{Gemfile.rails42 → Gemfile.rails60} +1 -1
- data/lib/tnql/version.rb +1 -1
- data/tnql.gemspec +3 -3
- metadata +13 -17
- data/gemfiles/Gemfile.rails50 +0 -5
- data/gemfiles/Gemfile.rails51 +0 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5e85b569fef0cbd1ba25ceeea0a548eb818e7962f332302319a5a672745a4bbf
|
|
4
|
+
data.tar.gz: 06f4321bceb7fd86941687856b34d4172adc2ffdb6a0c81f91d53f7412b0a01f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ad05b2df59958f3c1725efd06394e27920c1f1618e77fb971003c18e77301cd0f1cafd099abbe18f1a1fc7abff227d030894d8511c2b9282488fc211edfb619c
|
|
7
|
+
data.tar.gz: aa8072f958a046b342cc045f9d17d7743c09a164b3879c7bc1d5bac5c61dfad5a9bf6286f5b54b04002cb32cf9be296f442bc1b63a3eb13783685873407400dd
|
data/.github/CODEOWNERS
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
name: Lint
|
|
2
|
+
|
|
3
|
+
on: [pull_request]
|
|
4
|
+
|
|
5
|
+
jobs:
|
|
6
|
+
rubocop:
|
|
7
|
+
name: RuboCop
|
|
8
|
+
|
|
9
|
+
runs-on: ubuntu-latest
|
|
10
|
+
|
|
11
|
+
steps:
|
|
12
|
+
- uses: actions/checkout@v2
|
|
13
|
+
with:
|
|
14
|
+
fetch-depth: 0 # fetch everything
|
|
15
|
+
- name: Set up Ruby
|
|
16
|
+
uses: ruby/setup-ruby@v1
|
|
17
|
+
with:
|
|
18
|
+
ruby-version: 3.0
|
|
19
|
+
- name: Install dependencies
|
|
20
|
+
run: bundle install
|
|
21
|
+
- name: Run RuboCop against BASE..HEAD changes
|
|
22
|
+
run: bundle exec rake rubocop:diff origin/${GITHUB_BASE_REF#*/}
|
|
23
|
+
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
name: Test
|
|
2
|
+
|
|
3
|
+
on: [push]
|
|
4
|
+
|
|
5
|
+
jobs:
|
|
6
|
+
test:
|
|
7
|
+
strategy:
|
|
8
|
+
matrix:
|
|
9
|
+
ruby-version:
|
|
10
|
+
- 2.6
|
|
11
|
+
- 2.7
|
|
12
|
+
- 3.0
|
|
13
|
+
gemfile:
|
|
14
|
+
- gemfiles/Gemfile.rails52
|
|
15
|
+
- gemfiles/Gemfile.rails60
|
|
16
|
+
|
|
17
|
+
name: Ruby ${{ matrix.ruby-version }} / Bundle ${{ matrix.gemfile }}
|
|
18
|
+
|
|
19
|
+
runs-on: ubuntu-latest
|
|
20
|
+
|
|
21
|
+
env:
|
|
22
|
+
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
|
|
23
|
+
|
|
24
|
+
steps:
|
|
25
|
+
- uses: actions/checkout@v2
|
|
26
|
+
- name: Set up Ruby
|
|
27
|
+
uses: ruby/setup-ruby@v1
|
|
28
|
+
with:
|
|
29
|
+
ruby-version: ${{ matrix.ruby-version }}
|
|
30
|
+
- name: Install dependencies
|
|
31
|
+
run: bundle install
|
|
32
|
+
- name: Run tests
|
|
33
|
+
run: bundle exec rake
|
|
34
|
+
|
|
35
|
+
# A utility job upon which Branch Protection can depend,
|
|
36
|
+
# thus remaining agnostic of the matrix.
|
|
37
|
+
test_matrix:
|
|
38
|
+
if: ${{ always() }}
|
|
39
|
+
runs-on: ubuntu-latest
|
|
40
|
+
name: Matrix
|
|
41
|
+
needs: test
|
|
42
|
+
steps:
|
|
43
|
+
- name: Check build matrix status
|
|
44
|
+
if: ${{ needs.test.result != 'success' }}
|
|
45
|
+
run: exit 1
|
|
46
|
+
|
|
47
|
+
notify:
|
|
48
|
+
# Run only on master, but regardless of whether tests past:
|
|
49
|
+
if: ${{ always() && github.ref == 'refs/heads/master' }}
|
|
50
|
+
|
|
51
|
+
needs: test_matrix
|
|
52
|
+
|
|
53
|
+
runs-on: ubuntu-latest
|
|
54
|
+
|
|
55
|
+
steps:
|
|
56
|
+
- uses: 8398a7/action-slack@v3
|
|
57
|
+
with:
|
|
58
|
+
status: custom
|
|
59
|
+
fields: workflow,commit,author
|
|
60
|
+
custom_payload: |
|
|
61
|
+
{
|
|
62
|
+
channel: 'C7FQWGDHP',
|
|
63
|
+
username: 'CI – ' + '${{ github.repository }}'.split('/')[1],
|
|
64
|
+
icon_emoji: ':hammer_and_wrench:',
|
|
65
|
+
attachments: [{
|
|
66
|
+
color: '${{ needs.test_matrix.result }}' === 'success' ? 'good' : '${{ needs.test_matrix.result }}' === 'failure' ? 'danger' : 'warning',
|
|
67
|
+
text: `${process.env.AS_WORKFLOW} against \`${{ github.ref }}\` (${process.env.AS_COMMIT}) for ${{ github.actor }} resulted in *${{ needs.test_matrix.result }}*.`
|
|
68
|
+
}]
|
|
69
|
+
}
|
|
70
|
+
env:
|
|
71
|
+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
|
data/CHANGELOG.md
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
## [Unreleased]
|
|
2
|
+
*no unreleased changes*
|
|
3
|
+
|
|
4
|
+
## 1.0.4 / 2021-01-29
|
|
5
|
+
### Fixed
|
|
6
|
+
* Compatibility with Rails 6
|
|
7
|
+
|
|
8
|
+
## 1.0.3 / 2019-10-29
|
|
9
|
+
### Fixed
|
|
10
|
+
* Relax `chronic` dependency
|
|
11
|
+
|
|
12
|
+
## 1.0.2 / 2019-07-09
|
|
13
|
+
### Fixed
|
|
14
|
+
* Rails 5.2 support
|
|
15
|
+
|
|
16
|
+
## 1.0.1 / 2018-07-06
|
|
17
|
+
### Fixed
|
|
18
|
+
* Rails 5.1 support
|
|
19
|
+
|
|
20
|
+
## 1.0.0 / 2017-05-25
|
|
21
|
+
### Added
|
|
22
|
+
* Public release
|
data/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# TNQL [](https://github.com/publichealthengland/tnql/actions?query=workflow%3Atest) [](https://rubygems.org/gems/tnql)
|
|
2
2
|
|
|
3
3
|
Tumour Natural Query Language (TNQL) is a [Treetop](http://treetop.rubyforge.org/) driven Domain Specific Language (DSL) used by the Public Health England (PHE) National Cancer Registration and Analysis Service (NCRAS) to identify cohorts of tumours.
|
|
4
4
|
|
data/code_safety.yml
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
---
|
|
2
2
|
file safety:
|
|
3
|
+
".github/CODEOWNERS":
|
|
4
|
+
comments:
|
|
5
|
+
reviewed_by: josh.pencheon
|
|
6
|
+
safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
|
|
7
|
+
".github/workflows/lint.yml":
|
|
8
|
+
comments:
|
|
9
|
+
reviewed_by: josh.pencheon
|
|
10
|
+
safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
|
|
11
|
+
".github/workflows/test.yml":
|
|
12
|
+
comments:
|
|
13
|
+
reviewed_by: josh.pencheon
|
|
14
|
+
safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
|
|
3
15
|
".gitignore":
|
|
4
16
|
comments:
|
|
5
17
|
reviewed_by: josh.pencheon
|
|
@@ -12,10 +24,10 @@ file safety:
|
|
|
12
24
|
comments:
|
|
13
25
|
reviewed_by: timgentry
|
|
14
26
|
safe_revision: b85a30c6fd89eddc6597323f7afe7ea2859ae9ac
|
|
15
|
-
|
|
27
|
+
CHANGELOG.md:
|
|
16
28
|
comments:
|
|
17
29
|
reviewed_by: josh.pencheon
|
|
18
|
-
safe_revision:
|
|
30
|
+
safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
|
|
19
31
|
CODE_OF_CONDUCT.md:
|
|
20
32
|
comments:
|
|
21
33
|
reviewed_by: timgentry
|
|
@@ -34,8 +46,8 @@ file safety:
|
|
|
34
46
|
safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
|
|
35
47
|
README.md:
|
|
36
48
|
comments:
|
|
37
|
-
reviewed_by:
|
|
38
|
-
safe_revision:
|
|
49
|
+
reviewed_by: josh.pencheon
|
|
50
|
+
safe_revision: b2ac2de6856884bdb1e0cb369b02d30c1fd64166
|
|
39
51
|
Rakefile:
|
|
40
52
|
comments:
|
|
41
53
|
reviewed_by: timgentry
|
|
@@ -48,22 +60,14 @@ file safety:
|
|
|
48
60
|
comments:
|
|
49
61
|
reviewed_by: timgentry
|
|
50
62
|
safe_revision: 065dcccb9db71374cea5aad104657a5c1f877d1c
|
|
51
|
-
gemfiles/Gemfile.rails42:
|
|
52
|
-
comments:
|
|
53
|
-
reviewed_by: josh.pencheon
|
|
54
|
-
safe_revision: fbc1cf349a296e3489e4b27b4de6c52222113926
|
|
55
|
-
gemfiles/Gemfile.rails50:
|
|
56
|
-
comments:
|
|
57
|
-
reviewed_by: josh.pencheon
|
|
58
|
-
safe_revision: fbc1cf349a296e3489e4b27b4de6c52222113926
|
|
59
|
-
gemfiles/Gemfile.rails51:
|
|
60
|
-
comments:
|
|
61
|
-
reviewed_by: josh.pencheon
|
|
62
|
-
safe_revision: fbc1cf349a296e3489e4b27b4de6c52222113926
|
|
63
63
|
gemfiles/Gemfile.rails52:
|
|
64
64
|
comments:
|
|
65
65
|
reviewed_by: josh.pencheon
|
|
66
66
|
safe_revision: 3316c8246806653c6ae3f50864b710dd76a064b3
|
|
67
|
+
gemfiles/Gemfile.rails60:
|
|
68
|
+
comments:
|
|
69
|
+
reviewed_by: josh.pencheon
|
|
70
|
+
safe_revision: 8f52c0cbddb974f10eb4f8c3de06038aa95e3429
|
|
67
71
|
lib/tnql.rb:
|
|
68
72
|
comments:
|
|
69
73
|
reviewed_by: timgentry
|
|
@@ -217,7 +221,7 @@ file safety:
|
|
|
217
221
|
lib/tnql/version.rb:
|
|
218
222
|
comments:
|
|
219
223
|
reviewed_by: josh.pencheon
|
|
220
|
-
safe_revision:
|
|
224
|
+
safe_revision: 745de7ab45ca525e2eecd53c4c6b55152f33039e
|
|
221
225
|
test/nodes/age_test.rb:
|
|
222
226
|
comments:
|
|
223
227
|
reviewed_by: timgentry
|
|
@@ -285,4 +289,4 @@ file safety:
|
|
|
285
289
|
tnql.gemspec:
|
|
286
290
|
comments:
|
|
287
291
|
reviewed_by: josh.pencheon
|
|
288
|
-
safe_revision:
|
|
292
|
+
safe_revision: a669dac8f97b3e0675b8c4b2e9e891705566f039
|
data/lib/tnql/version.rb
CHANGED
data/tnql.gemspec
CHANGED
|
@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
|
|
|
22
22
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
|
23
23
|
spec.require_paths = ['lib']
|
|
24
24
|
|
|
25
|
-
spec.required_ruby_version = '>= 2.
|
|
25
|
+
spec.required_ruby_version = '>= 2.6'
|
|
26
26
|
|
|
27
|
-
spec.add_dependency 'activesupport', '>= 3.2.18', '<
|
|
27
|
+
spec.add_dependency 'activesupport', '>= 3.2.18', '< 7'
|
|
28
28
|
spec.add_dependency 'ndr_support', '>= 3.0', '< 6'
|
|
29
29
|
spec.add_dependency 'treetop', '>= 1.4.10'
|
|
30
30
|
spec.add_dependency 'chronic', '~> 0.3'
|
|
31
31
|
|
|
32
|
-
spec.add_development_dependency 'ndr_dev_support', '~>
|
|
32
|
+
spec.add_development_dependency 'ndr_dev_support', '~> 5.9'
|
|
33
33
|
spec.add_development_dependency 'bundler'
|
|
34
34
|
spec.add_development_dependency 'rake'
|
|
35
35
|
spec.add_development_dependency 'minitest', '>= 5.0.0'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tnql
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- PHE NDR IT Development Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2021-01-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -19,7 +19,7 @@ dependencies:
|
|
|
19
19
|
version: 3.2.18
|
|
20
20
|
- - "<"
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: '
|
|
22
|
+
version: '7'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -29,7 +29,7 @@ dependencies:
|
|
|
29
29
|
version: 3.2.18
|
|
30
30
|
- - "<"
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: '
|
|
32
|
+
version: '7'
|
|
33
33
|
- !ruby/object:Gem::Dependency
|
|
34
34
|
name: ndr_support
|
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -84,20 +84,14 @@ dependencies:
|
|
|
84
84
|
requirements:
|
|
85
85
|
- - "~>"
|
|
86
86
|
- !ruby/object:Gem::Version
|
|
87
|
-
version: '
|
|
88
|
-
- - ">="
|
|
89
|
-
- !ruby/object:Gem::Version
|
|
90
|
-
version: 3.1.3
|
|
87
|
+
version: '5.9'
|
|
91
88
|
type: :development
|
|
92
89
|
prerelease: false
|
|
93
90
|
version_requirements: !ruby/object:Gem::Requirement
|
|
94
91
|
requirements:
|
|
95
92
|
- - "~>"
|
|
96
93
|
- !ruby/object:Gem::Version
|
|
97
|
-
version: '
|
|
98
|
-
- - ">="
|
|
99
|
-
- !ruby/object:Gem::Version
|
|
100
|
-
version: 3.1.3
|
|
94
|
+
version: '5.9'
|
|
101
95
|
- !ruby/object:Gem::Dependency
|
|
102
96
|
name: bundler
|
|
103
97
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -216,9 +210,13 @@ executables: []
|
|
|
216
210
|
extensions: []
|
|
217
211
|
extra_rdoc_files: []
|
|
218
212
|
files:
|
|
213
|
+
- ".github/CODEOWNERS"
|
|
214
|
+
- ".github/workflows/lint.yml"
|
|
215
|
+
- ".github/workflows/test.yml"
|
|
219
216
|
- ".gitignore"
|
|
220
217
|
- ".hound.yml"
|
|
221
218
|
- ".rubocop.yml"
|
|
219
|
+
- CHANGELOG.md
|
|
222
220
|
- CODE_OF_CONDUCT.md
|
|
223
221
|
- Gemfile
|
|
224
222
|
- Guardfile
|
|
@@ -228,10 +226,8 @@ files:
|
|
|
228
226
|
- bin/console
|
|
229
227
|
- bin/setup
|
|
230
228
|
- code_safety.yml
|
|
231
|
-
- gemfiles/Gemfile.rails42
|
|
232
|
-
- gemfiles/Gemfile.rails50
|
|
233
|
-
- gemfiles/Gemfile.rails51
|
|
234
229
|
- gemfiles/Gemfile.rails52
|
|
230
|
+
- gemfiles/Gemfile.rails60
|
|
235
231
|
- lib/tnql.rb
|
|
236
232
|
- lib/tnql/constants.rb
|
|
237
233
|
- lib/tnql/grammars.rb
|
|
@@ -280,14 +276,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
280
276
|
requirements:
|
|
281
277
|
- - ">="
|
|
282
278
|
- !ruby/object:Gem::Version
|
|
283
|
-
version: 2.
|
|
279
|
+
version: '2.6'
|
|
284
280
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
285
281
|
requirements:
|
|
286
282
|
- - ">="
|
|
287
283
|
- !ruby/object:Gem::Version
|
|
288
284
|
version: '0'
|
|
289
285
|
requirements: []
|
|
290
|
-
rubygems_version: 3.
|
|
286
|
+
rubygems_version: 3.1.4
|
|
291
287
|
signing_key:
|
|
292
288
|
specification_version: 4
|
|
293
289
|
summary: Tumour Natural Query Language
|
data/gemfiles/Gemfile.rails50
DELETED