From dbca8de3dfb07ff673c027e3047d241471bc5d4e Mon Sep 17 00:00:00 2001
From: renardeinside <polarpersonal@gmail.com>
Date: Mon, 24 Jun 2024 23:04:14 +0200
Subject: [PATCH] fix CI

---
 .github/workflows/onpush.yml    | 17 ++++++++---------
 .github/workflows/onrelease.yml |  7 +++----
 Makefile                        |  2 --
 pyproject.toml                  |  3 ++-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/onpush.yml b/.github/workflows/onpush.yml
index 824ad188..f7a1b77a 100644
--- a/.github/workflows/onpush.yml
+++ b/.github/workflows/onpush.yml
@@ -20,12 +20,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: pyproject.toml
+          cache: 'pip'
 
       - name: Install pip
         run: python -m pip install --upgrade pip
@@ -38,18 +37,18 @@ jobs:
 
       - name: Lint
         run: |
-          prospector --profile prospector.yaml
-          black --check .
+          hatch run prospector --profile prospector.yaml
+          hatch run black --check .
 
       - name: Run unit tests
         run: |
           git config --global init.defaultBranch main # to avoid verbose deprecation messages in CI pipeline
-          pytest tests/unit --cov dbx -n auto
+          hatch run pytest tests/unit --cov dbx -n auto
 
       - name: Run integrity tests
         run: |
-          python -m dbx --help
-          python -c "from dbx._version import __version__; print(__version__)"
+          hatch run python -m dbx --help
+          hatch run python -c "from dbx._version import __version__; print(__version__)"
 
       - name: Publish test coverage
         if: startsWith(matrix.os,'ubuntu')
diff --git a/.github/workflows/onrelease.yml b/.github/workflows/onrelease.yml
index 2a364b20..045a07e0 100644
--- a/.github/workflows/onrelease.yml
+++ b/.github/workflows/onrelease.yml
@@ -19,12 +19,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip' # caching pip dependencies
-          cache-dependency-path: setup.py
+          cache: 'pip'
 
       - name: Install pip
         run: python -m pip install --upgrade pip
diff --git a/Makefile b/Makefile
index 74de1cc6..8ffb566d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,6 @@
 SHELL=/bin/bash
 
 
-##############################################################################
-PYTHON_VERSION=3.8.13
 ##############################################################################
 
 ##############################################################################
diff --git a/pyproject.toml b/pyproject.toml
index 29f4f590..50f9a63c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -98,7 +98,7 @@ exclude = '''
 '''
 
 [tool.pytest.ini_options]
-addopts = "-s -p no:warnings --timeout=3600 --ignore-glob='dbx/templates/*'"
+addopts = "-s -p no:warnings --timeout=3600 --ignore-glob='src/dbx/templates/*'"
 log_cli = 1
 log_cli_level = "INFO"
 log_cli_format = "[pytest][%(asctime)s][%(levelname)s][%(module)s][%(funcName)s] %(message)s"
@@ -113,3 +113,4 @@ source = "vcs"
 
 [tool.hatch.build.hooks.vcs]
 version-file = "src/dbx/_version.py"
+