Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/flake8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,4 @@ jobs:
- name: Run flake8 lint
uses: py-actions/flake8@v2
with:
max-line-length: 88
path: sz_tools
plugins: flake8-black
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
- name: Run mypy tests
run: |
# shellcheck disable=SC2046
mypy --strict $(git ls-files '*.py' ':!:docs/source/*')
mypy $(git ls-files '*.py' ':!:docs/source/*')
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install --group all .

- name: Analysing the code with pylint
- name: Analyzing the code with pylint
run: |
# shellcheck disable=SC2046
pylint $(git ls-files '*.py' ':!:docs/source/*')
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/pytest-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,3 @@ jobs:
with:
name: "coverage-${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"
path: "coverage.${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"

coverage:
if: github.event_name == 'pull_request'
name: Coverage
needs: pytest-darwin
permissions:
pull-requests: write
contents: write
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v3

slack-notification:
needs: [pytest-darwin]
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-darwin.result ) && github.event_name == 'schedule' }}
secrets:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v3
with:
job-status: ${{ needs.pytest-darwin.result }}
19 changes: 1 addition & 18 deletions .github/workflows/pytest-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches: [main]
schedule:
- cron: "15 7 * * *"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
Expand Down Expand Up @@ -96,21 +97,3 @@ jobs:
with:
name: "coverage-${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"
path: "coverage.${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"

coverage:
if: github.event_name == 'pull_request'
name: Coverage
needs: pytest-linux
permissions:
pull-requests: write
contents: write
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v3

slack-notification:
needs: [pytest-linux]
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-linux.result ) && (github.ref_name == github.event.repository.default_branch || github.event_name == 'schedule') }}
secrets:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v3
with:
job-status: ${{ needs.pytest-linux.result }}
20 changes: 1 addition & 19 deletions .github/workflows/pytest-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
with:
senzingsdk-version: ${{ matrix.senzingsdk-version }}

- name: Add to "Path" environment variable
- name: Set environment variables
run: |
Add-Content "$env:GITHUB_PATH" "$Env:USERPROFILE\Senzing\er\lib"

Expand Down Expand Up @@ -90,21 +90,3 @@ jobs:
with:
name: "coverage-${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"
path: "coverage.${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"

coverage:
if: github.event_name == 'pull_request'
name: Coverage
needs: pytest-windows
permissions:
pull-requests: write
contents: write
uses: senzing-factory/build-resources/.github/workflows/python-coverage-comment.yaml@v3

slack-notification:
needs: [pytest-windows]
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pytest-windows.result ) && github.event_name == 'schedule' }}
secrets:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v3
with:
job-status: ${{ needs.pytest-windows.result }}
3 changes: 1 addition & 2 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"abspath",
"addconfig",
"alnum",
"Analysing",
"ANONSUPPORT",
"Anytown",
"applehelp",
Expand Down Expand Up @@ -370,4 +369,4 @@
"data/**",
"development-requirements.txt"
]
}
}
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ venv: venv-osarch-specific
dependencies-for-development: venv dependencies-for-development-osarch-specific
$(activate-venv); \
python3 -m pip install --upgrade pip; \
python3 -m pip install --group all
python3 -m pip install --group all .


.PHONY: dependencies
Expand Down Expand Up @@ -198,7 +198,7 @@ isort:
mypy:
$(info ${\n})
$(info --- mypy -----------------------------------------------------------------------)
@$(activate-venv); mypy --strict $(shell git ls-files '*.py' ':!:docs/source/*')
@$(activate-venv); mypy $(shell git ls-files '*.py' ':!:docs/source/*')

.PHONY: prettier
prettier:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ development = [
"pytest==9.0.2; python_version > '3.11'",
"twine==6.2.0",
"typing_extensions==4.15.0; python_version < '3.11'",
"virtualenv==20.36.0",
"virtualenv==20.36.1",
"wheel==0.45.1",
]
documentation = [
Expand Down Expand Up @@ -91,7 +91,7 @@ test = [
]

[tool.setuptools.packages.find]
where = ["src"]
where = ["sz_tools"]

[tool.bandit]
skips = ["B101", "B108", "B404", "B602", "B605", "B608"]
Expand All @@ -105,7 +105,7 @@ max-line-length = 120

[tool.isort]
profile = "black"
src_paths = ["examples", "src", "tests"]
src_paths = ["examples", "tests"]

[tool.mypy]
exclude = ['.venv', 'g2_tools']
Expand Down
3 changes: 1 addition & 2 deletions sz_tools/_tool_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
import time
import tty
from contextlib import suppress
from dataclasses import dataclass
from itertools import product
from pathlib import Path
from signal import SIGALRM, alarm, signal
from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Tuple, TypeVar, Union
from typing import TYPE_CHECKING, Any, Dict, Iterable, List, TypeVar, Union

from senzing import SzEngineFlags, SzError, constants

Expand Down
Loading