Skip to content

Commit 0d52e98

Browse files
committed
Moved the metadata into setup.cfg. Dropped deprecated distutils. Added pyproject.toml.
1 parent 8c774c0 commit 0d52e98

File tree

4 files changed

+29
-37
lines changed

4 files changed

+29
-37
lines changed

.github/workflows/testing.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ jobs:
5454
- name: Check typing with mypy
5555
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
5656
run: mypy imagehash tests/*.py --follow-imports=silent --ignore-missing-imports || true
57-
- name: Test install from setup.py
58-
run: pip install .
57+
- name: build wheel
58+
run: python3 -m build -nwx .
59+
- name: Install the built wheel
60+
run: pip install --upgrade ./dist/*.whl
5961
- run: coverage run -m pytest .
6062
- name: Convert coverage output to lcov for coveralls
6163
# coverage-lcov requires python 3.6, so we cannot upload results

pyproject.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[build-system]
2+
requires = ["setuptools>=42.2"]
3+
build-backend = "setuptools.build_meta"

setup.cfg

+22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
1+
[metadata]
2+
name = ImageHash
3+
version = 4.3.0
4+
author = Johannes Buchner
5+
author_email = [email protected]
6+
license = BSD-2-Clause
7+
description = Image Hashing library
8+
url = https://github.com/JohannesBuchner/imagehash
9+
long_description = file: README.rst
10+
long_description_content_type = text/x-rst
11+
112
[bdist_wheel]
213
universal = 1
314

15+
[options]
16+
packages = imagehash
17+
install_requires = numpy; scipy; pillow; PyWavelets
18+
scripts = find_similar_images.py
19+
test_suite = tests
20+
tests_require = pytest>=3
21+
22+
[options.package_data]
23+
imagehash = py.typed
24+
425
[flake8]
526
count = True
627
statistics = True
@@ -15,3 +36,4 @@ ignore=
1536
per-file-ignores=
1637
; False positive with multiline strings https://github.com/PyCQA/pycodestyle/issues/376
1738
find_similar_images.py: E101
39+

setup.py

-35
This file was deleted.

0 commit comments

Comments
 (0)