From 3e4fd569d7be2726cfbb9244fcb7b205085be630 Mon Sep 17 00:00:00 2001 From: Tyler Mathis <35553152+tsmathis@users.noreply.github.com> Date: Mon, 15 Jun 2026 11:30:50 -0700 Subject: [PATCH 1/3] bump emmet, remove upper bound clamp --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 39feae2e..464081fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ "typing-extensions>=3.7.4.1", "requests>=2.23.0", "monty>=2024.12.10", - "emmet-core>=0.87.0,<0.87.2", + "emmet-core>=0.87.1", "boto3", "orjson >= 3.10,<4", "pyarrow >= 20.0.0", @@ -50,7 +50,7 @@ contribs = [ ] all = [ "custodian", - "emmet-core[all]>=0.87.0,<0.87.2", + "emmet-core[all]>=0.87.1", "fastmcp", "flask", ] From 845f43db0bd387ebbb82783a6fe16b19870b90f5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 15 Jun 2026 18:55:21 +0000 Subject: [PATCH 2/3] auto dependency upgrades --- .../requirements-ubuntu-latest_py3.11.txt | 12 +++---- ...quirements-ubuntu-latest_py3.11_extras.txt | 34 +++++++++---------- .../requirements-ubuntu-latest_py3.12.txt | 12 +++---- ...quirements-ubuntu-latest_py3.12_extras.txt | 34 +++++++++---------- .../requirements-ubuntu-latest_py3.13.txt | 12 +++---- ...quirements-ubuntu-latest_py3.13_extras.txt | 34 +++++++++---------- .../requirements-ubuntu-latest_py3.14.txt | 12 +++---- ...quirements-ubuntu-latest_py3.14_extras.txt | 34 +++++++++---------- 8 files changed, 92 insertions(+), 92 deletions(-) diff --git a/requirements/requirements-ubuntu-latest_py3.11.txt b/requirements/requirements-ubuntu-latest_py3.11.txt index 6ac3fa6e..d4228a3a 100644 --- a/requirements/requirements-ubuntu-latest_py3.11.txt +++ b/requirements/requirements-ubuntu-latest_py3.11.txt @@ -6,15 +6,15 @@ # annotated-types==0.7.0 # via pydantic -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake bibtexparser==1.4.4 # via pymatgen-core blake3==1.0.8 # via emmet-core -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -emmet-core==0.87.0 +emmet-core==0.87.1 # via mp-api (pyproject.toml) fonttools==4.63.0 # via matplotlib @@ -50,7 +50,7 @@ latexcodec==3.0.1 # via pybtex lxml==6.1.1 # via pymatgen-core -matplotlib==3.10.9 +matplotlib==3.11.0 # via pymatgen-core monty==2026.5.18 # via @@ -149,7 +149,7 @@ sympy==1.14.0 # via pymatgen-core tabulate==0.10.0 # via pymatgen-core -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core typeguard==4.5.2 # via inflect diff --git a/requirements/requirements-ubuntu-latest_py3.11_extras.txt b/requirements/requirements-ubuntu-latest_py3.11_extras.txt index 98ac4fc3..4d709c71 100644 --- a/requirements/requirements-ubuntu-latest_py3.11_extras.txt +++ b/requirements/requirements-ubuntu-latest_py3.11_extras.txt @@ -18,7 +18,7 @@ anyio==4.13.0 # sse-starlette # starlette # watchfiles -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake arrow==1.4.0 # via isoduration @@ -50,9 +50,9 @@ blinker==1.9.0 # via flask boltons==25.0.0 # via mp-api (pyproject.toml) -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -85,7 +85,7 @@ contourpy==1.3.3 # via matplotlib coverage[toml]==7.14.1 # via pytest-cov -cryptography==48.0.0 +cryptography==49.0.0 # via # authlib # joserfc @@ -95,7 +95,7 @@ custodian==2025.12.14 # via mp-api (pyproject.toml) cycler==0.12.1 # via matplotlib -cyclopts==4.16.1 +cyclopts==4.18.0 # via fastmcp-slim decorator==5.3.1 # via ipython @@ -103,7 +103,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -distlib==0.4.2 +distlib==0.4.3 # via virtualenv dnspython==2.8.0 # via @@ -116,7 +116,7 @@ docutils==0.22.4 # via sphinx email-validator==2.3.0 # via pydantic -emmet-core[all]==0.87.0 +emmet-core[all]==0.87.1 # via mp-api (pyproject.toml) exceptiongroup==1.3.1 # via fastmcp-slim @@ -128,7 +128,7 @@ fastmcp==3.4.2 # via mp-api (pyproject.toml) fastmcp-slim[client,server]==3.4.2 # via fastmcp -filelock==3.29.1 +filelock==3.29.4 # via # python-discovery # virtualenv @@ -259,7 +259,7 @@ markupsafe==3.0.3 # flask # jinja2 # werkzeug -matplotlib==3.10.9 +matplotlib==3.11.0 # via # ase # phonopy @@ -290,7 +290,7 @@ mp-pyrho==0.5.1 # via pymatgen-analysis-defects mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.0 # via # bravado # bravado-core @@ -362,9 +362,9 @@ pathspec==1.1.1 # via mypy pexpect==4.9.0 # via ipython -phonopy==4.1.0 +phonopy==4.2.1 # via emmet-core -phonors==0.2.0 +phonors==0.2.1 # via phonopy pillow==12.2.0 # via @@ -475,7 +475,7 @@ pyparsing==3.3.2 # matplotlib pyperclip==1.11.0 # via fastmcp-slim -pytest==9.0.3 +pytest==9.1.0 # via # mp-api (pyproject.toml) # pytest-asyncio @@ -498,7 +498,7 @@ python-dateutil==2.9.0.post0 # bravado-core # matplotlib # pandas -python-discovery==1.4.0 +python-discovery==1.4.2 # via virtualenv python-dotenv==1.2.2 # via @@ -613,7 +613,7 @@ sse-starlette==3.4.4 # via mcp stack-data==0.6.3 # via ipython -starlette==1.2.1 +starlette==1.3.1 # via # fastmcp-slim # mcp @@ -630,7 +630,7 @@ tabulate==0.10.0 # via pymatgen-core tifffile==2026.3.3 # via scikit-image -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core traitlets==5.15.1 # via @@ -695,7 +695,7 @@ uvicorn==0.49.0 # via # fastmcp-slim # mcp -virtualenv==21.4.2 +virtualenv==21.5.0 # via pre-commit watchfiles==1.2.0 # via fastmcp-slim diff --git a/requirements/requirements-ubuntu-latest_py3.12.txt b/requirements/requirements-ubuntu-latest_py3.12.txt index a534d0e6..53146949 100644 --- a/requirements/requirements-ubuntu-latest_py3.12.txt +++ b/requirements/requirements-ubuntu-latest_py3.12.txt @@ -6,15 +6,15 @@ # annotated-types==0.7.0 # via pydantic -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake bibtexparser==1.4.4 # via pymatgen-core blake3==1.0.8 # via emmet-core -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -emmet-core==0.87.0 +emmet-core==0.87.1 # via mp-api (pyproject.toml) fonttools==4.63.0 # via matplotlib @@ -50,7 +50,7 @@ latexcodec==3.0.1 # via pybtex lxml==6.1.1 # via pymatgen-core -matplotlib==3.10.9 +matplotlib==3.11.0 # via pymatgen-core monty==2026.5.18 # via @@ -149,7 +149,7 @@ sympy==1.14.0 # via pymatgen-core tabulate==0.10.0 # via pymatgen-core -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core typeguard==4.5.2 # via inflect diff --git a/requirements/requirements-ubuntu-latest_py3.12_extras.txt b/requirements/requirements-ubuntu-latest_py3.12_extras.txt index 84413714..1f4a5362 100644 --- a/requirements/requirements-ubuntu-latest_py3.12_extras.txt +++ b/requirements/requirements-ubuntu-latest_py3.12_extras.txt @@ -18,7 +18,7 @@ anyio==4.13.0 # sse-starlette # starlette # watchfiles -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake arrow==1.4.0 # via isoduration @@ -48,9 +48,9 @@ blinker==1.9.0 # via flask boltons==25.0.0 # via mp-api (pyproject.toml) -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -83,7 +83,7 @@ contourpy==1.3.3 # via matplotlib coverage[toml]==7.14.1 # via pytest-cov -cryptography==48.0.0 +cryptography==49.0.0 # via # authlib # joserfc @@ -93,7 +93,7 @@ custodian==2025.12.14 # via mp-api (pyproject.toml) cycler==0.12.1 # via matplotlib -cyclopts==4.16.1 +cyclopts==4.18.0 # via fastmcp-slim decorator==5.3.1 # via ipython @@ -101,7 +101,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -distlib==0.4.2 +distlib==0.4.3 # via virtualenv dnspython==2.8.0 # via @@ -114,7 +114,7 @@ docutils==0.22.4 # via sphinx email-validator==2.3.0 # via pydantic -emmet-core[all]==0.87.0 +emmet-core[all]==0.87.1 # via mp-api (pyproject.toml) exceptiongroup==1.3.1 # via fastmcp-slim @@ -126,7 +126,7 @@ fastmcp==3.4.2 # via mp-api (pyproject.toml) fastmcp-slim[client,server]==3.4.2 # via fastmcp -filelock==3.29.1 +filelock==3.29.4 # via # python-discovery # virtualenv @@ -255,7 +255,7 @@ markupsafe==3.0.3 # flask # jinja2 # werkzeug -matplotlib==3.10.9 +matplotlib==3.11.0 # via # ase # phonopy @@ -286,7 +286,7 @@ mp-pyrho==0.5.1 # via pymatgen-analysis-defects mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.0 # via # bravado # bravado-core @@ -358,9 +358,9 @@ pathspec==1.1.1 # via mypy pexpect==4.9.0 # via ipython -phonopy==4.1.0 +phonopy==4.2.1 # via emmet-core -phonors==0.2.0 +phonors==0.2.1 # via phonopy pillow==12.2.0 # via @@ -471,7 +471,7 @@ pyparsing==3.3.2 # matplotlib pyperclip==1.11.0 # via fastmcp-slim -pytest==9.0.3 +pytest==9.1.0 # via # mp-api (pyproject.toml) # pytest-asyncio @@ -494,7 +494,7 @@ python-dateutil==2.9.0.post0 # bravado-core # matplotlib # pandas -python-discovery==1.4.0 +python-discovery==1.4.2 # via virtualenv python-dotenv==1.2.2 # via @@ -609,7 +609,7 @@ sse-starlette==3.4.4 # via mcp stack-data==0.6.3 # via ipython -starlette==1.2.1 +starlette==1.3.1 # via # fastmcp-slim # mcp @@ -626,7 +626,7 @@ tabulate==0.10.0 # via pymatgen-core tifffile==2026.6.1 # via scikit-image -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core traitlets==5.15.1 # via @@ -688,7 +688,7 @@ uvicorn==0.49.0 # via # fastmcp-slim # mcp -virtualenv==21.4.2 +virtualenv==21.5.0 # via pre-commit watchfiles==1.2.0 # via fastmcp-slim diff --git a/requirements/requirements-ubuntu-latest_py3.13.txt b/requirements/requirements-ubuntu-latest_py3.13.txt index aaf2a575..3a6c81ce 100644 --- a/requirements/requirements-ubuntu-latest_py3.13.txt +++ b/requirements/requirements-ubuntu-latest_py3.13.txt @@ -6,15 +6,15 @@ # annotated-types==0.7.0 # via pydantic -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake bibtexparser==1.4.4 # via pymatgen-core blake3==1.0.8 # via emmet-core -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -emmet-core==0.87.0 +emmet-core==0.87.1 # via mp-api (pyproject.toml) fonttools==4.63.0 # via matplotlib @@ -50,7 +50,7 @@ latexcodec==3.0.1 # via pybtex lxml==6.1.1 # via pymatgen-core -matplotlib==3.10.9 +matplotlib==3.11.0 # via pymatgen-core monty==2026.5.18 # via @@ -149,7 +149,7 @@ sympy==1.14.0 # via pymatgen-core tabulate==0.10.0 # via pymatgen-core -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core typeguard==4.5.2 # via inflect diff --git a/requirements/requirements-ubuntu-latest_py3.13_extras.txt b/requirements/requirements-ubuntu-latest_py3.13_extras.txt index 5371ccd9..46f3b1a0 100644 --- a/requirements/requirements-ubuntu-latest_py3.13_extras.txt +++ b/requirements/requirements-ubuntu-latest_py3.13_extras.txt @@ -18,7 +18,7 @@ anyio==4.13.0 # sse-starlette # starlette # watchfiles -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake arrow==1.4.0 # via isoduration @@ -48,9 +48,9 @@ blinker==1.9.0 # via flask boltons==25.0.0 # via mp-api (pyproject.toml) -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -83,7 +83,7 @@ contourpy==1.3.3 # via matplotlib coverage[toml]==7.14.1 # via pytest-cov -cryptography==48.0.0 +cryptography==49.0.0 # via # authlib # joserfc @@ -93,7 +93,7 @@ custodian==2025.12.14 # via mp-api (pyproject.toml) cycler==0.12.1 # via matplotlib -cyclopts==4.16.1 +cyclopts==4.18.0 # via fastmcp-slim decorator==5.3.1 # via ipython @@ -101,7 +101,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -distlib==0.4.2 +distlib==0.4.3 # via virtualenv dnspython==2.8.0 # via @@ -114,7 +114,7 @@ docutils==0.22.4 # via sphinx email-validator==2.3.0 # via pydantic -emmet-core[all]==0.87.0 +emmet-core[all]==0.87.1 # via mp-api (pyproject.toml) exceptiongroup==1.3.1 # via fastmcp-slim @@ -126,7 +126,7 @@ fastmcp==3.4.2 # via mp-api (pyproject.toml) fastmcp-slim[client,server]==3.4.2 # via fastmcp -filelock==3.29.1 +filelock==3.29.4 # via # python-discovery # virtualenv @@ -255,7 +255,7 @@ markupsafe==3.0.3 # flask # jinja2 # werkzeug -matplotlib==3.10.9 +matplotlib==3.11.0 # via # ase # phonopy @@ -286,7 +286,7 @@ mp-pyrho==0.5.1 # via pymatgen-analysis-defects mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.0 # via # bravado # bravado-core @@ -358,9 +358,9 @@ pathspec==1.1.1 # via mypy pexpect==4.9.0 # via ipython -phonopy==4.1.0 +phonopy==4.2.1 # via emmet-core -phonors==0.2.0 +phonors==0.2.1 # via phonopy pillow==12.2.0 # via @@ -471,7 +471,7 @@ pyparsing==3.3.2 # matplotlib pyperclip==1.11.0 # via fastmcp-slim -pytest==9.0.3 +pytest==9.1.0 # via # mp-api (pyproject.toml) # pytest-asyncio @@ -494,7 +494,7 @@ python-dateutil==2.9.0.post0 # bravado-core # matplotlib # pandas -python-discovery==1.4.0 +python-discovery==1.4.2 # via virtualenv python-dotenv==1.2.2 # via @@ -609,7 +609,7 @@ sse-starlette==3.4.4 # via mcp stack-data==0.6.3 # via ipython -starlette==1.2.1 +starlette==1.3.1 # via # fastmcp-slim # mcp @@ -626,7 +626,7 @@ tabulate==0.10.0 # via pymatgen-core tifffile==2026.6.1 # via scikit-image -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core traitlets==5.15.1 # via @@ -682,7 +682,7 @@ uvicorn==0.49.0 # via # fastmcp-slim # mcp -virtualenv==21.4.2 +virtualenv==21.5.0 # via pre-commit watchfiles==1.2.0 # via fastmcp-slim diff --git a/requirements/requirements-ubuntu-latest_py3.14.txt b/requirements/requirements-ubuntu-latest_py3.14.txt index 6b9ddb9a..b3009586 100644 --- a/requirements/requirements-ubuntu-latest_py3.14.txt +++ b/requirements/requirements-ubuntu-latest_py3.14.txt @@ -6,15 +6,15 @@ # annotated-types==0.7.0 # via pydantic -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake bibtexparser==1.4.4 # via pymatgen-core blake3==1.0.8 # via emmet-core -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -emmet-core==0.87.0 +emmet-core==0.87.1 # via mp-api (pyproject.toml) fonttools==4.63.0 # via matplotlib @@ -50,7 +50,7 @@ latexcodec==3.0.1 # via pybtex lxml==6.1.1 # via pymatgen-core -matplotlib==3.10.9 +matplotlib==3.11.0 # via pymatgen-core monty==2026.5.18 # via @@ -149,7 +149,7 @@ sympy==1.14.0 # via pymatgen-core tabulate==0.10.0 # via pymatgen-core -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core typeguard==4.5.2 # via inflect diff --git a/requirements/requirements-ubuntu-latest_py3.14_extras.txt b/requirements/requirements-ubuntu-latest_py3.14_extras.txt index 59de5dd6..dc5c7083 100644 --- a/requirements/requirements-ubuntu-latest_py3.14_extras.txt +++ b/requirements/requirements-ubuntu-latest_py3.14_extras.txt @@ -18,7 +18,7 @@ anyio==4.13.0 # sse-starlette # starlette # watchfiles -arro3-core==0.8.0 +arro3-core==0.8.1 # via deltalake arrow==1.4.0 # via isoduration @@ -48,9 +48,9 @@ blinker==1.9.0 # via flask boltons==25.0.0 # via mp-api (pyproject.toml) -boto3==1.43.25 +boto3==1.43.29 # via mp-api (pyproject.toml) -botocore==1.43.25 +botocore==1.43.29 # via # boto3 # s3transfer @@ -83,7 +83,7 @@ contourpy==1.3.3 # via matplotlib coverage[toml]==7.14.1 # via pytest-cov -cryptography==48.0.0 +cryptography==49.0.0 # via # authlib # joserfc @@ -93,7 +93,7 @@ custodian==2025.12.14 # via mp-api (pyproject.toml) cycler==0.12.1 # via matplotlib -cyclopts==4.16.1 +cyclopts==4.18.0 # via fastmcp-slim decorator==5.3.1 # via ipython @@ -101,7 +101,7 @@ deltalake==1.5.1 # via mp-api (pyproject.toml) deprecated==1.3.1 # via deltalake -distlib==0.4.2 +distlib==0.4.3 # via virtualenv dnspython==2.8.0 # via @@ -114,7 +114,7 @@ docutils==0.22.4 # via sphinx email-validator==2.3.0 # via pydantic -emmet-core[all]==0.87.0 +emmet-core[all]==0.87.1 # via mp-api (pyproject.toml) exceptiongroup==1.3.1 # via fastmcp-slim @@ -126,7 +126,7 @@ fastmcp==3.4.2 # via mp-api (pyproject.toml) fastmcp-slim[client,server]==3.4.2 # via fastmcp -filelock==3.29.1 +filelock==3.29.4 # via # python-discovery # virtualenv @@ -255,7 +255,7 @@ markupsafe==3.0.3 # flask # jinja2 # werkzeug -matplotlib==3.10.9 +matplotlib==3.11.0 # via # ase # phonopy @@ -286,7 +286,7 @@ mp-pyrho==0.5.1 # via pymatgen-analysis-defects mpmath==1.3.0 # via sympy -msgpack==1.1.2 +msgpack==1.2.0 # via # bravado # bravado-core @@ -358,9 +358,9 @@ pathspec==1.1.1 # via mypy pexpect==4.9.0 # via ipython -phonopy==4.1.0 +phonopy==4.2.1 # via emmet-core -phonors==0.2.0 +phonors==0.2.1 # via phonopy pillow==12.2.0 # via @@ -471,7 +471,7 @@ pyparsing==3.3.2 # matplotlib pyperclip==1.11.0 # via fastmcp-slim -pytest==9.0.3 +pytest==9.1.0 # via # mp-api (pyproject.toml) # pytest-asyncio @@ -494,7 +494,7 @@ python-dateutil==2.9.0.post0 # bravado-core # matplotlib # pandas -python-discovery==1.4.0 +python-discovery==1.4.2 # via virtualenv python-dotenv==1.2.2 # via @@ -609,7 +609,7 @@ sse-starlette==3.4.4 # via mcp stack-data==0.6.3 # via ipython -starlette==1.2.1 +starlette==1.3.1 # via # fastmcp-slim # mcp @@ -626,7 +626,7 @@ tabulate==0.10.0 # via pymatgen-core tifffile==2026.6.1 # via scikit-image -tqdm==4.68.1 +tqdm==4.68.2 # via pymatgen-core traitlets==5.15.1 # via @@ -682,7 +682,7 @@ uvicorn==0.49.0 # via # fastmcp-slim # mcp -virtualenv==21.4.2 +virtualenv==21.5.0 # via pre-commit watchfiles==1.2.0 # via fastmcp-slim From 51739273756735b71a4e26648779e1d4e5009c50 Mon Sep 17 00:00:00 2001 From: Tyler Mathis <35553152+tsmathis@users.noreply.github.com> Date: Mon, 15 Jun 2026 12:30:58 -0700 Subject: [PATCH 3/3] updated pytest compat --- tests/client/contribs/conftest.py | 33 ++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tests/client/contribs/conftest.py b/tests/client/contribs/conftest.py index e6a86d47..f9b1133a 100644 --- a/tests/client/contribs/conftest.py +++ b/tests/client/contribs/conftest.py @@ -1,11 +1,34 @@ +import pytest +from packaging.version import Version + try: from mp_api.client.contribs import ContribsClient except ImportError: ContribsClient = None -def pytest_ignore_collect(path, config): - # Skip tests if contribs client isn't installed - if ContribsClient is None and "contribs" in str(path): - return True - return False +_pytest_version = Version(pytest.__version__) +PYTEST_GE_8_0 = any( + [ + _pytest_version.is_devrelease, + _pytest_version.is_prerelease, + _pytest_version >= Version("8.0"), + ] +) + + +if PYTEST_GE_8_0: + + def pytest_ignore_collect(collection_path, config): + # Skip tests if contribs client isn't installed + if ContribsClient is None and "contribs" in str(collection_path): + return True + return False + +else: + + def pytest_ignore_collect(path, config): + # Skip tests if contribs client isn't installed + if ContribsClient is None and "contribs" in str(path): + return True + return False