diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index afbce896a..25d70849f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -30,6 +30,7 @@ jobs: - name: Install requirements run: | pip install --upgrade pip setuptools wheel + pip install collective.checkdocs==0.2 pip install ".[dev]" pre-commit - name: Check README run: python setup.py checkdocs diff --git a/pyproject.toml b/pyproject.toml index 8c125efc1..284868d51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=48", "wheel", "setuptools_scm[toml]>=6.3.1"] +requires = ["setuptools>=48", "setuptools_scm[toml]>=6.3.1", "setuptools_scm_git_archive==1.1"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] diff --git a/setup.cfg b/setup.cfg index 97b465cd2..460316e8c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -121,7 +121,6 @@ webdhfs_kerberos = requests-kerberos==0.14.0 terraform = tpi[ssh]>=2.1.0 tests = %(terraform)s - wheel==0.37.1 dvc_ssh==0.0.1a0 # Test requirements pytest==7.1.1 @@ -135,9 +134,6 @@ tests = mock==4.0.3 pytest-timeout==2.1.0 filelock==3.6.0 - dvclive[image]==0.6.0 - collective.checkdocs==0.2 - pydocstyle==6.1.1 # pylint requirements pylint==2.12.2 # we use this to suppress pytest-related false positives in our tests. @@ -147,11 +143,12 @@ tests = pylint-plugin-utils==0.7 # type-checking mypy==0.942 - types-requests==2.27.15 - types-tabulate==0.8.6 - types-toml==0.10.4 + types-requests>=2.27.15 + types-tabulate>=0.8.6 + types-toml>=0.10.4 # optional dependencies pywin32>=225; sys_platform == 'win32' + dvclive[image]==0.6.0 [options.packages.find] exclude = diff --git a/tests/func/test_live.py b/tests/func/test_live.py index e5aca8859..b3186ba97 100644 --- a/tests/func/test_live.py +++ b/tests/func/test_live.py @@ -8,6 +8,9 @@ from funcy import first from dvc import stage as stage_module from dvc.render.match import get_files +pytest.importorskip("dvclive", reason="no dvclive") + + LIVE_SCRIPT = dedent( """ from dvclive import Live @@ -60,11 +63,6 @@ LIVE_CHECKPOINT_SCRIPT = dedent( @pytest.fixture def live_stage(tmp_dir, scm, dvc, mocker): - try: - import dvclive # noqa, pylint:disable=unused-import - except ImportError: - pytest.skip("no dvclive") - mocker.patch("dvc.stage.run.Monitor.AWAIT", 0.01) def make( @@ -156,11 +154,6 @@ def test_live_html(tmp_dir, dvc, live_stage, html): @pytest.fixture def live_checkpoint_stage(tmp_dir, scm, dvc, mocker): - try: - import dvclive # noqa, pylint:disable=unused-import - except ImportError: - pytest.skip("no dvclive") - mocker.patch("dvc.stage.run.Monitor.AWAIT", 0.01) def make(live=None, live_no_cache=None):