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

Merge Development branch into master #891

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Merge Development branch into master #891

merged 4 commits into from
Jan 9, 2024

Conversation

Jennit07
Copy link
Collaborator

@Jennit07 Jennit07 commented Jan 9, 2024

Development has completed and we can now merge this into master. We can then create a new branch for the march update and add any new changes onto that branch. This will ensure Master has the most up to date changes.

SwiftySalmon and others added 4 commits October 20, 2023 13:13
A previous pull request changed all capitals to lowercase - however boxi file names have capitals so it was no longer reading in files. This is a fix

Co-authored-by: marjom02 <[email protected]>
Co-authored-by: Jennit07 <[email protected]>
* change get_datazone_pop_path to get_pop_path to allow for more types

* Update documentation

* Style code

---------

Co-authored-by: lizihao-anu <[email protected]>
@Jennit07 Jennit07 requested a review from rchlv January 9, 2024 12:37
Copy link

github-actions bot commented Jan 9, 2024

@check-spelling-bot Report

🔴 Please review

See the 📂 files view, the 📜action log, or 📝 job summary for details.

Unrecognized words (2)

hri
intzone

To accept these unrecognized words as correct, you could 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/7461256057/attempts/1'

OR

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

Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionary

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

Dictionary Entries Covers Uniquely
cspell:swift/src/swift.txt 53 2
cspell:k8s/dict/k8s.txt 153 1 1
cspell:csharp/csharp.txt 32 1
cspell:java/src/java-terms.txt 920 1
cspell:typescript/dict/typescript.txt 1098 1

Consider adding them (in .github/workflows/spelling.yml) for uses: check-spelling/check-spelling@main in its with:

      with:
        extra_dictionaries:
          cspell:swift/src/swift.txt
          cspell:k8s/dict/k8s.txt
          cspell:csharp/csharp.txt
          cspell:java/src/java-terms.txt
          cspell:typescript/dict/typescript.txt

To stop checking additional dictionaries, add (in .github/workflows/spelling.yml) for uses: check-spelling/check-spelling@main in its with:

check_extra_dictionaries: ''
Errors (2)

See the 📂 files view, the 📜action log, or 📝 job summary for details.

❌ Errors Count
❌ ignored-expect-variant 13
ℹ️ no-newline-at-eof 1

See ❌ Event descriptions for more information.

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.

Copy link
Collaborator

@rchlv rchlv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to merge, thank you!

@rchlv rchlv merged commit ada9af1 into master Jan 9, 2024
9 of 23 checks passed
@Jennit07 Jennit07 deleted the development branch March 26, 2024 14:40
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