Skip to content

Commit

Permalink
Skip: Update all non-major dependencies (merge commit)
Browse files Browse the repository at this point in the history
Merge branch 'renovate/all-minor-patch' into 'main'
* Skip: Update dependency test/setuptools to v70

* Fix issues raised by dependency update

* Skip: Update all non-major dependencies

See merge request https://gitlab.ci.csc.fi/sds-dev/sd-submit/metadata-submitter/-/merge_requests/866

Co-authored-by: renovate-bot <group183_bot1@noreply.gitlab.ci.csc.fi>
Co-authored-by: Joonatan Mäkinen <joonatan.makinen@csc.fi>
Merged by Joonatan Mäkinen <jmakine@csc.fi>
  • Loading branch information
Joonatan Mäkinen committed Jun 20, 2024
2 parents a2ef866 + 82fa10a commit 6a99def
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: rojopolis/spellcheck-github-actions@0.36.0
- uses: rojopolis/spellcheck-github-actions@0.38.0
name: Spellcheck
with:
config_path: .pyspelling.yml
Expand Down
2 changes: 2 additions & 0 deletions metadata_backend/services/metax_mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,8 @@ def _map_is_output_of(self, study: dict[str, Any]) -> None:
LOG.info("Mapping study for related datasets")
LOG.debug(study)

name = ""

