From 63300e43cf74e64be82a6c6337a6e5c38596143a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dav=C3=ADd=20Brakenhoff?= Date: Mon, 27 Jan 2025 17:35:53 +0100 Subject: [PATCH] test latest release arcticdb w python 3.12, 3.13 --- .github/workflows/ci.yml | 12 ++---------- pyproject.toml | 4 ---- tests/conftest.py | 6 +----- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4db7f80..2781e65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,26 +81,18 @@ jobs: cache: "pip" cache-dependency-path: pyproject.toml - - name: Install dependencies < PY312 - if: ${{ matrix.python-version < '3.12'}} + - name: Install dependencies run: | pip install --upgrade pip pip install ${{ matrix.pastas-version }} pip install -e .[test] - - name: Install dependencies >= PY312 - if: ${{ matrix.python-version >= '3.12'}} - run: | - pip install --upgrade pip - pip install ${{ matrix.pastas-version }} setuptools - pip install -e .[test_noarctic] - - name: Run pytest run: | pytest -m "not (bgmap or pastas150)" - name: Run all tests once - if: ${{ matrix.python-version == '3.11' && matrix.pastas-version == 'git+https://github.com/pastas/pastas.git@dev' }} + if: ${{ matrix.python-version == '3.12' && matrix.pastas-version == 'git+https://github.com/pastas/pastas.git@dev' }} run: | pytest -m "" diff --git a/pyproject.toml b/pyproject.toml index 1e4b1a5..0b3dabf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,10 +59,6 @@ pytest = [ "codacy-coverage", ] test = ["pastastore[arcticdb,lint,optional,pytest]", "hydropandas[full]"] -test_noarctic = [ - "pastastore[lint,optional,pytest]", # no arcticdb - "hydropandas[full]", -] docs = [ "pastastore[optional]", "sphinx_rtd_theme", diff --git a/tests/conftest.py b/tests/conftest.py index f6a466c..1f1c5b5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,18 +1,14 @@ # ruff: noqa: D100 D103 import importlib from importlib import metadata -from platform import python_version import pandas as pd import pastas as ps import pytest -from packaging.version import parse as parse_version import pastastore as pst -IS_PY312 = parse_version(python_version()) >= parse_version("3.12.0") - -params = ["dict", "pas", "arcticdb"] if not IS_PY312 else ["dict", "pas"] +params = ["dict", "pas", "arcticdb"] def initialize_project(conn):