More Maintenance

.github/workflows/oci.yml

@@ -15,8 +15,8 @@ on:
   push:
     tags:
       - '*.*.*'
-  pull_request:
-    branches: [ main ]
+  # pull_request:
+  #   branches: [ main ]
 
   # Allow job to be triggered manually.
   workflow_dispatch:

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.7", "3.11", "3.12" ]
+        python-version: [ "3.8", "3.12" ]
         grafana-version: [ "6.7.6", "7.5.17", "8.5.27", "9.5.18", "10.3.5", "10.4.1" ]
 
     env:
@@ -56,3 +56,14 @@ jobs:
       - name: Run tests
         run: |
           make test
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          files: ./coverage.xml
+          flags: unittests
+          env_vars: OS,PYTHON
+          name: codecov-umbrella
+          fail_ci_if_error: true

.gitignore

@@ -5,3 +5,5 @@
 /.venv*
 /var
 /dist
+.coverage
+coverage.xml

CHANGES.rst

@@ -11,6 +11,7 @@ in progress
 - Dependencies: Updated to ``docopt-ng``
 - Add subcommand ``explore permissions``. Thanks, @meyerder.
 - Added support for Python 3.12
+- Removed support for Python 3.7
 
 2024-03-07 0.18.0
 =================

README.rst

@@ -1,30 +1,41 @@
-.. image:: https://github.com/panodata/grafana-wtf/actions/workflows/tests.yml/badge.svg
+###########
+grafana-wtf
+###########
+
+|
+
+.. start-badges
+
+|ci-tests| |ci-coverage| |license| |pypi-downloads|
+|python-versions| |status| |pypi-version| |grafana-versions|
+
+.. |ci-tests| image:: https://github.com/panodata/grafana-wtf/actions/workflows/tests.yml/badge.svg
     :target: https://github.com/panodata/grafana-wtf/actions/workflows/tests.yml
 
-.. image:: https://img.shields.io/pypi/pyversions/grafana-wtf.svg
+.. |ci-coverage| image:: https://codecov.io/gh/panodata/grafana-wtf/branch/main/graph/badge.svg
+    :target: https://codecov.io/gh/panodata/grafana-wtf
+    :alt: Test suite code coverage
+
+.. |python-versions| image:: https://img.shields.io/pypi/pyversions/grafana-wtf.svg
     :target: https://pypi.org/project/grafana-wtf/
 
-.. image:: https://img.shields.io/pypi/status/grafana-wtf.svg
+.. |status| image:: https://img.shields.io/pypi/status/grafana-wtf.svg
     :target: https://pypi.org/project/grafana-wtf/
 
-.. image:: https://img.shields.io/pypi/v/grafana-wtf.svg
+.. |pypi-version| image:: https://img.shields.io/pypi/v/grafana-wtf.svg
     :target: https://pypi.org/project/grafana-wtf/
 
-.. image:: https://static.pepy.tech/badge/grafana-wtf/month
+.. |pypi-downloads| image:: https://static.pepy.tech/badge/grafana-wtf/month
     :target: https://pypi.org/project/grafana-wtf/
 
-.. image:: https://img.shields.io/pypi/l/grafana-wtf.svg
+.. |license| image:: https://img.shields.io/pypi/l/grafana-wtf.svg
     :target: https://github.com/panodata/grafana-wtf/blob/main/LICENSE
 
-.. image:: https://img.shields.io/badge/Grafana-6.x%20--%2010.x-blue.svg
+.. |grafana-versions| image:: https://img.shields.io/badge/Grafana-6.x%20--%2010.x-blue.svg
     :target: https://github.com/grafana/grafana
     :alt: Supported Grafana versions
 
-|
-
-###########
-grafana-wtf
-###########
+.. end-badges
 
 
 *****

pyproject.toml

@@ -6,7 +6,10 @@ profile = "black"
 src_paths = ["grafana_wtf", "tests"]
 
 [tool.pytest.ini_options]
-addopts = "-ra -q --verbosity=3 --doctest-modules"
+addopts = """
+  -ra -q --verbosity=3 --doctest-modules
+  --cov --cov-report=term-missing --cov-report=xml
+"""
 minversion = "2.0"
 log_level = "DEBUG"
 log_cli_level = "DEBUG"
@@ -15,3 +18,13 @@ testpaths = [
   "tests",
 ]
 xfail_strict = true
+
+[tool.coverage.run]
+branch = false
+source = ["grafana_wtf"]
+
+[tool.coverage.report]
+fail_under = 0
+show_missing = true
+omit = [
+]

setup.py

@@ -11,7 +11,6 @@
 requires = [
     # Core
     "six",
-    'dataclasses; python_version<"3.7"',
     "docopt-ng>=0.6.2,<0.10",
     "munch>=2.5.0,<5",
     "tqdm>=4.60.0,<5",
@@ -34,6 +33,7 @@
 extras = {
     "test": [
         "pytest<9",
+        "pytest-cov<6",
         "lovely-pytest-docker<1",
         "grafanalib==0.7.0",
     ]
@@ -62,7 +62,6 @@
         "Operating System :: Unix",
         "Operating System :: MacOS",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",