New Upstream Snapshot - pyssim
Ready changes
Summary
Merged new upstream version: 0.4+git20220620.1.9324d8d (was: 0.2).
Resulting package
Built on 2023-01-20T09:30 (took 6m29s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots pyssimapt install -t fresh-snapshots python3-pyssim
Lintian Result
Diff
diff --git a/.pylintrc b/.pylintrc
deleted file mode 100644
index 46b671e..0000000
--- a/.pylintrc
+++ /dev/null
@@ -1,262 +0,0 @@
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
-ignore=CVS
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-
-[MESSAGES CONTROL]
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time. See also the "--disable" option for examples.
-#enable=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-disable=locally-disabled,too-few-public-methods,too-many-arguments,too-many-locals,too-many-instance-attributes,maybe-no-member,no-member
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html. You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=yes
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-
-[BASIC]
-
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=map,filter,apply,input
-
-# Regular expression which should only match correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression which should only match correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct variable names
-variable-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct attribute names in class
-# bodies
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Regular expression which should only match correct list comprehension /
-# generator expression variable names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=__.*__
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=80
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-# List of optional constructs for which whitespace checking is disabled
-no-space-check=trailing-comma,dict-separator
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-# tab).
-indent-string=' '
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
-
-
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-
-[TYPECHECK]
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamically set).
-ignored-classes=SQLObject
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E0201 when accessed. Python regular
-# expressions are accepted.
-generated-members=REQUEST,acl_users,aq_parent
-
-
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching the beginning of the name of dummy variables
-# (i.e. not used).
-dummy-variables-rgx=_$|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,TERMIOS,Bastion,rexec
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 9168c68..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-language: python
-
-python:
- - 2.7
- - 3.4
- - 3.5
-
-before_install:
- - sudo apt-get update
- - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
- else
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
- fi
- - bash miniconda.sh -b -p $HOME/miniconda
- - export PATH="$HOME/miniconda/bin:$PATH"
- - hash -r
- - conda config --set always_yes yes --set changeps1 no
- - conda update -q conda
- - conda info -a
-
-install:
- - conda create --yes -q -n pyenv python=$TRAVIS_PYTHON_VERSION pillow numpy scipy nose pylint pip
- - source activate pyenv
- - pip install -e .
-
-script:
- - pyssim test-images/test1-1.png test-images/test1-1.png | grep 1
- - pyssim test-images/test1-1.png test-images/test1-2.png | grep 0.998
- - pyssim test-images/test1-1.png "test-images/*" | grep -E " 1| 0.998| 0.672| 0.648" | wc -l | grep 4
- - pyssim --cw --width 128 --height 128 test-images/test1-1.png test-images/test1-1.png | grep 1
- - pyssim --cw --width 128 --height 128 test-images/test3-orig.jpg test-images/test3-rot.jpg | grep 0.938
- - pylint --rcfile=.pylintrc setup.py
- - pylint --rcfile=.pylintrc ssim
diff --git a/CHANGES.md b/CHANGES.md
index 4be81c8..d6bcb46 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,16 @@
# Changelog
+## 0.4
+
+- Packaging fixes.
+
+## 0.3
+
+- Drop support for Python 3.2, add support for 3.4 and 3.5.
+- Now licensed under MIT.
+- Normalize gaussian kernel to fix issue #9.
+- Added support for CW-SSIM algorithm.
+
## 0.2
- Library now works on Python 3.2.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..8aaacee
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,4 @@
+include LICENSE.md README.md CHANGES.md AUTHORS.md
+include SSIM_CW-SSIM_comparison.ipynb
+graft test-images
+recursive-include tests *.py
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..5688665
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,11 @@
+Metadata-Version: 2.1
+Name: pyssim
+Version: 0.5
+Summary: Module for computing Structured Similarity Image Metric (SSIM) in Python
+Home-page: https://github.com/jterrace/pyssim
+Author: Antoine Vacavant, Christopher Godfrey, Jeff Terrace
+Author-email: jterrace@gmail.com
+License: MIT License
+Platform: any
+License-File: LICENSE.md
+License-File: AUTHORS.md
diff --git a/README.md b/README.md
index 3b895de..393d557 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Original code written by Antoine Vacavant from
http://isit.u-clermont1.fr/~anvacava/code.html, with modifications by
Christopher Godfrey and Jeff Terrace.
-[](http://travis-ci.org/#!/jterrace/pyssim)
+
## Installation
@@ -32,10 +32,8 @@ Christopher Godfrey and Jeff Terrace.
## Compatibility
-pyssim is known to work with Python 2.7 and 3.2 and we test these versions on
-Travis CI to make sure they keep working. 2.6 and 3.3 will probably work, but
-we omit them from testing due to complications with setting them up on Travis
-CI.
+pyssim is known to work with Python 2.7, 3.4 and 3.5 and we test these versions
+on Travis CI to make sure they keep working.
## Development
@@ -59,4 +57,4 @@ To test:
* [1] Z. Wang, A. C. Bovik, H. R. Sheikh and E. P. Simoncelli. Image quality assessment: From error visibility to structural similarity. IEEE Transactions on Image Processing, 13(4):600--612, 2004.
* [2] Z. Wang and A. C. Bovik. Mean squared error: Love it or leave it? - A new look at signal fidelity measures. IEEE Signal Processing Magazine, 26(1):98--117, 2009.
-* [3] Z. Wang and E.P. Simoncelli. Translation Insensitive Image Similarity in Complex Wavelet Domain. Acoustics, Speech, and Signal Processing, 2005. Proceedings. (ICASSP '05). IEEE International Conference on , vol.2, no., pp.573,576, March 18-23, 2005
\ No newline at end of file
+* [3] Z. Wang and E.P. Simoncelli. Translation Insensitive Image Similarity in Complex Wavelet Domain. Acoustics, Speech, and Signal Processing, 2005. Proceedings. (ICASSP '05). IEEE International Conference on , vol.2, no., pp.573,576, March 18-23, 2005
diff --git a/SSIM_CW-SSIM_comparison.ipynb b/SSIM_CW-SSIM_comparison.ipynb
index d510c7f..e713ffd 100644
--- a/SSIM_CW-SSIM_comparison.ipynb
+++ b/SSIM_CW-SSIM_comparison.ipynb
@@ -9,6 +9,7 @@
"outputs": [],
"source": [
"%matplotlib inline\n",
+ "import time\n",
"import numpy as np\n",
"\n",
"import matplotlib.pyplot as plt\n",
@@ -198,13 +199,16 @@
}
],
"source": [
+ "start = time.time()\n",
"ssim_rot = SSIM(im, gaussian_kernel_1d).ssim_value(im_rot)\n",
"ssim_lig = SSIM(im, gaussian_kernel_1d).ssim_value(im_lig)\n",
"ssim_cro = SSIM(im, gaussian_kernel_1d).ssim_value(im_cro)\n",
+ "end = time.time()\n",
"\n",
"print(\"SSIM of rotated image %.4f\" % ssim_rot)\n",
"print(\"SSIM of modified lighting image %.4f\" % ssim_lig)\n",
- "print(\"SSIM of cropped image %.4f\" % ssim_cro)"
+ "print(\"SSIM of cropped image %.4f\" % ssim_cro)\n",
+ "print(\"Elapsed time of SSIM is %.6fs\" % (end - start))"
]
},
{
@@ -225,13 +229,16 @@
}
],
"source": [
+ "start = time.time()\n",
"cw_ssim_rot = SSIM(im).cw_ssim_value(im_rot)\n",
"cw_ssim_lig = SSIM(im).cw_ssim_value(im_lig)\n",
"cw_ssim_cro = SSIM(im).cw_ssim_value(im_cro)\n",
+ "end = time.time()\n",
"\n",
"print(\"CW-SSIM of rotated image %.4f\" % cw_ssim_rot)\n",
"print(\"CW-SSIM of modified lighting image %.4f\" % cw_ssim_lig)\n",
- "print(\"CW-SSIM of cropped image %.4f\" % cw_ssim_cro)"
+ "print(\"CW-SSIM of cropped image %.4f\" % cw_ssim_cro)\n",
+ "print(\"Elapsed time of CW-SSIM is %.6fs\" % (end - start))"
]
}
],
diff --git a/debian/changelog b/debian/changelog
index 28f44ca..05a8a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyssim (0.4+git20220620.1.9324d8d-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 20 Jan 2023 09:25:57 -0000
+
pyssim (0.2-3) unstable; urgency=medium
[ Debian Janitor ]
diff --git a/pyssim.egg-info/PKG-INFO b/pyssim.egg-info/PKG-INFO
new file mode 100644
index 0000000..5688665
--- /dev/null
+++ b/pyssim.egg-info/PKG-INFO
@@ -0,0 +1,11 @@
+Metadata-Version: 2.1
+Name: pyssim
+Version: 0.5
+Summary: Module for computing Structured Similarity Image Metric (SSIM) in Python
+Home-page: https://github.com/jterrace/pyssim
+Author: Antoine Vacavant, Christopher Godfrey, Jeff Terrace
+Author-email: jterrace@gmail.com
+License: MIT License
+Platform: any
+License-File: LICENSE.md
+License-File: AUTHORS.md
diff --git a/pyssim.egg-info/SOURCES.txt b/pyssim.egg-info/SOURCES.txt
new file mode 100644
index 0000000..4f73101
--- /dev/null
+++ b/pyssim.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+AUTHORS.md
+CHANGES.md
+LICENSE.md
+MANIFEST.in
+README.md
+SSIM_CW-SSIM_comparison.ipynb
+setup.cfg
+setup.py
+pyssim.egg-info/PKG-INFO
+pyssim.egg-info/SOURCES.txt
+pyssim.egg-info/dependency_links.txt
+pyssim.egg-info/entry_points.txt
+pyssim.egg-info/requires.txt
+pyssim.egg-info/top_level.txt
+ssim/__init__.py
+ssim/__main__.py
+ssim/compat.py
+ssim/ssimlib.py
+ssim/utils.py
+test-images/test1-1.png
+test-images/test1-2.png
+test-images/test2-1.png
+test-images/test2-2.png
+test-images/test3-cro.jpg
+test-images/test3-lig.jpg
+test-images/test3-orig.jpg
+test-images/test3-rot.jpg
\ No newline at end of file
diff --git a/pyssim.egg-info/dependency_links.txt b/pyssim.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/pyssim.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/pyssim.egg-info/entry_points.txt b/pyssim.egg-info/entry_points.txt
new file mode 100644
index 0000000..3f320da
--- /dev/null
+++ b/pyssim.egg-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+pyssim = ssim.__main__:main
diff --git a/requirements.txt b/pyssim.egg-info/requires.txt
similarity index 67%
rename from requirements.txt
rename to pyssim.egg-info/requires.txt
index c554ba3..6759d38 100644
--- a/requirements.txt
+++ b/pyssim.egg-info/requires.txt
@@ -1,4 +1,3 @@
-pillow
numpy
+pillow
scipy
-argparse
diff --git a/pyssim.egg-info/top_level.txt b/pyssim.egg-info/top_level.txt
new file mode 100644
index 0000000..63609b4
--- /dev/null
+++ b/pyssim.egg-info/top_level.txt
@@ -0,0 +1 @@
+ssim
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..9effb0e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,7 @@
+[wheel]
+universal = True
+
+[egg_info]
+tag_build =
+tag_date = 0
+
diff --git a/setup.py b/setup.py
index adb811e..3ac248a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,45 +3,16 @@
from setuptools import find_packages
from setuptools import setup
-install_requires = [] # pylint: disable=invalid-name
-
-# pylint: disable=import-error
-# pylint: disable=unused-import
-# pylint: disable=wrong-import-order
-# pylint: disable=wrong-import-position
-try:
- import PIL
-except ImportError:
- try:
- import Image
- except ImportError:
- install_requires.append('pillow')
-
-try:
- import numpy
-except ImportError:
- install_requires.append('numpy')
-
-try:
- import scipy
-except ImportError:
- install_requires.append('scipy')
-
-try:
- import argparse
-except ImportError:
- install_requires.append('argparse')
-
setup(
name='pyssim',
- version='0.2',
+ version='0.5',
description=('Module for computing Structured Similarity Image Metric '
'(SSIM) in Python'),
author='Antoine Vacavant, Christopher Godfrey, Jeff Terrace',
author_email='jterrace@gmail.com',
platforms=['any'],
license='MIT License',
- install_requires=install_requires,
+ install_requires=['numpy', 'pillow', 'scipy'],
url='https://github.com/jterrace/pyssim',
entry_points={
'console_scripts': [
diff --git a/ssim/compat.py b/ssim/compat.py
index dd484f8..09b9bf3 100644
--- a/ssim/compat.py
+++ b/ssim/compat.py
@@ -7,7 +7,7 @@ import sys
# pylint: disable=import-error
# pylint: disable=invalid-name
# pylint: disable=redefined-builtin
-# pylint: disable=redefined-variable-type
+# pylint: disable=ungrouped-imports
# pylint: disable=unused-import
try:
diff --git a/test-images/test1-1.png b/test-images/test1-1.png
new file mode 100644
index 0000000..90798af
Binary files /dev/null and b/test-images/test1-1.png differ
diff --git a/test-images/test1-2.png b/test-images/test1-2.png
new file mode 100644
index 0000000..a8d96b4
Binary files /dev/null and b/test-images/test1-2.png differ
diff --git a/test-images/test2-1.png b/test-images/test2-1.png
new file mode 100644
index 0000000..cb369db
Binary files /dev/null and b/test-images/test2-1.png differ
diff --git a/test-images/test2-2.png b/test-images/test2-2.png
new file mode 100644
index 0000000..e33d3b6
Binary files /dev/null and b/test-images/test2-2.png differ
diff --git a/test-images/test3-cro.jpg b/test-images/test3-cro.jpg
new file mode 100644
index 0000000..8b04bdd
Binary files /dev/null and b/test-images/test3-cro.jpg differ
diff --git a/test-images/test3-lig.jpg b/test-images/test3-lig.jpg
new file mode 100644
index 0000000..21875bd
Binary files /dev/null and b/test-images/test3-lig.jpg differ
diff --git a/test-images/test3-orig.jpg b/test-images/test3-orig.jpg
new file mode 100644
index 0000000..2502791
Binary files /dev/null and b/test-images/test3-orig.jpg differ
diff --git a/test-images/test3-rot.jpg b/test-images/test3-rot.jpg
new file mode 100644
index 0000000..0324e82
Binary files /dev/null and b/test-images/test3-rot.jpg differ
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.5.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.5.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.5.egg-info/entry_points.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.5.egg-info/requires.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.5.egg-info/top_level.txt
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.2.egg-info/PKG-INFO -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.2.egg-info/dependency_links.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.2.egg-info/entry_points.txt -rw-r--r-- root/root /usr/lib/python3/dist-packages/pyssim-0.2.egg-info/top_level.txt
No differences were encountered between the control files of package pyssim
Control files of package python3-pyssim: lines which differ (wdiff format)
Depends: python3:any, python3-numpy, python3-pil, python3-scipy python3-scipy, python3:any