Skip to content

Commit

Permalink
Updated outdated python setup.py install
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Aug 30, 2022
1 parent a771c9e commit 90182bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
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
- run: python setup.py install
- name: Test install from setup.py
run: pip install .
- run: coverage run -m pytest .
- run: COVERALLS_REPO_TOKEN=mEQ4sldJtlrG3RzjGVD32EYrjUIj4YCV3 coveralls
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import sys

try:
from setuptools import setup
Expand All @@ -11,9 +10,6 @@
with open('README.rst') as f:
long_description = f.read()

# Fixes a version conflict between numpy and scipy on python 3.9+
scipy = "scipy" if sys.version_info < (3, 9) else "scipy>=1.7"

setup(
name='ImageHash',
version='4.2.1',
Expand All @@ -31,7 +27,7 @@
install_requires=[
"six",
"numpy",
scipy, # for phash
'scipy', # for phash
"pillow", # or PIL
"PyWavelets", # for whash
],
Expand Down

0 comments on commit 90182bd

Please sign in to comment.