for obj in self.datacite_data["metadataObjects"]:
if obj["schema"] == "study":
name = obj["tags"]["displayTitle"]
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ classifiers = [

[project.optional-dependencies]
test = [
"coverage==7.4.4",
"coverage==7.5.3",
"pytest==8.2.2",
"pytest-cov==5.0.0",
"pytest-xdist==3.5.0",
"tox==4.14.2",
"pytest-xdist==3.6.1",
"tox==4.15.1",
"setuptools==70.1.0",
]
docs = [
Expand Down
88 changes: 44 additions & 44 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
aiofiles==23.2.1
# via -r requirements-dev.in
aiohttp==3.9.4
aiohttp==3.9.5
# via
# -r requirements.txt
# aiohttp-session
Expand All @@ -22,31 +22,31 @@ amqpstorm==2.10.7
# via
# -r requirements-dev.in
# -r requirements.txt
astroid==3.1.0
astroid==3.2.2
# via pylint
attrs==23.2.0
# via
# -r requirements.txt
# aiohttp
# jsonschema
# referencing
authlib==1.3.0
authlib==1.3.1
# via -r requirements-dev.in
babel==2.14.0
babel==2.15.0
# via sphinx
bandit==1.7.8
bandit==1.7.9
# via -r requirements-dev.in
beautifulsoup4==4.12.3
# via pyspelling
black==24.4.0
black==24.4.2
# via -r requirements-dev.in
bracex==2.4
# via wcmatch
build==1.2.1
# via pip-tools
cachetools==5.3.3
# via tox
certifi==2024.2.2
certifi==2024.6.2
# via
# -r requirements-dev.in
# -r requirements.txt
Expand All @@ -69,15 +69,15 @@ click==8.1.7
# pip-tools
colorama==0.4.6
# via tox
coverage[toml]==7.4.4
coverage[toml]==7.5.3
# via pytest-cov
cryptography==42.0.5
cryptography==42.0.8
# via
# -r requirements.txt
# authlib
# cryptojwt
# pyopenssl
cryptojwt==1.9.0
cryptojwt==1.9.2
# via
# -r requirements.txt
# idpyoidc
Expand All @@ -101,13 +101,13 @@ elementpath==4.4.0
# xmlschema
execnet==2.1.1
# via pytest-xdist
filelock==3.13.4
filelock==3.15.3
# via
# -r requirements.txt
# idpyoidc
# tox
# virtualenv
flake8==7.0.0
flake8==7.1.0
# via -r requirements-dev.in
frozenlist==1.4.1
# via
Expand All @@ -120,14 +120,14 @@ honcho==1.1.0
# via -r requirements-dev.in
html5lib==1.1
# via pyspelling
identify==2.5.35
identify==2.5.36
# via pre-commit
idna==3.7
# via
# -r requirements.txt
# requests
# yarl
idpyoidc==4.0.0
idpyoidc==4.1.0
# via -r requirements.txt
imagesize==1.4.1
# via sphinx
Expand All @@ -142,13 +142,13 @@ jinja2==3.1.4
# -r requirements.txt
# idpyoidc
# sphinx
jsonschema==4.21.1
jsonschema==4.22.0
# via -r requirements.txt
jsonschema-specifications==2023.12.1
# via
# -r requirements.txt
# jsonschema
lxml==5.2.1
lxml==5.2.2
# via pyspelling
markdown==3.6
# via pyspelling
Expand All @@ -173,15 +173,15 @@ multidict==6.0.5
# -r requirements.txt
# aiohttp
# yarl
mypy==1.9.0
mypy==1.10.0
# via -r requirements-dev.in
mypy-extensions==1.0.0
# via
# black
# mypy
nodeenv==1.8.0
nodeenv==1.9.1
# via pre-commit
packaging==24.0
packaging==24.1
# via
# -r requirements.txt
# black
Expand All @@ -201,33 +201,33 @@ pbr==6.0.0
# via stevedore
pip-tools==7.4.1
# via -r requirements-dev.in
platformdirs==4.2.0
platformdirs==4.2.2
# via
# black
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# pytest
# tox
pre-commit==3.7.0
pre-commit==3.7.1
# via -r requirements-dev.in
pycodestyle==2.11.1
pycodestyle==2.12.0
# via flake8
pycparser==2.22
# via
# -r requirements.txt
# cffi
pyflakes==3.2.0
# via flake8
pygments==2.17.2
pygments==2.18.0
# via
# rich
# sphinx
pylint==3.1.0
pylint==3.2.3
# via -r requirements-dev.in
pymongo==4.6.3
pymongo==4.7.3
# via
# -r requirements.txt
# motor
Expand All @@ -237,23 +237,23 @@ pyopenssl==24.1.0
# idpyoidc
pyproject-api==1.6.1
# via tox
pyproject-hooks==1.0.0
pyproject-hooks==1.1.0
# via
# build
# pip-tools
pyspelling==2.10
# via -r requirements-dev.in
pytest==8.1.1
pytest==8.2.2
# via
# -r requirements-dev.in
# pytest-asyncio
# pytest-cov
# pytest-xdist
pytest-asyncio==0.23.6
pytest-asyncio==0.23.7
# via -r requirements-dev.in
pytest-cov==5.0.0
# via -r requirements-dev.in
pytest-xdist==3.5.0
pytest-xdist==3.6.1
# via -r requirements-dev.in
python-dateutil==2.9.0.post0
# via -r requirements.txt
Expand All @@ -266,7 +266,7 @@ pyyaml==6.0.1
# pre-commit
# pyspelling
# responses
referencing==0.34.0
referencing==0.35.1
# via
# -r requirements.txt
# jsonschema
Expand All @@ -277,13 +277,13 @@ requests==2.31.0
# cryptojwt
# responses
# sphinx
responses==0.25.0
responses==0.25.3
# via
# -r requirements.txt
# idpyoidc
rich==13.7.1
# via bandit
rpds-py==0.18.0
rpds-py==0.18.1
# via
# -r requirements.txt
# jsonschema
Expand All @@ -299,7 +299,7 @@ soupsieve==2.5
# via
# beautifulsoup4
# pyspelling
sphinx==7.2.6
sphinx==7.3.7
# via
# -r requirements-dev.in
# sphinx-rtd-theme
Expand All @@ -322,43 +322,43 @@ sphinxcontrib-serializinghtml==1.1.10
# via sphinx
stevedore==5.2.0
# via bandit
tomlkit==0.12.4
tomlkit==0.12.5
# via pylint
tox==4.14.2
tox==4.15.1
# via -r requirements-dev.in
types-python-dateutil==2.9.0.20240316
# via -r requirements-dev.in
types-requests==2.31.0.20240406
types-requests==2.32.0.20240602
# via -r requirements-dev.in
types-ujson==5.9.0.0
types-ujson==5.10.0.20240515
# via -r requirements-dev.in
typing-extensions==4.11.0
typing-extensions==4.12.2
# via
# -r requirements.txt
# mypy
ujson==5.9.0
ujson==5.10.0
# via -r requirements.txt
urllib3==2.2.1
urllib3==2.2.2
# via
# -r requirements.txt
# requests
# responses
# types-requests
uvloop==0.19.0
# via -r requirements.txt
virtualenv==20.25.1
virtualenv==20.26.2
# via
# pre-commit
# tox
vulture==2.11
# via -r requirements-dev.in
wcmatch==8.5.1
wcmatch==8.5.2
# via pyspelling
webencodings==0.5.1
# via html5lib
wheel==0.43.0
# via pip-tools
xmlschema==3.2.1
xmlschema==3.3.1
# via -r requirements.txt
yarl==1.9.4
# via
Expand Down
Loading

0 comments on commit 6a99def

Please sign in to comment.