diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25342af5790b1a45ab98c9e29a3dfb13bfe105fe..527c316b0257c7aae73732d47fdb66a13c097e42 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9814e220caf4d6e9d3be2ae22ff32b7a050b42c4..9dfe3d8cb14166602f59afe8ac6ab5bac4b429cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ -# 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 diff --git a/pyproject.toml b/pyproject.toml index 2a5804f8db32ac462c8136a3bc2fd7b460e72e32..c5424c762fba25e002579ff9583425debb5b8314 100644 --- a/pyproject.toml +++ b/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"] diff --git a/satella/__init__.py b/satella/__init__.py index 3becaa63ca9aeaf5a9dc843ee6d2567d4e76af67..e92ec042c940c33109897171e454a2e27428bc80 100644 --- a/satella/__init__.py +++ b/satella/__init__.py @@ -1 +1 @@ -__version__ = '2.24.3a2' +__version__ = '2.25.0a1'