update template

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/cookiecutter-dvc-plugin",
-  "commit": "13d5c9b49c49d3c14106cb4f9aa61d07876c039b",
+  "commit": "fef394b15f2800a69b5ee11ddcc9e4c5339ae5f5",
   "checkout": null,
   "context": {
     "cookiecutter": {

.github/workflows/release.yaml

@@ -1,23 +1,30 @@
 name: Release
+
 on:
   release:
     types: [published]
+
+permissions:
+  contents: read
+
 jobs:
   pip:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+    - uses: actions/setup-python@v3
       with:
         python-version: 3.8
-    - name: Build packages
+    - name: Install
       run: |
-        pip install -U pip
-        pip install -U build setuptools>=58.2
-        python -m build --sdist --wheel --outdir dist/
+        pip install --upgrade pip wheel
+        pip install build twine
+    - name: Build
+      run: |
+        python -m build
+        twine check dist/*
     - name: Publish packages to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:

.github/workflows/tests.yaml

@@ -1,42 +1,21 @@
 name: Tests
 
 on:
-  pull_request: {}
-  push: {}
+  push:
+    branches: [main]
+  pull_request:
   schedule:
     - cron: '5 1 * * *'  # every day at 01:05
-
   workflow_dispatch:
 
-env:
-  DVC_TEST: "true"
-  HOMEBREW_NO_AUTO_UPDATE: 1
-  SHELL: /bin/bash
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
 
 jobs:
-  lint:
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-    steps:
-    - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.9.1
-      with:
-        access_token: ${{ github.token }}
-    - uses: actions/checkout@v2.4.0
-      with:
-        fetch-depth: 0
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2.2.2
-      with:
-        python-version: 3.8
-    - name: Install requirements
-      run: |
-        pip install wheel
-        pip install -e '.[tests]'
-        pip install git+https://github.com/iterative/dvc pre-commit
-    - name: Check README
-      run: python setup.py checkdocs
-    - uses: pre-commit/action@v2.0.3
   tests:
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}

.github/workflows/tests.yaml.rej

@@ -0,0 +1,66 @@
+diff a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml	(rejected hunks)
+@@ -44,46 +23,36 @@ jobs:
+       fail-fast: false
+       matrix:
+         os: [ubuntu-20.04, windows-latest, macos-latest]
+-        pyv: ["3.8", "3.9", "3.10"]
+-        exclude:
+-          # no wheels for pygit2 yet
+-          - os: windows-latest
+-            pyv: "3.10"
++        pyv: ["3.8", "3.9", "3.10", "3.11"]
++
+     steps:
+-    - uses: actions/checkout@v2.4.0
++    - uses: actions/checkout@v3
+       with:
+         fetch-depth: 0
++  
+     - name: Set up Python
+-      uses: actions/setup-python@v2.2.2
++      uses: actions/setup-python@v4
+       with:
+         python-version: ${{ matrix.pyv }}
+-    - name: get pip cache dir
+-      id: pip-cache-dir
+-      run: |
+-        echo "::set-output name=dir::$(pip cache dir)"
+-    - name: set pip cache
+-      id: pip-cache
+-      uses: actions/cache@v2.1.6
+-      with:
+-        path: ${{ steps.pip-cache-dir.outputs.dir }}
+-        key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
+-        restore-keys: |
+-          ${{ runner.os }}-pip-
++        cache: 'pip'
++        cache-dependency-path: setup.cfg
++
+     - name: install
+-      if: steps.cache.pip-cache-dir.cache-hit != 'true'
+       run: |
+-        pip install --upgrade pip setuptools wheel
++        pip install --upgrade pip wheel
+         pip install -e ".[tests]"
+-        pip install "dvc[testing]@git+https://github.com/iterative/dvc"
+-    - name: setup git
+-      run: |
+-        git config --global user.email "dvctester@example.com"
+-        git config --global user.name "DVC Tester"
++        pip install "dvc[testing] @ git+https://github.com/iterative/dvc"
++
++    - name: lint
++      timeout-minutes: 10
++      uses: pre-commit/action@v3.0.0
++
+     - name: run tests
+-      timeout-minutes: 40
++      timeout-minutes: 15
+       run: pytest -v -n=auto --cov-report=xml --cov-report=term
++
+     - name: upload coverage report
+-      uses: codecov/codecov-action@v2.1.0
++      uses: codecov/codecov-action@v3
+       with:
+         file: ./coverage.xml
+         fail_ci_if_error: false

.github/workflows/update-template.yaml

@@ -3,14 +3,13 @@ name: Update template
 on:
   schedule:
     - cron: '5 1 * * *'  # every day at 01:05
-
   workflow_dispatch:
 
 jobs:
   update:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install deps
       run: pip install cruft
     - name: Update template
@@ -25,4 +24,3 @@ jobs:
         commit-message: update template
         title: update template
         token: ${{ secrets.WORKFLOW_TOKEN }}
-

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
           - flake8-comprehensions
           - flake8-debugger
           - flake8-string-format
-    repo: https://gitlab.com/pycqa/flake8
+    repo: https://github.com/pycqa/flake8
     rev: 3.9.2
   - repo: local
     hooks:

dvc_webdav/tests/cloud.py.rej

@@ -0,0 +1,9 @@
+diff a/dvc_webdav/tests/cloud.py b/dvc_webdav/tests/cloud.py	(rejected hunks)
+@@ -1,6 +1,7 @@
+ from dvc.testing.cloud import Cloud
+ from dvc.testing.path_info import CloudURLInfo
+
++
+ class WEBDAV(Cloud, CloudURLInfo):
+     @property
+     def config(self):

dvc_webdav/tests/conftest.py.rej

@@ -0,0 +1,6 @@
+diff a/dvc_webdav/tests/conftest.py b/dvc_webdav/tests/conftest.py	(rejected hunks)
+@@ -1,3 +1,3 @@
+ from dvc.testing.fixtures import *  # noqa, pylint: disable=wildcard-import,unused-import
+-from .fixtures import *  # noqa, pylint: disable=wildcard-import,unused-import
+
++from .fixtures import *  # noqa, pylint: disable=wildcard-import,unused-import

dvc_webdav/tests/fixtures.py.rej

@@ -0,0 +1,6 @@
+diff a/dvc_webdav/tests/fixtures.py b/dvc_webdav/tests/fixtures.py	(rejected hunks)
+@@ -19,4 +19,3 @@ def make_webdav():
+ @pytest.fixture
+ def webdav(make_webdav):
+     return make_webdav()
+-

dvc_webdav/tests/test_dvc.py.rej

@@ -0,0 +1,93 @@
+diff a/dvc_webdav/tests/test_dvc.py b/dvc_webdav/tests/test_dvc.py	(rejected hunks)
+@@ -1,54 +1,60 @@
+ import pytest
+-from dvc.testing.test_api import TestAPI  # noqa, pylint: disable=unused-import
+-from dvc.testing.test_remote import (  # noqa, pylint: disable=unused-import
++from dvc.testing.api_tests import (  # noqa, pylint: disable=unused-import
++    TestAPI,
++)
++from dvc.testing.remote_tests import (  # noqa, pylint: disable=unused-import
+     TestRemote,
+ )
+-from dvc.testing.test_workspace import (  # noqa, pylint: disable=unused-import
+-    TestAdd,
+-    TestImport,
++from dvc.testing.workspace_tests import TestAdd as _TestAdd
++from dvc.testing.workspace_tests import (  # noqa, pylint: disable=unused-import
++    TestGetUrl,
++)
++from dvc.testing.workspace_tests import TestImport as _TestImport
++from dvc.testing.workspace_tests import (  # noqa, pylint: disable=unused-import
++    TestLsUrl,
+ )
+
+
+ @pytest.fixture
+-def cloud_name():
+-    return "webdav"
+-
+-@pytest.fixture
+-def remote(make_remote, cloud_name):
+-    yield make_remote(name="upstream", typ=cloud_name)
++def cloud(make_cloud):
++    yield make_cloud(typ="webdav")
+
+
+ @pytest.fixture
+-def workspace(make_workspace, cloud_name):
+-    yield make_workspace(name="workspace", typ=cloud_name)
++def remote(make_remote):
++    yield make_remote(name="upstream", typ="webdav")
+
+
+ @pytest.fixture
+-def stage_md5():
+-    raise NotImplementedError
+-
++def workspace(make_workspace):
++    yield make_workspace(name="workspace", typ="webdav")
+
+-@pytest.fixture
+-def is_object_storage():
+-    raise NotImplementedError
+
++class TestImport(_TestImport):
++    @pytest.fixture
++    def stage_md5(self):
++        raise NotImplementedError
+
+-@pytest.fixture
+-def dir_md5():
+-    raise NotImplementedError
+
++    @pytest.fixture
++    def is_object_storage(self):
++        raise NotImplementedError
+
+-@pytest.fixture
+-def hash_name():
+-    raise NotImplementedError
+
++    @pytest.fixture
++    def dir_md5(self):
++        raise NotImplementedError
+
+-@pytest.fixture
+-def hash_value():
+-    raise NotImplementedError
+
++class TestAdd(_TestAdd):
++    @pytest.fixture
++    def hash_name(self):
++        raise NotImplementedError
+
+-@pytest.fixture
+-def dir_hash_value(dir_md5):
+-    raise NotImplementedError
++    @pytest.fixture
++    def hash_value(self):
++        raise NotImplementedError
+
++    @pytest.fixture
++    def dir_hash_value(self):
++        raise NotImplementedError

setup.cfg

@@ -17,6 +17,7 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [options]
 setup_requires =