Skip to content

Commit

Permalink
Moved the metadata into PEP 621-compliant pyproject.toml. Dropped…
Browse files Browse the repository at this point in the history
… package building with Python 2 and old versions of Python 3 which are unsupported by `setuptools` that has `PEP 621` implemented.
  • Loading branch information
KOLANICH committed Sep 15, 2022
1 parent 0d52e98 commit 87bc095
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 41 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ jobs:
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: mypy imagehash tests/*.py --follow-imports=silent --ignore-missing-imports || true
- name: build wheel
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: python3 -m build -nwx .
- name: Install the built wheel
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: pip install --upgrade ./dist/*.whl
- run: coverage run -m pytest .
- run: coverage run -m pytest ./tests
- name: Convert coverage output to lcov for coveralls
# coverage-lcov requires python 3.6, so we cannot upload results
# from python 2 and 3.5 builds :-(
Expand Down
43 changes: 42 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
[build-system]
requires = ["setuptools>=42.2"]
requires = ["setuptools>=61.2"]
build-backend = "setuptools.build_meta"

[project]
name = "ImageHash"
version = "4.3.0"
authors = [{name = "Johannes Buchner", email = "[email protected]"}]
license = {text = "BSD-2-Clause"}
description = "Image Hashing library"
readme = "README.rst"
dependencies = ["numpy", "scipy", "pillow", "PyWavelets"]

[project.urls]
Homepage = "https://github.com/JohannesBuchner/imagehash"

[project.optional-dependencies]
testing = ["pytest>=3"]

[tool.setuptools]
packages = ["imagehash"]
script-files = ["find_similar_images.py"]
include-package-data = true

[tool.setuptools.package-data]
imagehash = ["py.typed"]

[tool.distutils.bdist_wheel]
universal = 1

[tool.flake8]
count = true
statistics = true
max-line-length = 127
max-complexity = 10
avoid-escape = true
# This ignore differs than autopep8's ignore as to not autofix tabs to spaces, but still warn when mixed
ignore = '''
A001, ; variable "hash" is shadowing a python builtin
W191,E111 ; tabs are prefered indentation;
E117 ; Bug with pycodestyle for Python 2.7 where it thinks everything is over-indented with tabs'''
per-file-ignores = """
; False positive with multiline strings https://github.com/PyCQA/pycodestyle/issues/376
find_similar_images.py: E101"""
39 changes: 0 additions & 39 deletions setup.cfg

This file was deleted.

0 comments on commit 87bc095

Please sign in to comment.