Skip to content

Commit fbacc86

Browse files
Update documentation
1 parent c3a59e9 commit fbacc86

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

INSTALL.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ See the piwheels site for more information.
4949
Dependencies
5050
------------
5151

52-
* Python: http://python.org/ version 3.5 or greater
53-
* libgphoto2: http://www.gphoto.org/proj/libgphoto2/ version 2.5.0 or greater
52+
* Python: http://python.org/ version 3.6 or greater
53+
* libgphoto2: http://www.gphoto.org/proj/libgphoto2/ version 2.5.10 or greater
5454
* build tools: `pkg-config`_, C compiler & linker
5555

5656
In most cases you should use your operating system's package manager to install these.
@@ -146,13 +146,13 @@ Omitting the parameter uses the system installation::
146146
$ python3 developer/build_swig.py
147147

148148
This builds the interface for the version of libgphoto2_ installed on your computer.
149-
The interface files are created in directories with names like ``src/swig-gp2.5.18``.
149+
The interface files are created in directories with names like ``src/swig-gp2_5_18``.
150150
This naming scheme allows for different versions of libgphoto2_.
151151
The most appropriate version is chosen when the interface is built.
152152

153153
As before, pip_ is used to build and install python-gphoto2::
154154

155-
$ GPHOTO2_ROOT=$HOME/.local pip3 install gphoto2 --user --no-binary :all:
155+
$ GPHOTO2_ROOT=$HOME/.local pip3 install --user -v .
156156

157157
Documentation
158158
-------------

developer/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Notes for developers
22
====================
33

4-
The python interfaces can be built with any version of libgphoto2, but functions only present in later versions will not be accessible from python unless the interface is built with that later version. However, using this later version interface with an earlier version of libgphoto2 would normally result in undefined reference errors.
4+
The python interfaces can be built with any recent version of libgphoto2, but functions only present in later versions will not be accessible from python unless the interface is built with that later version. However, using this later version interface with an earlier version of libgphoto2 would normally result in undefined reference errors.
55

66
The solution is to include definitions of new functions in the interface to replace the proper versions when building for an older version of libgphoto2. See the camera.i interface file for an example.
77

@@ -20,12 +20,12 @@ To build python-gphoto2 with a different version of libgphoto2 than the one inst
2020

2121
Note the use of ``--prefix=$PWD/local_install`` to create a local copy, rather than a system installation.
2222

23-
Now you can build and install a wheel that includes your local copy of the libgphoto2 libs::
23+
Now you can build and install a package that includes your local copy of the libgphoto2 libs::
2424

25-
GPHOTO2_ROOT=libgphoto2-2.5.28/local_install pip wheel . -v
26-
pip install gphoto2-*.whl --user
25+
GPHOTO2_ROOT=$PWD/libgphoto2-2.5.28/local_install pip install --user . -v
2726

2827
The ``GPHOTO2_ROOT`` environment variable tells setup.py to use the files in libgphoto2-2.5.28/local_install.
28+
This value needs to be an absolute path.
2929

3030
Tracking libgphoto2 releases
3131
----------------------------

0 commit comments

Comments
 (0)