diff --git a/.github/workflows/make_package.sh b/.github/workflows/make_package.sh index c1fe450..c89782d 100644 --- a/.github/workflows/make_package.sh +++ b/.github/workflows/make_package.sh @@ -61,12 +61,6 @@ make_wheels(){ done } -## Make wheel packages for any platform -# plat_type= -# plat_name=any -# EXIV2_LIB_FILE=$EXIV2_LIB_FILES -# make_wheels - # Make wheel packages for Linux platform plat_type=linux plat_name=manylinux2014_x86_64 diff --git a/pyexiv2/lib/__init__.py b/pyexiv2/lib/__init__.py index 9b1e96b..a3d954e 100644 --- a/pyexiv2/lib/__init__.py +++ b/pyexiv2/lib/__init__.py @@ -19,15 +19,15 @@ sys_name = platform.system() or 'Unknown' if sys_name == 'Linux': ctypes.CDLL(os.path.join(lib_dir, 'libexiv2.so')) - sys.path.append(os.path.join(lib_dir, 'py{}-linux'.format(py_version))) + sys.path.append(os.path.join(lib_dir, 'py{}-linux'.format(py_version.replace('.','')))) import exiv2api elif sys_name == 'Darwin': ctypes.CDLL(os.path.join(lib_dir, 'libexiv2.dylib')) - sys.path.append(os.path.join(lib_dir, 'py{}-darwin'.format(py_version))) + sys.path.append(os.path.join(lib_dir, 'py{}-darwin'.format(py_version.replace('.','')))) import exiv2api elif sys_name == 'Windows': ctypes.CDLL(os.path.join(lib_dir, 'exiv2.dll')) - sys.path.append(os.path.join(lib_dir, 'py{}-win'.format(py_version))) + sys.path.append(os.path.join(lib_dir, 'py{}-win'.format(py_version.replace('.','')))) import exiv2api else: raise RuntimeError('pyexiv2 can only run on Linux, Darwin or Windows system. But your system is {} .'.format(sys_name)) diff --git a/pyexiv2/lib/py35-darwin/__init__.py b/pyexiv2/lib/py35-darwin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.5-darwin/exiv2api.so b/pyexiv2/lib/py35-darwin/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.5-darwin/exiv2api.so rename to pyexiv2/lib/py35-darwin/exiv2api.so diff --git a/pyexiv2/lib/py35-linux/__init__.py b/pyexiv2/lib/py35-linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.5-linux/exiv2api.so b/pyexiv2/lib/py35-linux/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.5-linux/exiv2api.so rename to pyexiv2/lib/py35-linux/exiv2api.so diff --git a/pyexiv2/lib/py35-win/__init__.py b/pyexiv2/lib/py35-win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.5-win/exiv2api.pyd b/pyexiv2/lib/py35-win/exiv2api.pyd similarity index 100% rename from pyexiv2/lib/py3.5-win/exiv2api.pyd rename to pyexiv2/lib/py35-win/exiv2api.pyd diff --git a/pyexiv2/lib/py36-darwin/__init__.py b/pyexiv2/lib/py36-darwin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.6-darwin/exiv2api.so b/pyexiv2/lib/py36-darwin/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.6-darwin/exiv2api.so rename to pyexiv2/lib/py36-darwin/exiv2api.so diff --git a/pyexiv2/lib/py36-linux/__init__.py b/pyexiv2/lib/py36-linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.6-linux/exiv2api.so b/pyexiv2/lib/py36-linux/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.6-linux/exiv2api.so rename to pyexiv2/lib/py36-linux/exiv2api.so diff --git a/pyexiv2/lib/py36-win/__init__.py b/pyexiv2/lib/py36-win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.6-win/exiv2api.pyd b/pyexiv2/lib/py36-win/exiv2api.pyd similarity index 100% rename from pyexiv2/lib/py3.6-win/exiv2api.pyd rename to pyexiv2/lib/py36-win/exiv2api.pyd diff --git a/pyexiv2/lib/py37-darwin/__init__.py b/pyexiv2/lib/py37-darwin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.7-darwin/exiv2api.so b/pyexiv2/lib/py37-darwin/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.7-darwin/exiv2api.so rename to pyexiv2/lib/py37-darwin/exiv2api.so diff --git a/pyexiv2/lib/py37-linux/__init__.py b/pyexiv2/lib/py37-linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.7-linux/exiv2api.so b/pyexiv2/lib/py37-linux/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.7-linux/exiv2api.so rename to pyexiv2/lib/py37-linux/exiv2api.so diff --git a/pyexiv2/lib/py37-win/__init__.py b/pyexiv2/lib/py37-win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.7-win/exiv2api.pyd b/pyexiv2/lib/py37-win/exiv2api.pyd similarity index 100% rename from pyexiv2/lib/py3.7-win/exiv2api.pyd rename to pyexiv2/lib/py37-win/exiv2api.pyd diff --git a/pyexiv2/lib/py38-darwin/__init__.py b/pyexiv2/lib/py38-darwin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.8-darwin/exiv2api.so b/pyexiv2/lib/py38-darwin/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.8-darwin/exiv2api.so rename to pyexiv2/lib/py38-darwin/exiv2api.so diff --git a/pyexiv2/lib/py38-linux/__init__.py b/pyexiv2/lib/py38-linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.8-linux/exiv2api.so b/pyexiv2/lib/py38-linux/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.8-linux/exiv2api.so rename to pyexiv2/lib/py38-linux/exiv2api.so diff --git a/pyexiv2/lib/py38-win/__init__.py b/pyexiv2/lib/py38-win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.8-win/exiv2api.pyd b/pyexiv2/lib/py38-win/exiv2api.pyd similarity index 100% rename from pyexiv2/lib/py3.8-win/exiv2api.pyd rename to pyexiv2/lib/py38-win/exiv2api.pyd diff --git a/pyexiv2/lib/py39-darwin/__init__.py b/pyexiv2/lib/py39-darwin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.9-darwin/exiv2api.so b/pyexiv2/lib/py39-darwin/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.9-darwin/exiv2api.so rename to pyexiv2/lib/py39-darwin/exiv2api.so diff --git a/pyexiv2/lib/py39-linux/__init__.py b/pyexiv2/lib/py39-linux/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.9-linux/exiv2api.so b/pyexiv2/lib/py39-linux/exiv2api.so similarity index 100% rename from pyexiv2/lib/py3.9-linux/exiv2api.so rename to pyexiv2/lib/py39-linux/exiv2api.so diff --git a/pyexiv2/lib/py39-win/__init__.py b/pyexiv2/lib/py39-win/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyexiv2/lib/py3.9-win/exiv2api.pyd b/pyexiv2/lib/py39-win/exiv2api.pyd similarity index 100% rename from pyexiv2/lib/py3.9-win/exiv2api.pyd rename to pyexiv2/lib/py39-win/exiv2api.pyd diff --git a/setup.py b/setup.py index 27ca0d3..a310322 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setuptools.setup( name='pyexiv2', - version='2.6.1', + version='2.6.2', author='LeoHsiao', author_email='leohsiao@foxmail.com', description='Read/Write metadata(including EXIF, IPTC, XMP), comment and ICC Profile embedded in digital images.',