Merge pull request #197 from jim-easterbrook/devel

Devel

Author: jim-easterbrook

.github/workflows/build-wheels.yml

@@ -16,7 +16,7 @@ jobs:
             target: 14.0
     env:
       GPHOTO_DIR: ${{ github.workspace }}/libgphoto2
-      GPHOTO_VSN: 2.5.32
+      GPHOTO_VSN: 2.5.33
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

CHANGELOG.txt

@@ -19,6 +19,9 @@ License along with python-gphoto2.  If not, see
 <https://www.gnu.org/licenses/>.
 
 
+Changes in 2.6.3:
+  1/ Binary wheels include libgphoto2 v2.5.33
+
 Changes in 2.6.2:
   1/ Corrected deprecation of passing a CameraFile object to file_get() and
      capture_preview(). Release 2.6.0 deprecated not passing one.

README.rst

@@ -1,4 +1,4 @@
-python-gphoto2 v\ 2.6.2
+python-gphoto2 v\ 2.6.3
 =======================
 
 python-gphoto2 is a comprehensive Python interface (or binding) to libgphoto2_.

developer/README.rst

@@ -54,6 +54,7 @@ Differences found so far::
     2.5.30    Add gp_init_localedir & gp_port_init_localedir functions
     2.5.31    No change
     2.5.32    Add GP_MIME_MPO, GP_MIME_QTKN, GP_MIME_QTKT, and GP_MIME_RAF constants
+    2.5.33    No change
 
 Documentation
 -------------

developer/build_swig.py

@@ -1,6 +1,6 @@
 # python-gphoto2 - Python interface to libgphoto2
 # http://github.com/jim-easterbrook/python-gphoto2
-# Copyright (C) 2021-23  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2021-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
 #
 # This file is part of python-gphoto2.
 #
@@ -76,7 +76,8 @@ def main(argv=None):
             break
     # make options list
     swig_opts = ['-python', '-nodefaultctor', '-O',
-                 '-Wextra', '-Werror', '-builtin', '-nofastunpack']
+                 '-Wextra', '-Werror', '-builtin', '-nofastunpack',
+                 '-Isrc/gphoto2', '-I-']
     if swig_version < (4, 1, 0):
         swig_opts.append('-py3')
     doc_file = os.path.join('src', 'gphoto2', 'common', 'doc.i')
@@ -86,7 +87,7 @@ def main(argv=None):
     version_opts = ['-outdir', output_dir]
     if os.path.isfile(doc_file):
         version_opts.append(
-            '-DDOC_FILE=' + os.path.basename(doc_file))
+            '-DDOC_FILE=common/' + os.path.basename(doc_file))
     version_opts += gphoto2_include
     # do each swig module
     for ext_name in ext_names:

src/gphoto2/common/preamble.i

@@ -1,6 +1,6 @@
 // python-gphoto2 - Python interface to libgphoto2
 // http://github.com/jim-easterbrook/python-gphoto2
-// Copyright (C) 2017-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+// Copyright (C) 2017-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
 //
 // This file is part of python-gphoto2.
 //
@@ -24,8 +24,8 @@
 #include "gphoto2/gphoto2.h"
 %}
 
-// Include macros and typemaps
-%include "macros.i"
+// Include our macros and swig's typemaps
+%include "common/macros.i"
 %include "typemaps.i"
 
 // Include doxygen documentation

src/swig-gp2_5_32/__init__.py src/swig-gp2_5_33/__init__.pysrc/swig-gp2_5_32/__init__.py renamed to src/swig-gp2_5_33/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "2.6.2"
-__version_tuple__ = tuple((2, 6, 2))
+__version__ = "2.6.3"
+__version_tuple__ = tuple((2, 6, 3))
 
 
 import os