Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved the metadata into PEP 621-compliant pyproject.toml. #174

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: |
conda install -c anaconda -c conda-forge --file requirements-linting-old.txt coverage-lcov mypy types-six typed-ast
- name: install build dependencies
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: pip install --upgrade pip setuptools build
- name: Preinstall dependencies (Python 2.7) from anaconda
if: ${{ matrix.python-version == '2.7' }}
run: |
Expand All @@ -54,9 +57,13 @@ jobs:
- name: Check typing with mypy
if: ${{ !((matrix.python-version == '2.7') || (matrix.python-version == '3.5')) }}
run: mypy imagehash tests/*.py --follow-imports=silent --ignore-missing-imports || true
- name: Test install from setup.py
run: pip install .
- run: coverage run -m pytest .
- 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 ./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
29 changes: 29 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[build-system]
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
3 changes: 0 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[bdist_wheel]
universal = 1

[flake8]
count = True
statistics = True
Expand Down
35 changes: 0 additions & 35 deletions setup.py

This file was deleted.