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

WIP - Merge Development to master (or other) #766

Closed
wants to merge 23 commits into from
Closed

Conversation

Moohan
Copy link
Member

@Moohan Moohan commented Jul 28, 2023

Just opening this Draft PR to make clear the changes that have been added to development.

Moohan and others added 2 commits July 28, 2023 11:44
The new version is needed to read the SLFs now. We use this in `get_existing_data_for_tests()`
* remove unnecessary code from `get_anon_chi`

`get_anon_chi` was updated in slfhelper v0.10

* [check-spelling] Update metadata

Update for https://github.com/Public-Health-Scotland/source-linkage-files/actions/runs/5669528966/attempts/1
Accepted in #759 (comment)

Signed-off-by: check-spelling-bot <[email protected]>

---------

Signed-off-by: check-spelling-bot <[email protected]>
Co-authored-by: marjom02 <[email protected]>
Co-authored-by: Megan McNicol <[email protected]>
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

* Correct some documentation

This resolves a build warning.

* Style code

---------

Co-authored-by: Moohan <[email protected]>
@github-actions

This comment has been minimized.

Lots of layout changes, as well as lots of implicit to explicit integer / double changes.
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

* Format postcode into `pc7` format

* Style code

* Style code

* Update documentation

* Update comment in R/process_extract_ae.R

* Implement catch-all for PC7 format

---------

Co-authored-by: Jennit07 <[email protected]>
Co-authored-by: James McMahon <[email protected]>
Co-authored-by: Moohan <[email protected]>
@github-actions

This comment has been minimized.

* Remove some obsolete code

Renaming and removing some functions.

* Style code

---------

Co-authored-by: Moohan <[email protected]>
Co-authored-by: Zihao Li <[email protected]>
@github-actions

This comment has been minimized.

* Simplify `create_hscp_test_flags`

* Update documentation

* Style code

* simplify `create_hb_test_flags`

* implement hscp test flags into tests

* Simplify `create_demog_test_flags`

---------

Co-authored-by: James McMahon <[email protected]>
Co-authored-by: Moohan <[email protected]>
@github-actions

This comment has been minimized.

* updated code from case_when to case_match as it's a bit easier to read

* Style code

* changed some more `case_when` to `case_match`

* Style code

* [check-spelling] Update metadata

Update for https://github.com/Public-Health-Scotland/source-linkage-files/actions/runs/5752014211/attempts/1
Accepted in #780 (comment)

Signed-off-by: check-spelling-bot <[email protected]>

* Add tests for `convert_sending_location_to_lca`

---------

Signed-off-by: check-spelling-bot <[email protected]>
Co-authored-by: marjom02 <[email protected]>
Co-authored-by: SwiftySalmon <[email protected]>
Co-authored-by: James McMahon <[email protected]>
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

In processed extract variable is called hscp, and in final SLF it's called hscp2018.

Fixed with nested if statement

Co-authored-by: marjom02 <[email protected]>
@github-actions

This comment has been minimized.

Tiny error and a simple fix.

Co-authored-by: Jennit07 <[email protected]>
@github-actions

This comment has been minimized.

Jennit07 and others added 6 commits August 14, 2023 10:19
* fix duplicated matches in chi in sc data.

* Update R/create_individual_file.R

* update on join_sc_client

* Create a test checking if individual files have duplicated chi

* add duplicated chi number to the tests in process_tests_individual_file

---------

Co-authored-by: lizihao-anu <[email protected]>
Co-authored-by: James McMahon <[email protected]>
Update `check_year_valid` for NSUs
…785)

* Update `get_boxi_extract_path` for DN/CMH data

* Remove extra function

* [check-spelling] Update metadata

Update for https://github.com/Public-Health-Scotland/source-linkage-files/actions/runs/5856792420/attempts/1
Accepted in #785 (comment)

Signed-off-by: check-spelling-bot <[email protected]>

---------

Signed-off-by: check-spelling-bot <[email protected]>
Co-authored-by: Jennit07 <[email protected]>
Co-authored-by: James McMahon <[email protected]>
* further obsolete code change

* fix the preventable_beddays

Co-authored-by: James McMahon <[email protected]>

---------

Co-authored-by: James McMahon <[email protected]>
Co-authored-by: Jennit07 <[email protected]>
@github-actions
Copy link

github-actions bot commented Aug 14, 2023

@check-spelling-bot Report

🔴 Please review

See the 📂 files view or the 📜action log for details.

Unrecognized words (25)
atrialfib
chd
consulations
copd
cvd
dotdash
Drugsand
dvprod
gls
hefailure
hhg
hiw
knitr
linetype
lintr
nrs
parkinsons
Physicaland
PLICS
rdname
refailure
SCTASK
sourcedev
sparra
telecare
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the [email protected]:Public-Health-Scotland/source-linkage-files.git repository
on the development branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/main/apply.pl' |
perl - 'https://github.com/Public-Health-Scotland/source-linkage-files/actions/runs/5856952216/attempts/1'

To have the bot do this for you, reply quoting the following line:
@check-spelling-bot apply updates.

Available 📚 dictionaries could cover words not in the 📘 dictionary

This includes both expected items (219) from .github/actions/spelling/expect.txt and unrecognized words (25)

Dictionary Entries Covers
cspell:swift/src/swift.txt 205 1
cspell:sql/src/tsql.txt 455 1
cspell:python/src/python/python.txt 453 1
cspell:python/src/python/python-lib.txt 3873 1
cspell:npm/npm.txt 288 1
cspell:lorem-ipsum/dictionary.txt 240 1
cspell:latex/latex.txt 424 1
cspell:html/html.txt 1863 1
cspell:fullstack/fullstack.txt 390 1
cspell:filetypes/filetypes.txt 264 1

Consider adding them using (in .github/workflows/spelling.yml):

      with:
        extra_dictionaries:
          cspell:swift/src/swift.txt
          cspell:sql/src/tsql.txt
          cspell:python/src/python/python.txt
          cspell:python/src/python/python-lib.txt
          cspell:npm/npm.txt
          cspell:lorem-ipsum/dictionary.txt
          cspell:latex/latex.txt
          cspell:html/html.txt
          cspell:fullstack/fullstack.txt
          cspell:filetypes/filetypes.txt

To stop checking additional dictionaries, add:

      with:
        check_extra_dictionaries: ''
If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

@Jennit07
Copy link
Collaborator

This can be deleted and a new one open for merging sept update into master

@Jennit07 Jennit07 closed this Aug 15, 2023
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.

4 participants