diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 8bc99d8..3bead1c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -1,66 +1,66 @@ -# This workflow will install Python dependencies, run tests and lint with a variety of Python versions -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - -name: build - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - python-version: ["3.8", "3.9", "3.10", "3.11"] - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install package - run: | - python -m pip install --upgrade pip - python -m pip install flake8 - pip install -r requirements.txt - pip install . - - name: Lint with flake8 - run: | - # stop the build if there are Python syntax errors or undefined names - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - deploy: - runs-on: ubuntu-latest - needs: build - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Check for version change - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - version: - - '**/VERSION.txt' - - if: steps.filter.outputs.version == 'true' - name: Cleanup README - run: | - sed -ri 's/^(##*)\s*:.*:\s*/\1 /g' README.md - awk '{if (match($0,"## Supporters")) exit; print}' README.md > README - mv -f README README.md - - if: steps.filter.outputs.version == 'true' - run: python3 -m pip install --upgrade build && python3 -m build - - if: steps.filter.outputs.version == 'true' - name: Upload to PyPi - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_API_TOKEN }} - verbose: true - verify_metadata: false +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: build + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install package + run: | + python -m pip install --upgrade pip + python -m pip install flake8 + pip install -r requirements.txt + pip install . + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + deploy: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Check for version change + uses: dorny/paths-filter@v2 + id: filter + with: + filters: | + version: + - '**/VERSION.txt' + - if: steps.filter.outputs.version == 'true' + name: Cleanup README + run: | + sed -ri 's/^(##*)\s*:.*:\s*/\1 /g' README.md + awk '{if (match($0,"## Supporters")) exit; print}' README.md > README + mv -f README README.md + - if: steps.filter.outputs.version == 'true' + run: python3 -m pip install --upgrade build && python3 -m build + - if: steps.filter.outputs.version == 'true' + name: Upload to PyPi + uses: pypa/gh-action-pypi-publish@release/v1 + with: + password: ${{ secrets.PYPI_API_TOKEN }} + verbose: true + verify_metadata: false diff --git a/pyproject.toml b/pyproject.toml index e8e6544..fbcd827 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61.0", "setuptools-scm"] +requires = ["setuptools>=70.0", "setuptools-scm"] build-backend = "setuptools.build_meta" [tool.setuptools.dynamic] @@ -28,20 +28,18 @@ classifiers = [ "Intended Audience :: Other Audience", "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Security", ] dependencies = [ - "fonttools>=4.43.0", - "lief>=0.14.0", - "matplotlib>=3.7.4", - "numpy>=1.23.0", - "pillow>=10.0.1", + "fonttools>=4.55.0", + "lief>=0.15.1", + "matplotlib==3.7.5; python_version <= '3.9'", + "matplotlib>=3.9.3; python_version > '3.9'", + "numpy<2; python_version <= '3.9'", + "numpy>=2.1.3; python_version > '3.9'", + "pillow<11; python_version < '3.9'", + "pillow>=11; python_version >= '3.9'", ] dynamic = ["version"] diff --git a/requirements.txt b/requirements.txt index b1598e1..34b4706 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,8 @@ -fonttools>=4.43.0 # fix for SNYK-PYTHON-FONTTOOLS-6133203 -lief>=0.14.0 -matplotlib>=3.7.4 -numpy>=1.23.0 -pillow>=10.0.1 +fonttools>=4.55.0 +lief>=0.15.1 +matplotlib==3.7.5; python_version <= "3.9" +matplotlib>=3.9.3; python_version > "3.9" +numpy<2; python_version <= "3.9" +numpy>=2.1.3; python_version > "3.9" +pillow<11; python_version < '3.9' +pillow>=11; python_version >= '3.9' diff --git a/src/bintropy/VERSION.txt b/src/bintropy/VERSION.txt index 21539a6..0dab710 100644 --- a/src/bintropy/VERSION.txt +++ b/src/bintropy/VERSION.txt @@ -1 +1 @@ -1.5.7 +1.5.8