Skip to content

Commit 8df6ab4

Browse files
authored
Merge branch 'main' into 175-jb-1
2 parents c3b09c1 + dd6f466 commit 8df6ab4

19 files changed

Lines changed: 3302 additions & 2643 deletions

.github/linters/.jscpd.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"threshold": 7
2+
"threshold": 14,
3+
"ignore": [
4+
"**/g2_tools/**",
5+
"**/sz_tools/**"
6+
]
37
}

.github/workflows/pytest-darwin.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: pytest darwin
22

3-
on: [pull_request, workflow_dispatch]
3+
on:
4+
pull_request:
5+
branches: [main]
6+
schedule:
7+
- cron: "15 7 * * *"
8+
workflow_dispatch:
49

510
env:
611
DYLD_LIBRARY_PATH: /opt/senzing/er/lib:/opt/senzing/er/lib/macos
@@ -13,6 +18,8 @@ permissions:
1318
jobs:
1419
pytest-darwin:
1520
name: "pytest Senzing: ${{ matrix.senzingsdk-version }}; OS: ${{ matrix.os }}; Python ${{ matrix.python-version }}"
21+
outputs:
22+
status: ${{ job.status }}
1623
runs-on: ${{ matrix.os }}
1724
strategy:
1825
fail-fast: false
@@ -86,3 +93,12 @@ jobs:
8693
pull-requests: write
8794
contents: write
8895
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v2
96+
97+
slack-notification:
98+
needs: [pytest-darwin]
99+
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-darwin.outputs.status ) && github.event_name == 'schedule' }}
100+
secrets:
101+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
102+
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v2
103+
with:
104+
job-status: ${{ needs.pytest-darwin.outputs.status }}

.github/workflows/pytest-linux.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: pytest linux
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
6+
branches: [main]
7+
schedule:
8+
- cron: "15 7,17 * * *"
49

510
env:
611
LD_LIBRARY_PATH: /opt/senzing/er/lib
@@ -88,10 +93,10 @@ jobs:
8893
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v2
8994

9095
slack-notification:
91-
needs: [pytest-linux, coverage]
92-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-linux.outputs.status ) && contains(fromJSON('["failure", "cancelled"]'), needs.coverage.outputs.job-status ) && github.ref_name == github.event.repository.default_branch }}
96+
needs: [pytest-linux]
97+
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-linux.outputs.status ) && (github.ref_name == github.event.repository.default_branch || github.event_name == 'schedule') }}
9398
secrets:
9499
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
95100
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v2
96101
with:
97-
job-status: ${{ needs.pytest-linux.outputs.status && needs.coverage.outputs.job-status }}
102+
job-status: ${{ needs.pytest-linux.outputs.status }}

.github/workflows/pytest-windows.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: pytest windows
22

3-
on: [pull_request, workflow_dispatch]
3+
on:
4+
pull_request:
5+
branches: [main]
6+
schedule:
7+
- cron: "15 7 * * *"
8+
workflow_dispatch:
49

510
env:
611
LD_LIBRARY_PATH: 'C:\Program Files\Senzing\er\lib'
@@ -13,6 +18,8 @@ permissions:
1318
jobs:
1419
pytest-windows:
1520
name: "pytest Senzing: ${{ matrix.senzingsdk-version }}; OS: ${{ matrix.os }}; Python ${{ matrix.python-version }}"
21+
outputs:
22+
status: ${{ job.status }}
1623
runs-on: ${{ matrix.os }}
1724
strategy:
1825
fail-fast: false
@@ -86,3 +93,12 @@ jobs:
8693
pull-requests: write
8794
contents: write
8895
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v2
96+
97+
slack-notification:
98+
needs: [pytest-windows]
99+
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-windows.outputs.status ) && github.event_name == 'schedule' }}
100+
secrets:
101+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
102+
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v2
103+
with:
104+
job-status: ${{ needs.pytest-windows.outputs.status }}

.github/workflows/spellcheck.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: spellcheck
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
permissions:
8+
contents: read
9+
10+
jobs:
11+
spellcheck:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- uses: streetsidesoftware/cspell-action@v7
18+
with:
19+
config: .vscode/cspell.json

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,11 @@ cython_debug/
170170

171171
.history
172172

173-
# VSCode
174-
.vscode/
175-
173+
# Visual Studio code
174+
.vscode/*
175+
!.vscode/cspell.json
176+
*.code-workspace
177+
.history
176178

177179
# Mac hidden file for folders custom attributes
178180
.DS_Store

0 commit comments

Comments
 (0)