Merge 49ddb55 into c4124f8

Author: ZPascal

.github/workflows/integrationtest.yml

@@ -28,10 +28,10 @@ jobs:
           cache: 'pip'
 
       - name: Install the requirements
-        run: pip install -r requirements.txt
+        run: pip install pdm && pdm install -g
 
       - name: Execute the integrationtests (http1.1)
-        run: python3 -m unittest discover tests/integrationtest
+        run: PYTHONPATH=$PWD/src python3 -m unittest discover tests/integrationtest
         env:
           GRAFANA_HOST: ${{ secrets.GRAFANA_HOST }}
           GRAFANA_TOKEN: ${{ secrets.GRAFANA_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
         run: sleep 20
 
       - name: Execute the integrationtests (http2)
-        run: python3 -m unittest discover tests/integrationtest
+        run: PYTHONPATH=$PWD/src python3 -m unittest discover tests/integrationtest
         env:
           GRAFANA_HOST: ${{ secrets.GRAFANA_HOST }}
           GRAFANA_TOKEN: ${{ secrets.GRAFANA_TOKEN }}

.github/workflows/publish-to-pypi.yml

@@ -24,22 +24,13 @@ jobs:
           cache: 'pip'
 
       - name: Install the requirements
-        run: pip install -r requirements.txt && pip install setuptools~=65.5.1 mkdocs mkdocs-material
+        run: pip install pdm && pdm install -g && pdm add -g setuptools~=65.5.1 mkdocs mkdocs-material build
 
-      - name: Install pypa/build
-        run: >-
-          python -m
-          pip install
-          build
-          --user
+      - name: Prepare the PyPi documentation
+        run: python3 .github/workflows/scripts/adjust-the-readme-file.py
 
       - name: Build a binary wheel and a source tarball
-        run: >-
-          python -m
-          build
-          --sdist
-          --wheel
-          --outdir dist/
+        run: python -m build --sdist --wheel --outdir dist/
 
       - name: Setup the GitHub user
         run: |

.github/workflows/pull-request-checks.yml

@@ -23,10 +23,10 @@ jobs:
           cache: 'pip'
 
       - name: Install the requirements
-        run: pip install -r requirements.txt
+        run: pip install pdm && pdm install -d -g
 
       - name: Execute the unittests
-        run: python3 -m unittest discover tests/unittests
+        run: PYTHONPATH=$PWD/src python3 -m unittest discover tests/unittests
 
   pr-lint:
     runs-on: ubuntu-latest
@@ -73,10 +73,10 @@ jobs:
           cache: 'pip'
 
       - name: Install the requirements
-        run: pip install -r requirements.txt && pip install pytest-cov coverage-badge
+        run: pip install pdm && pdm install -d -g && pdm add -g pytest-cov coverage-badge
 
       - name: Generate the coverage report
-        run: export PYTHONPATH=$PWD && pytest --junitxml=pytest.xml --cov=. tests/unittests | tee pytest-coverage.txt
+        run: PYTHONPATH=$PWD/src pytest --junitxml=pytest.xml --cov=. tests/unittests | tee pytest-coverage.txt
 
       - name: Execute the coverage checks
         uses: MishaKav/[email protected]
@@ -133,7 +133,7 @@ jobs:
           cache: 'pip'
 
       - name: Install the requirements
-        run: pip install pydoc-markdown==4.6.3 mkdocs mkdocs-material
+        run: pip install pdm && pdm add -g pydoc-markdown==4.6.3 pyyaml==5.3.1 mkdocs mkdocs-material
 
       - name: Generate documentation
         run: pydoc-markdown --render-toc && rm -rf docs/content && mv build/docs/* docs

.github/workflows/scripts/adjust-the-readme-file.py

@@ -0,0 +1,6 @@
+with open("README.md", "r", encoding="utf-8") as fh:
+    coverage_string: str = "![Coverage report](https://github.com/ZPascal/grafana_api_sdk/blob/main/docs/coverage.svg)"
+    long_description: str = fh.read()
+
+with open("README.md", "w", encoding="utf-8") as fh:
+    fh.write(long_description.replace(coverage_string, ""))

README.md

@@ -373,7 +373,7 @@ In general, my focus on this project is to implement and deliver old and new fea
 
 Please be aware to not install the `grafana-api` and `grafana-api-sdk` packages in parallel and the same environment. This result in name clashes, and it's not possible to use the Grafana API SDK.
 
-`pip install grafana-api-sdk`
+`pdm install grafana-api-sdk` or `pip install grafana-api-sdk`
 
 ## Example
 
@@ -434,7 +434,9 @@ model: APIModel = APIModel(host="test", token="test", ssl_context=ssl_ctx)
 If you want to template your JSON document based on a predefined folder structure you can check out one of my other [project](https://github.com/ZPascal/grafana_dashboard_templater) and integrate the functionality inside your code.
 
 ## Contribution
-If you would like to contribute something, have an improvement request, or want to make a change inside the code, please open a pull request.
+If you would like to contribute something, have an improvement request, or want to make a change inside the code, please open a pull request. 
+If you want to make a contribution and open a pull request, please write or adapt the necessary unit tests beforehand. 
+You can install the necessary development requirements for the unit tests by running `pdm install -d` or `pip install pytest-httpx pytest`.
 
 ## Support
 If you need support, or you encounter a bug, please don't hesitate to open an issue.

pdm.lock

@@ -1,6 +1,6 @@
 loaders:
   - type: python
-    search_path: [grafana_api]
+    search_path: [src/grafana_api]
 processors:
   - type: filter
   - type: smart