Skip to content

Commit 1a55d6a

Browse files
authored
Merge branch 'master' into dependabot/maven/org.junit.jupiter-junit-jupiter-engine-5.12.2
2 parents f9f4cdd + bca93eb commit 1a55d6a

File tree

210 files changed

+27630
-3807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+27630
-3807
lines changed

.dockerignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
# This is to ignore all `dwh` dirs; the root one has a lot of test parquet files
1616
# and we also commonly use this directory name for storing pipelines' outputs.
1717
**/dwh/
18-
18+
!dwh/pom.xml
1919
# Ignoring other large directories that are not needed for the docker image.
2020
docker/mysql-build
2121
synthea-hiv/
22+
!synthea-hiv/pom.xml
2223
e2e-tests/
24+
!e2e-tests/pom.xml
2325
**/tmp
2426
**/venv*

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,27 @@ automated e2e/unit tests.
2222
<!--- Put an `x` in the box if you did the task -->
2323
<!--- If you forgot a task please follow the instructions below -->
2424

25-
- [ ] I have read and will follow the [review process](https://github.com/GoogleCloudPlatform/openmrs-fhir-analytics/blob/master/doc/review_process.md).
25+
- [ ] I have read and will follow the
26+
[review process](https://github.com/GoogleCloudPlatform/openmrs-fhir-analytics/blob/master/doc/review_process.md).
2627
- [ ] I am familiar with Google Style Guides for the language I have coded in.
2728

28-
No? Please take some time and review [Java](https://google.github.io/styleguide/javaguide.html) and [Python](https://google.github.io/styleguide/pyguide.html) style guides.
29+
No? Please take some time and review
30+
[Java](https://google.github.io/styleguide/javaguide.html) and
31+
[Python](https://google.github.io/styleguide/pyguide.html) style guides.
2932

30-
- [ ] My IDE is configured to follow the Google [**code styles**](https://google.github.io/styleguide/).
33+
- [ ] My IDE is configured to follow the Google
34+
[**code styles**](https://google.github.io/styleguide/).
3135

32-
No? Unsure? -> [configure your IDE](https://github.com/google/google-java-format).
36+
No? Unsure? ->
37+
[configure your IDE](https://github.com/google/google-java-format).
3338

34-
- [ ] I have **added tests** to cover my changes. (If you refactored existing code that was well tested you do not have to add tests)
35-
- [ ] I ran `mvn clean package` right before creating this pull request and added all formatting changes to my commit.
39+
- [ ] I have **added tests** to cover my changes. (If you refactored existing
40+
code that was well tested you do not have to add tests)
41+
- [ ] I ran `mvn clean package` right before creating this pull request and
42+
added all formatting changes to my commit.
43+
- [ ] If I made any Python code changes, I ran `black .`, `pylint .` and
44+
`pyright` . right before creating this pull request and added all
45+
formatting changes to my commit.
3646
- [ ] All new and existing **tests passed**.
3747
- [ ] My pull request is **based on the latest changes** of the master branch.
3848

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ nb-configuration.xml
9292
.ipynb_checkpoints/
9393
**.pyc
9494
**__pycache__**
95+
*.egg-info/
9596
##############################
9697
## Data-warehouse files.
9798
##############################
9899
docker/dwh/**
100+
e2e-tests/controller-spark/dwh/**

0 commit comments

Comments
 (0)