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.

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

Bonnie version merge #72

Merged
merged 15 commits into from
Feb 6, 2020
Merged

Bonnie version merge #72

merged 15 commits into from
Feb 6, 2020

Conversation

lmd59
Copy link
Contributor

@lmd59 lmd59 commented Jan 15, 2020

Pull request pulls in all changes from bonnie_version to ensure these changes can be released from master. This also discards changes on master that upgrade cqm-parsers to use Rails 5.2 (including dependency changes and required code changes). The Rails upgrade changes will be added to master again for later versions of cqm-parsers.

Pull requests into cqm-parsers require the following. Submitter and reviewer should ✅ when done. For items that are not-applicable, note it's not-applicable ("N/A") and ✅.

Submitter:

  • This pull request describes why these changes were made.
  • Internal ticket for this PR: https://jira.mitre.org/browse/CYPRESS-632
  • Internal ticket links to this PR
  • Code diff has been done and been reviewed
  • Tests are included and test edge cases
  • Tests have been run locally and pass

Reviewer 1:

Name: David Czulada

  • Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
  • The tests appropriately test the new code, including edge cases
  • You have tried to break the code

Reviewer 2:

Name: (Semantic Bits)

  • Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
  • The tests appropriately test the new code, including edge cases
  • You have tried to break the code

hossenlopp and others added 14 commits April 25, 2019 09:59
…rk from master. (#39)

* Fixed SDC loading to work with newer DRC measures.
 - Fixed issues with most data criteria getting thrown out.

* Bring over dependabot nokogiri update and the simplexml_parser removal from #30.
[Security] Update nokogiri requirement from ~> 1.8.5 to >= 1.8.5, < 1.11.0
Updates the requirements on [nokogiri](https://github.com/sparklemotion/nokogiri) to permit the latest version.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.8.5...v1.10.3)

* Add the hqmf identifier to a statement reference (#25)
* 2019 standards update entry point fix (#54)
* fixed gem entry point file to be named properly
* fix issue with loading api uploaded files (#55)
* [Security] Bump nokogiri from 1.10.3 to 1.10.4
* Bump cqm-models version to 3.0.0
…1.0 (#67)

* [Security] Update rubyzip requirement from ~> 1.2.2 to >= 1.2.2, < 2.1.0

Updates the requirements on [rubyzip](https://github.com/rubyzip/rubyzip) to permit the latest version.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](rubyzip/rubyzip@v1.2.3...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Updated rubyzip dependency to be less than version 2.x, which requires ruby 2.4
* Updated version of bonnie_version cqm-parser branch

* Updated cqm-parser (binnie_viersion branch)
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	cqm-parsers.gemspec
#	lib/hqmf-parser/cql/document_helpers/doc_population_helper.rb
#	lib/measure-loader/source_data_criteria_loader.rb
#	test/unit/measure-loader/cql_loader_test.rb
@codecov-io
Copy link

codecov-io commented Jan 15, 2020

Codecov Report

Merging #72 into master will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master     #72      +/-   ##
=========================================
+ Coverage   82.37%   82.4%   +0.02%     
=========================================
  Files          69      69              
  Lines        4313    4320       +7     
=========================================
+ Hits         3553    3560       +7     
  Misses        760     760
Impacted Files Coverage Δ
lib/cqm-parsers.rb 100% <ø> (ø)
lib/measure-loader/source_data_criteria_loader.rb 100% <100%> (ø) ⬆️
lib/util/vsac_api.rb 98.07% <100%> (ø) ⬆️
...rser/cql/document_helpers/doc_population_helper.rb 98.86% <100%> (+0.01%) ⬆️
lib/measure-loader/mat_measure_files.rb 95.34% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f1a0de...e172a9c. Read the comment docs.

@lmd59 lmd59 changed the title (WIP) Test bonnie version merge Bonnie version merge Jan 16, 2020
@lmd59 lmd59 requested a review from dczulada January 16, 2020 16:17
@dczulada dczulada merged commit fd4d124 into master Feb 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants