From fc464135d9003546431a791b917fa6aaf878d820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saugat=20Pachhai=20=28=E0=A4=B8=E0=A5=8C=E0=A4=97=E0=A4=BE?= =?UTF-8?q?=E0=A4=A4=29?= Date: Fri, 1 Mar 2024 12:41:14 +0545 Subject: [PATCH] test on 3.12; prune deps and cleanup --- .github/workflows/benchmarks.yaml | 2 +- .github/workflows/tests.yaml | 6 ++---- dvc_azure/tests/benchmarks.py | 4 ++++ pyproject.toml | 34 ++++++++----------------------- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.github/workflows/benchmarks.yaml b/.github/workflows/benchmarks.yaml index 683194a..c28fdee 100644 --- a/.github/workflows/benchmarks.yaml +++ b/.github/workflows/benchmarks.yaml @@ -63,7 +63,7 @@ jobs: - name: run benchmarks timeout-minutes: 180 - run: pytest --dist no --benchmark-save benchmarks-azure --benchmark-group-by func --dvc-revs main,2.45.0,2.41.1,2.40.0,2.39.0,2.18.1,2.11.0 --size ${DATASET} dvc_azure/tests/benchmarks.py --dvc-install-deps azure + run: pytest --dist no --benchmark-save benchmarks-azure --benchmark-group-by func --dvc-revs main,2.45.0,2.41.1,2.40.0,2.39.0,2.18.1,2.11.0 --dataset ${DATASET} dvc_azure/tests/benchmarks.py --dvc-install-deps azure - name: upload raw results uses: actions/upload-artifact@v3 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3bda856..1356280 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,15 +23,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, windows-latest, macos-latest] - # NOTE: 3.12 is temporarily disabled waiting for - # https://github.com/fsspec/universal_pathlib/pull/152 - pyv: ["3.9", "3.10", "3.11"] + pyv: ["3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 with: fetch-depth: 0 - + - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/dvc_azure/tests/benchmarks.py b/dvc_azure/tests/benchmarks.py index 12b417a..c9c062c 100644 --- a/dvc_azure/tests/benchmarks.py +++ b/dvc_azure/tests/benchmarks.py @@ -1 +1,5 @@ # pylint: disable=unused-import + +from dvc.testing.benchmarks.cli.stories.use_cases.test_sharing import ( + test_sharing as test_sharing_azure, # noqa: F401 +) diff --git a/pyproject.toml b/pyproject.toml index 94dc023..4201283 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,32 +34,16 @@ dependencies = [ ] [project.optional-dependencies] +dev = [ + "dvc-azure[tests]", + "mypy==1.8.0", +] tests = [ - "wheel==0.37.0", "dvc[testing]", - # Test requirements - "pytest==6.2.5", - "pytest-cov==3.0.0", - "pytest-xdist==2.4.0", - "pytest-mock==3.6.1", - "pytest-lazy-fixture==0.6.3", - "pytest-servers[azure]>=0.3.0", - "flaky==3.7.0", - "mock==4.0.3", - "wget==3.2", - "filelock==3.3.2", - "xmltodict==0.12.0", - # required by collective.checkdocs - "Pygments==2.10.0", - "collective.checkdocs==0.2", - "pydocstyle==6.1.1", - # type-checking - "mypy==0.981", - "types-requests==2.25.11", - "types-tabulate==0.8.3", - "types-toml==0.10.1", - # optional dependencies - 'pywin32>=225; sys_platform == "win32"', + "pytest>=7,<9", + "pytest-cov>=4.1.0", + "pytest-xdist>=3.2", + "pytest-servers[azure]>=0.4.0", ] [project.urls] @@ -68,7 +52,7 @@ Source = "https://github.com/iterative/dvc-azure" [tool.pytest.ini_options] log_level = "debug" -addopts = "-ra" +addopts = "-ra -pdvc.testing.plugin" markers = [ "needs_internet: Might need network access for the tests", ]