Merge branch 'develop' of https://github.com/piotrmaslanka/satella into develop

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [ "3.6", "3.7", "3.8", "pypy3.9", "pypy3.10", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.7", "3.8", "pypy3.9", "pypy3.10", "3.9", "3.10", "3.11", "3.12" ]
     steps:
       - uses: actions/checkout@main
       - uses: actions/setup-python@main
@@ -22,24 +22,23 @@ jobs:
       - name: Test everything
         run: pytest -n 8 -vv --cov=satella
   upload-coverage:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-20.04"
     needs: ["tests"]
     steps:
+      - uses: actions/checkout@main
       - uses: actions/setup-python@main
         with:
-          python-version: '3.10'
+          python-version: '3.8'
       - run: coverage xml
       - uses: caffco/code-climate-github-action@v1.0.0
   build-project:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [ "3.6.15", "3.7.1", "3.8.18", "pypy3.9", "pypy3.10", "3.9", "3.10", "3.11", "3.12" ]
     steps:
+      - uses: actions/checkout@main
       - uses: actions/setup-python@main
         name: Setup Python
         with:
-          python-version: '$${{ matrix.version }}'
+          python-version: '3.8'
           cache: 'pip'
       - name: Update system
         run: |
@@ -52,24 +51,23 @@ jobs:
           echo -e '__version__ = "' > satella/__init__.py
           echo -e '${{ github.event.release.tag_name }}' >> satella/__init__.py
           echo '"' >> satella/__init__.py
-          python -v
       - name: Build
         run: python -m build .
       - name: Archive production artifacts
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@main
         with:
           name: builds
           path: |
              dist
   send-to-pypi:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-20.04"
     needs: ["build-project", "tests"]
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     steps:
       - uses: actions/setup-python@main
         name: Setup Python
         with:
-          python-version: '3.10'
+          python-version: '3.8'
           cache: 'pip'
       - name: Install Twine
         run: pip install twine

CHANGELOG.md

-# v2.24.3
+# v2.25.0
 
 Build system
 ============
 
+* Python 3.6 support dropped as it does not emply pyproject.toml, which is necessary
+  to build this
 * removed Docker unit tests

pyproject.toml

@@ -6,16 +6,17 @@ readme = {file = "README.md", content-type="text/markdown"}
 authors = [
   {name = "Piotr Maślanka", email = "pmaslanka@smok.co"}
 ]
-requires-python = ">= 3.5"
+requires-python = ">= 3.7"
 license = {text="MIT License"}
 keywords = ["ha", "high availability", "scalable", "scalability", "server", "metrics", "tracing", "instrumentation"]
 classifiers = [
    "Programming Language :: Python",
-   "Programming Language :: Python :: 3.5",
-   "Programming Language :: Python :: 3.6",
    "Programming Language :: Python :: 3.7",
    "Programming Language :: Python :: 3.8",
    "Programming Language :: Python :: 3.9",
+   "Programming Language :: Python :: 3.10",
+   "Programming Language :: Python :: 3.11",
+   "Programming Language :: Python :: 3.12",
    "Programming Language :: Python :: Implementation :: CPython",
    "Programming Language :: Python :: Implementation :: PyPy",
    "Operating System :: OS Independent",
@@ -29,8 +30,8 @@ dependencies = ["psutil"]
 version = {attr = "satella.__version__"}
 
 [project.optional-dependencies]
-dev = ["pylint", "pyyaml", "toml", "requests", "opentracing", "codeclimate-test-reporter"]
-test =  ["pytest-cov", "pytest-xdist", "pytest", "pytest-forked", "pluggy", "py", "coverage<4.4"]
+dev = ["pylint", "toml", "requests", "codeclimate-test-reporter"]
+test =  ["pytest-cov", "pytest-xdist", "pytest", "pytest-forked", "pluggy", "py", "coverage"]
 extras = ["requests","pyyaml","toml", "ujson", "cassandra-driver", "opentracing"]
 
 

satella/__init__.py

-__version__ = '2.24.3a2'
+__version__ = '2.25.0a1'