Merge lp:~sanelson/py3exiv2/bugfix_boost_python_build into lp:py3exiv2

[Sam Nelson]

Fix libboost_python3 library linking issues on Linux. Repair broken tests.

This branch represents a collection of fixes to:

1. Fix build issues on Linux when trying to find libboost_python3
2. Synchronize setup.py files
3. Update code and tests to fix a couple of minor test failures

Unmerged revisions

109. By Sam Nelson on 2020-03-19

Fixed code and tests for NoneType TestXmpTag failing tests for xmp.py

108. By Sam Nelson on 2020-03-19

Fixed expected error type for test_set_value_non_repeatable()

107. By Sam Nelson on 2020-03-19

Added pickling.py back to repo from release package and removed from .bzrignore as this causes tests to fail

106. By Sam Nelson on 2020-03-19

Fixed linux libboost_python build issue and synchronized both setup.py scripts

=== modified file '.bzrignore'
--- .bzrignore	2019-04-13 08:37:44 +0000
+++ .bzrignore	2020-03-19 01:47:23 +0000
@@ -1,7 +1,6 @@
 DSCF0006.JPG
 Cyrillic.jpg
 Hebrew.jpg
-pickling.py
 test_py2.py
 bytearray_vectorC++
 data.txt

=== modified file 'py3exiv2/setup.py'
--- py3exiv2/setup.py	2019-05-28 08:18:03 +0000
+++ py3exiv2/setup.py	2020-03-19 01:47:23 +0000
@@ -21,6 +21,21 @@
 with open(path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
+def get_libboost_linux():
+    """Returns the name of the lib libboost_python 3 on Linux
+       adapted from get_libboost_name() in configure.py and get_libboost_osx() below
+    """
+    places = ['/usr/lib/*/', '/usr/local/lib/']
+    for place in places:
+        lib = place + "libboost_python3*.so"
+        files = glob.glob(lib)
+        for f in files:
+            if not "-mt" in f:
+                return os.path.basename(f).replace("lib", "").split(".")[0]
+
+        print("NOT FOUND", files)
+        sys.exit()
+
 def get_libboost_osx():
     places = ["/usr/local/lib/"]
     for place in places:
@@ -36,7 +51,9 @@
 if platform.system() == "Darwin":
     boostlib = get_libboost_osx()
     print(boostlib)
-
+elif platform.system() == "Linux":
+    boostlib = get_libboost_linux()
+    print(boostlib)
 else:
     boostlib = 'boost_python3'
 

=== modified file 'py3exiv2/src/pyexiv2/xmp.py'
--- py3exiv2/src/pyexiv2/xmp.py	2019-05-28 08:00:12 +0000
+++ py3exiv2/src/pyexiv2/xmp.py	2020-03-19 01:47:23 +0000
@@ -402,6 +402,8 @@
                     value = str(value, 'utf-8')
                 except TypeError:
                     raise XmpValueError(value, type_)
+            elif value is None:
+                raise XmpValueError(value, type_)
             return value
 
         elif type_ == 'Thumbnail':

=== modified file 'py3exiv2/test/iptc.py'
--- py3exiv2/test/iptc.py	2016-08-12 10:59:38 +0000
+++ py3exiv2/test/iptc.py	2020-03-19 01:47:23 +0000
@@ -214,6 +214,6 @@
     def test_set_value_non_repeatable(self):
         tag = IptcTag('Iptc.Application2.ReleaseDate')
         value = [datetime.date.today(), datetime.date.today()]
-        self.failUnlessRaises(KeyError, setattr, tag, 'value', value)
+        self.failUnlessRaises(ValueError, setattr, tag, 'value', value)
 
 

=== added file 'py3exiv2/test/pickling.py'
--- py3exiv2/test/pickling.py	1970-01-01 00:00:00 +0000
+++ py3exiv2/test/pickling.py	2020-03-19 01:47:23 +0000
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+
+# ******************************************************************************
+#
+# Copyright (C) 2010 Olivier Tilloy <[e-mail]>
+# Copyright (C) 2015-2016 Vincent Vande Vyvre <[e-mail]>
+#
+# This file is part of the pyexiv2 distribution.
+#
+# pyexiv2 is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# pyexiv2 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyexiv2; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+#
+# Maintainer: Vincent Vande Vyvre <[e-mail]>
+#
+# ******************************************************************************
+
+from pyexiv2.exif import ExifTag
+from pyexiv2.iptc import IptcTag
+from pyexiv2.xmp import XmpTag
+from pyexiv2.utils import make_fraction, FixedOffset
+
+import unittest
+import pickle
+import datetime
+
+
+class TestPicklingTags(unittest.TestCase):
+
+    def test_pickle_exif_tag(self):
+        tags = []
+        tags.append(ExifTag('Exif.Image.DateTime',
+                            datetime.datetime(2010, 12, 22, 19, 21, 0)))
+        tags.append(ExifTag('Exif.GPSInfo.GPSDateStamp', datetime.date.today()))
+        tags.append(ExifTag('Exif.Image.Copyright', '(C) 2010 Santa Claus'))
+        tags.append(ExifTag('Exif.GPSInfo.GPSVersionID', '0'))
+        tags.append(ExifTag('Exif.Pentax.Temperature', '14'))
+        tags.append(ExifTag('Exif.Photo.UserComment', 'foo bar baz'))
+        tags.append(ExifTag('Exif.Image.BitsPerSample', 8))
+        tags.append(ExifTag('Exif.Image.TimeZoneOffset', 7))
+        tags.append(ExifTag('Exif.Image.ImageWidth', 7492))
+        tags.append(ExifTag('Exif.OlympusCs.ManometerReading', 29))
+        tags.append(ExifTag('Exif.Image.XResolution', make_fraction(7, 3)))
+        tags.append(ExifTag('Exif.Image.BaselineExposure', make_fraction(-7, 3)))
+        tags.append(ExifTag('Exif.Photo.ExifVersion', '0100'))
+        for tag in tags:
+            s = pickle.dumps(tag)
+            t = pickle.loads(s)
+            self.assert_(isinstance(t, ExifTag))
+            self.assertEqual(t.key, tag.key)
+            self.assertEqual(t.type, tag.type)
+            self.assertEqual(t.name, tag.name)
+            self.assertEqual(t.label, tag.label)
+            self.assertEqual(t.description, tag.description)
+            self.assertEqual(t.section_name, tag.section_name)
+            self.assertEqual(t.section_description, tag.section_description)
+            self.assertEqual(t.raw_value, tag.raw_value)
+            self.assertEqual(t.value, tag.value)
+            self.assertEqual(t.human_value, tag.human_value)
+
+    def test_pickle_iptc_tag(self):
+        tags = []
+        tags.append(IptcTag('Iptc.Envelope.FileFormat', [23]))
+        tags.append(IptcTag('Iptc.Application2.Subject', ['foo', 'bar', 'baz']))
+        tags.append(IptcTag('Iptc.Envelope.DateSent', [datetime.date.today()]))
+        tags.append(IptcTag('Iptc.Envelope.TimeSent',
+                            [datetime.time(23, 37, 4, tzinfo=FixedOffset('+', 6, 0))]))
+        tags.append(IptcTag('Iptc.Application2.Preview', ['01001101']))
+        for tag in tags:
+            s = pickle.dumps(tag)
+            t = pickle.loads(s)
+            self.assert_(isinstance(t, IptcTag))
+            self.assertEqual(t.key, tag.key)
+            self.assertEqual(t.type, tag.type)
+            self.assertEqual(t.name, tag.name)
+            self.assertEqual(t.title, tag.title)
+            self.assertEqual(t.description, tag.description)
+            self.assertEqual(t.photoshop_name, tag.photoshop_name)
+            self.assertEqual(t.repeatable, tag.repeatable)
+            self.assertEqual(t.record_name, tag.record_name)
+            self.assertEqual(t.record_description, tag.record_description)
+            self.assertEqual(t.raw_value, tag.raw_value)
+            self.assertEqual(t.value, tag.value)
+
+    def test_pickle_xmp_tag(self):
+        tags = []
+        tags.append(XmpTag('Xmp.dc.subject', ['foo', 'bar', 'baz']))
+        tags.append(XmpTag('Xmp.xmpRights.Marked', True))
+        tags.append(XmpTag('Xmp.xmp.CreateDate', datetime.date.today()))
+        tags.append(XmpTag('Xmp.xmpMM.SaveID', 34))
+        tags.append(XmpTag('Xmp.dc.format', ('image', 'jpeg')))
+        tags.append(XmpTag('Xmp.photoshop.CaptionWriter', 'John Doe'))
+        tags.append(XmpTag('Xmp.dc.source', 'bleh'))
+        tags.append(XmpTag('Xmp.xmpMM.DocumentID', 'http://example.com'))
+        tags.append(XmpTag('Xmp.xmp.BaseURL', 'http://example.com'))
+        tags.append(XmpTag('Xmp.xmpDM.videoPixelAspectRatio', make_fraction(5, 3)))
+        for tag in tags:
+            s = pickle.dumps(tag)
+            t = pickle.loads(s)
+            self.assert_(isinstance(t, XmpTag))
+            self.assertEqual(t.key, tag.key)
+            self.assertEqual(t.type, tag.type)
+            self.assertEqual(t.name, tag.name)
+            self.assertEqual(t.title, tag.title)
+            self.assertEqual(t.description, tag.description)
+            self.assertEqual(t.raw_value, tag.raw_value)
+            self.assertEqual(t.value, tag.value)
+

=== modified file 'py3exiv2/test/xmp.py'
--- py3exiv2/test/xmp.py	2016-08-12 10:59:38 +0000
+++ py3exiv2/test/xmp.py	2020-03-19 01:47:23 +0000
@@ -229,7 +229,7 @@
         self.assertEqual(tag._convert_to_python('Python Software Foundation', 'ProperName'), 
                                                 'Python Software Foundation')
         # Invalid values
-        self.assertRaises(XmpValueError, tag._convert_to_python(None, 'ProperName'))
+        self.assertRaises(XmpValueError, tag._convert_to_python, None, 'ProperName')
 
     def test_convert_to_string_propername(self):
         # Valid values
@@ -249,7 +249,7 @@
         self.assertEqual(tag._convert_to_python(b'Some text with exotic ch\xc3\xa0r\xc3\xa4ct\xc3\xa9r\xca\x90.', 'Text'),
                          'Some text with exotic chàräctérʐ.')
         # Invalid values
-        self.assertRaises(XmpValueError, tag._convert_to_python(None, 'Text'))
+        self.assertRaises(XmpValueError, tag._convert_to_python, None, 'Text')
 
     def test_convert_to_string_text(self):
         # Valid values

=== modified file 'setup.py'
--- setup.py	2019-05-28 08:00:12 +0000
+++ setup.py	2020-03-19 01:47:23 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
+# Replacement setup.py for py3exiv2, that allows building on OSX
+# https://gist.github.com/ndevenish/6410cab393bd8dec1b016061ddb5573b
 
 import sys
 import os
@@ -12,13 +14,28 @@
 
 from codecs import open
 from os import path
-]
+
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the relevant file
 with open(path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
     long_description = f.read()
 
+def get_libboost_linux():
+    """Returns the name of the lib libboost_python 3 on Linux
+       adapted from get_libboost_name() in configure.py and get_libboost_osx() below
+    """
+    places = ['/usr/lib/*/', '/usr/local/lib/']
+    for place in places:
+        lib = place + "libboost_python3*.so"
+        files = glob.glob(lib)
+        for f in files:
+            if not "-mt" in f:
+                return os.path.basename(f).replace("lib", "").split(".")[0]
+
+        print("NOT FOUND", files)
+        sys.exit()
+
 def get_libboost_osx():
     places = ["/usr/local/lib/"]
     for place in places:
@@ -34,13 +51,15 @@
 if platform.system() == "Darwin":
     boostlib = get_libboost_osx()
     print(boostlib)
-
+elif platform.system() == "Linux":
+    boostlib = get_libboost_linux()
+    print(boostlib)
 else:
     boostlib = 'boost_python3'
 
 setup(
     name='py3exiv2',
-    version='0.1.0',
+    version='0.7.1',
     description='A Python3 binding to the library exiv2',
     long_description=long_description,
     url='https://launchpad.net/py3exiv2',
@@ -55,22 +74,24 @@
         'Topic :: Software Development',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
         'Programming Language :: C++',
-        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8'
     ],
     keywords='exiv2 pyexiv2 EXIF IPTC XMP image metadata',
     packages = find_packages('src'),
     package_dir = {'': 'src'},
     package_data={'':['src/*.cpp', 'src/*.hpp',]},
-    # cmdclass={'install': install}
+    #cmdclass={'install': install},
     ext_modules=[
     Extension('libexiv2python',
         ['src/exiv2wrapper.cpp', 'src/exiv2wrapper_python.cpp'],
-        include_dirs=[],
-        library_dirs=[],
         libraries=[boostlib, 'exiv2'],
         extra_compile_args=['-g']
         )
     ],
 )
+