Skip to content

Commit

Permalink
[Auto-generated] Update dependencies (#779)
Browse files Browse the repository at this point in the history
### Update dependencies

Automatically created PR from
[`ci/dependabot-updates`](https://github.com/emmo-repo/EMMOntoPy/tree/ci/dependabot-updates).

The PR is based on the ['CI - Update dependencies PR'
workflow](https://SINTEF.github.io/ci-cd/latest/workflows/ci_update_dependencies/)
in [SINTEF/ci-cd](https://github.com/SINTEF/ci-cd).

#### To do

- [ ] Check that the diff is sensible, and that tests and builds pass
with the new dependency versions.
- [ ] Make sure that the PR is **squash** merged, with a sensible commit
message.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Francesca L. Bleken <[email protected]>
Co-authored-by: francescalb <[email protected]>
Co-authored-by: Jesper Friis <[email protected]>
  • Loading branch information
5 people authored Oct 24, 2024
1 parent 28bc43e commit edc698b
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/cd_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
publish:
name: External
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.7.4
uses: SINTEF/ci-cd/.github/workflows/cd_release.yml@v2.8.2
if: github.repository == 'emmo-repo/EMMOntoPy' && startsWith(github.ref, 'refs/tags/v')
with:
git_username: EMMOntoPy Developers
Expand All @@ -31,5 +31,4 @@ jobs:
changelog_exclude_labels: dependencies

secrets:
PyPI_token: ${{ secrets.PYPI_TOKEN }}
PAT: ${{ secrets.RELEASE_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/ci_automerge_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
update-dependabot-branch:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.7.4
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.8.2
if: github.repository_owner == 'emmo-repo' && startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]'
secrets:
PAT: ${{ secrets.RELEASE_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/ci_cd_updated_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
updates-to-master:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.7.4
uses: SINTEF/ci-cd/.github/workflows/ci_cd_updated_default_branch.yml@v2.8.2
if: github.repository_owner == 'emmo-repo'
with:
git_username: EMMOntoPy Developers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
create-collected-pr:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.7.4
uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.8.2
if: github.repository_owner == 'emmo-repo'
with:
git_username: EMMOntoPy Developers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
tests:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.7.4
uses: SINTEF/ci-cd/.github/workflows/ci_tests.yml@v2.8.2
with:
# General
install_extras: "[dev,docs]"
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-symlinks
- id: check-xml
Expand All @@ -17,13 +17,13 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/ambv/black
rev: 24.4.2
rev: 24.10.0
hooks:
- id: black
name: Blacken

- repo: https://github.com/PyCQA/bandit
rev: '1.7.9'
rev: '1.7.10'
hooks:
- id: bandit
args: [-r]
Expand All @@ -36,7 +36,7 @@ repos:
# exclude: ^tests/.*$

- repo: https://github.com/SINTEF/ci-cd
rev: v2.7.4
rev: v2.8.3
hooks:
- id: docs-api-reference
args:
Expand Down
6 changes: 4 additions & 2 deletions ontopy/excelparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ExcelError(EMMOntoPyException):

def create_ontology_from_excel( # pylint: disable=too-many-arguments, too-many-locals
excelpath: str,
*,
concept_sheet_name: str = "Concepts",
metadata_sheet_name: str = "Metadata",
imports_sheet_name: str = "ImportedOntologies",
Expand Down Expand Up @@ -290,7 +291,7 @@ def _relative_to_absolute_paths(path):
)


def create_ontology_from_pandas( # pylint:disable=too-many-locals,too-many-branches,too-many-statements,too-many-arguments
def create_ontology_from_pandas( # pylint:disable=too-many-locals,too-many-branches,too-many-statements,too-many-arguments, too-many-positional-arguments
data: pd.DataFrame,
objectproperties: pd.DataFrame,
annotationproperties: pd.DataFrame,
Expand Down Expand Up @@ -585,6 +586,7 @@ def _add_literal( # pylint: disable=too-many-arguments
data: Union[pd.DataFrame, pd.Series],
destination: owlready2.prop.IndividualValueList, #
name: str,
*,
metadata: bool = False,
only_one: bool = False,
sep: str = ";",
Expand Down Expand Up @@ -903,7 +905,7 @@ def _add_range_domain(
return onto, properties_with_errors


def _make_entity_list( # pylint: disable=too-many-arguments
def _make_entity_list( # pylint: disable=too-many-arguments, too-many-positional-arguments
onto: owlready2.Ontology,
row: pd.Series,
rowheader: str,
Expand Down
9 changes: 8 additions & 1 deletion ontopy/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ def __init__( # pylint: disable=too-many-arguments,too-many-locals
self,
ontology,
root=None,
*,
leaves=None,
entities=None,
relations="isA",
Expand Down Expand Up @@ -296,7 +297,7 @@ def __init__( # pylint: disable=too-many-arguments,too-many-locals
elif root:
self.add_branch(
root,
leaves,
leaves=leaves,
relations=relations,
edgelabels=edgelabels,
addnodes=addnodes,
Expand Down Expand Up @@ -326,6 +327,7 @@ def __init__( # pylint: disable=too-many-arguments,too-many-locals
def add_entities( # pylint: disable=too-many-arguments
self,
entities=None,
*,
relations="isA",
edgelabels=None,
addnodes=False,
Expand Down Expand Up @@ -353,6 +355,7 @@ def add_entities( # pylint: disable=too-many-arguments
def add_branch( # pylint: disable=too-many-arguments,too-many-locals
self,
root,
*,
leaves=None,
include_leaves=True,
strict_leaves=False,
Expand Down Expand Up @@ -427,6 +430,7 @@ def add_branch( # pylint: disable=too-many-arguments,too-many-locals
def add_parents( # pylint: disable=too-many-arguments
self,
name,
*,
levels=1,
relations="isA",
edgelabels=None,
Expand Down Expand Up @@ -522,6 +526,7 @@ def add_edge(self, subject, predicate, obj, edgelabel=None, **attrs):
def add_source_edges( # pylint: disable=too-many-arguments,too-many-branches
self,
source,
*,
relations=None,
edgelabels=None,
addnodes=None,
Expand Down Expand Up @@ -607,6 +612,7 @@ def add_source_edges( # pylint: disable=too-many-arguments,too-many-branches

def add_edges( # pylint: disable=too-many-arguments
self,
*,
sources=None,
relations=None,
edgelabels=None,
Expand Down Expand Up @@ -998,6 +1004,7 @@ def setmodules(onto):
def plot_modules( # pylint: disable=too-many-arguments
src,
filename=None,
*,
fmt=None,
show=False,
strip_base=None,
Expand Down
6 changes: 5 additions & 1 deletion ontopy/ontodoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ def __init__( # pylint: disable=too-many-arguments
template,
ontodoc,
basedir=".",
*,
figdir="genfigs",
figformat="png",
figscale=1.0,
Expand Down Expand Up @@ -756,7 +757,7 @@ def process_branches(self):
branch, int(opts.header_level) # pylint: disable=no-member
).split("\n")

def _make_branchfig( # pylint: disable=too-many-arguments,too-many-locals
def _make_branchfig( # pylint: disable=too-many-arguments,too-many-locals, too-many-positional-arguments
self,
name: str,
path: "Union[Path, str]",
Expand Down Expand Up @@ -1142,6 +1143,7 @@ def process(self):
def write( # pylint: disable=too-many-arguments
self,
outfile,
*,
fmt=None,
pandoc_option_files=(),
pandoc_options=(),
Expand Down Expand Up @@ -1288,6 +1290,7 @@ def run_pandoc( # pylint: disable=too-many-arguments
genfile,
outfile,
fmt,
*,
pandoc_option_files=(),
pandoc_options=(),
verbose=True,
Expand Down Expand Up @@ -1444,6 +1447,7 @@ def get_maxwidth(fmt):
def get_docpp( # pylint: disable=too-many-arguments
ontodoc,
infile,
*,
figdir="genfigs",
figformat="png",
maxwidth=None,
Expand Down
6 changes: 6 additions & 0 deletions ontopy/ontology.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ def set_default_label_annotations(self):
def get_by_label(
self,
label: str,
*,
label_annotations: str = None,
prefix: str = None,
imported: bool = True,
Expand Down Expand Up @@ -586,6 +587,7 @@ def set_common_prefix(

def load( # pylint: disable=too-many-arguments,arguments-renamed
self,
*,
only_local=False,
filename=None,
format=None, # pylint: disable=redefined-builtin
Expand Down Expand Up @@ -677,6 +679,7 @@ def load( # pylint: disable=too-many-arguments,arguments-renamed

def _load( # pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements
self,
*,
only_local=False,
filename=None,
format=None, # pylint: disable=redefined-builtin
Expand Down Expand Up @@ -864,6 +867,7 @@ def save(
filename=None,
format=None,
dir=".",
*,
mkdir=False,
overwrite=False,
recursive=False,
Expand Down Expand Up @@ -1128,6 +1132,7 @@ def rec_imported(onto, imported):

def get_entities( # pylint: disable=too-many-arguments
self,
*,
imported=True,
classes=True,
individuals=True,
Expand Down Expand Up @@ -1537,6 +1542,7 @@ def get_branch( # pylint: disable=too-many-arguments
root,
leaves=(),
include_leaves=True,
*,
strict_leaves=False,
exclude=None,
sort=False,
Expand Down
2 changes: 2 additions & 0 deletions ontopy/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ class ReadCatalogError(IOError):

def read_catalog( # pylint: disable=too-many-locals,too-many-statements,too-many-arguments
uri,
*,
catalog_file="catalog-v001.xml",
baseuri=None,
recursive=False,
Expand Down Expand Up @@ -602,6 +603,7 @@ def _validate_installed_version(
def convert_imported( # pylint: disable=too-many-arguments,too-many-locals
input_ontology: "Union[Path, str]",
output_ontology: "Union[Path, str]",
*,
input_format: "Optional[str]" = None,
output_format: str = "xml",
url_from_catalog: "Optional[bool]" = None,
Expand Down
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pre-commit>=2.21.0,<3; python_version<"3.9"
pre-commit~=3.7; python_version>="3.9"
pre-commit~=3.8; python_version>="3.9"
pylint~=2.17; python_version<"3.8"
pylint~=3.2; python_version>="3.8"
pytest~=7.4; python_version<"3.8"
Expand Down
2 changes: 1 addition & 1 deletion requirements_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ mkdocs~=1.6; python_version>="3.8"
mkdocs-awesome-pages-plugin~=2.9
mkdocs-material~=9.5; python_version>="3.8"
mkdocs-material~=9.2; python_version<"3.8"
mkdocstrings[python-legacy]~=0.25.1; python_version>="3.8"
mkdocstrings[python-legacy]~=0.26.1; python_version>="3.8"
mkdocstrings[python-legacy]~=0.22.0; python_version<"3.8"

0 comments on commit edc698b

Please sign in to comment.