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

Fix CI Errors #167

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 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: 1 addition & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Upload HTML Docs
uses: actions/upload-artifact@v3
with:
name: packages
name: packages-${{ matrix.python-version }}
path: ./dist/

# If this commit is the result of a Git tag, push the wheel and tar packages
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,15 @@ jobs:
- '3.12'

steps:
- uses: actions/checkout@v3
- name: Checkout Repository
uses: actions/checkout@v3
with:
fetch-depth: 0
ajnelson-nist marked this conversation as resolved.
Show resolved Hide resolved

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Review dependencies
run: make check-supply-chain-pre-commit
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
repos:
- repo: https://github.com/psf/black
rev: 23.12.1
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
rev: 7.1.1
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
Expand Down
8 changes: 5 additions & 3 deletions case_utils/case_sparql_construct/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ def main() -> None:

# Configure debug logging before running parse_args, because there could be an error raised before the construction of the argument parser.
logging.basicConfig(
level=logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
level=(
logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
)
)

parser.add_argument("-d", "--debug", action="store_true")
Expand Down
8 changes: 5 additions & 3 deletions case_utils/case_sparql_select/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,11 @@ def main() -> None:

# Configure debug logging before running parse_args, because there could be an error raised before the construction of the argument parser.
logging.basicConfig(
level=logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
level=(
logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
)
)

parser.add_argument("-d", "--debug", action="store_true")
Expand Down
24 changes: 13 additions & 11 deletions case_utils/case_validate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ def validate(
)

# Validate data graph against ontology graph.
validate_result: Tuple[
bool, Union[Exception, bytes, str, rdflib.Graph], str
] = pyshacl.validate(
data_graph,
*args,
ont_graph=ontology_graph,
shacl_graph=ontology_graph,
**kwargs,
validate_result: Tuple[bool, Union[Exception, bytes, str, rdflib.Graph], str] = (
pyshacl.validate(
data_graph,
*args,
ont_graph=ontology_graph,
shacl_graph=ontology_graph,
**kwargs,
)
)

# Relieve RAM of the data graph after validation has run.
Expand Down Expand Up @@ -159,9 +159,11 @@ def main() -> None:
# could be an error raised before the construction of the argument
# parser.
logging.basicConfig(
level=logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
level=(
logging.DEBUG
if ("--debug" in sys.argv or "-d" in sys.argv)
else logging.INFO
)
)

# Add arguments specific to case_validate.
Expand Down
Loading