From e802e26b8907f1d7d443a11ea6b1a670b79c56ea Mon Sep 17 00:00:00 2001 From: bibi21000 Date: Fri, 14 Apr 2017 01:27:56 +0200 Subject: [PATCH] Auto-commit for new-version --- INSTALL_ARCH.rst | 2 ++ INSTALL_MAC.rst | 4 +--- INSTALL_REPO.rst | 2 ++ INSTALL_WIN.rst | 45 ++++++++++--------------------------------- README.rst | 10 +++++----- docs/INSTALL_ARCH.rst | 2 ++ docs/INSTALL_MAC.rst | 4 +--- docs/INSTALL_REPO.rst | 2 ++ docs/INSTALL_WIN.rst | 45 ++++++++++--------------------------------- docs/README.rst | 10 +++++----- 10 files changed, 40 insertions(+), 86 deletions(-) diff --git a/INSTALL_ARCH.rst b/INSTALL_ARCH.rst index 7bdc3783..6a5ff8aa 100755 --- a/INSTALL_ARCH.rst +++ b/INSTALL_ARCH.rst @@ -4,6 +4,8 @@ Installing python-openzwave from archive ======================================== +This method is deprecated for 0.4.X. Use pip with --embed flavor. Look at README. + This is the simplest (and the fastest) way to install python-openzwave. It comes with openzwave source files and is already cythonized. This is surely the best solution to install python-openzwave on a raspberry pi. diff --git a/INSTALL_MAC.rst b/INSTALL_MAC.rst index 9ded5e53..6369ee7f 100755 --- a/INSTALL_MAC.rst +++ b/INSTALL_MAC.rst @@ -4,6 +4,4 @@ Installing python-openzwave on MacOs ==================================== -To be done - -Looking for volunteers +Look at README for 0.4.X installation. diff --git a/INSTALL_REPO.rst b/INSTALL_REPO.rst index 06f1f3a9..14145af0 100755 --- a/INSTALL_REPO.rst +++ b/INSTALL_REPO.rst @@ -4,6 +4,8 @@ Installing python-openzwave from repository =========================================== +This method is deprecated for 0.4.X. Use pip with --git flavor. Look at README. + Install the needed tools ======================== diff --git a/INSTALL_WIN.rst b/INSTALL_WIN.rst index 05d7846f..8c102ef1 100755 --- a/INSTALL_WIN.rst +++ b/INSTALL_WIN.rst @@ -5,6 +5,10 @@ Installing python-openzwave on Windows ====================================== +This HOW-TO is for 0.4.X. + +It should be possible to make it pip friendly. Need a command line to build openzwave c++ lib. + How To Build python-openzwave on Windows with VS2015 ==================================================== @@ -25,7 +29,7 @@ Get sources cd openzwave git checkout Dev cd .. - git checkout python3 + git checkout Build open-zwave @@ -38,43 +42,14 @@ When asked, accept the project upgrade to VS2015 Build Win32|Release -Build python-openzwave lib --------------------------- - -Patch libopenzwave.pyx - -Cause: ValueID has no default constructor and cython needs one for allocating objects on the stack - -Fix: Allocate object on the the heap as a workaround +Build python_openzwave +---------------------- -Open test/python-openzwave/src-lib/libopenzwave/libopenzwave.pyx - -Go to line 437 and change: +From a Command Prompt, install it : .. code-block:: bash - values_map.insert(pair[uint64_t, ValueID](v.GetId(), v)) - -To: - -.. code-block:: bash - - newPair = new pair[uint64_t, ValueID](v.GetId(), v) - values_map.insert(deref(newPair)) - del newPair - -From a Command Prompt, build it : - -.. code-block:: bash - - python setup-lib.py build - python setup-api.py build - -And install it (in a virtualenv if needed) : - -.. code-block:: bash + python setup install --dev - python setup-lib.py install - python setup-api.py install +Reference for 0.3.X : https://github.com/OpenZWave/python-openzwave/issues/53 -Reference : https://github.com/OpenZWave/python-openzwave/issues/53 diff --git a/README.rst b/README.rst index 40fe1bad..3031d74d 100755 --- a/README.rst +++ b/README.rst @@ -65,13 +65,13 @@ python-openzwave 0.4.0 is coming !!! .. code-block:: bash - (venvX) pip install ---egg python_openzwave --install-option="--git" + (venvX) pip install python_openzwave --install-option="--git" To use fresh code from openzwave github : .. code-block:: bash - (venvX) pip install --egg python_openzwave --force --install-option="--git --cleanopzw" + (venvX) pip install python_openzwave --force --install-option="--git --cleanopzw" - If you have build and install openzwave your self, use the dynamic linking : @@ -86,19 +86,19 @@ python-openzwave 0.4.0 is coming !!! .. code-block:: bash (venvX) pip install wheel six 'Louie>=1.1' - (venvX) pip install --egg python_openzwave --force --install-option="--embed" + (venvX) pip install python_openzwave --force --install-option="--embed" For python3 .. code-block:: bash (venvX) pip install wheel six 'PyDispatcher>=2.0.5' - (venvX) pip install --egg python_openzwave --force --install-option="--embed" + (venvX) pip install python_openzwave --force --install-option="--embed" You can update to the last version of python_openzwave using : .. code-block:: bash - (venvX) pip install --egg python_openzwave --force --install-option="--embed --cleanopzw" + (venvX) pip install python_openzwave --force --install-option="--embed --cleanopzw" - At last, you can launch pyozw_check diff --git a/docs/INSTALL_ARCH.rst b/docs/INSTALL_ARCH.rst index 7bdc3783..6a5ff8aa 100755 --- a/docs/INSTALL_ARCH.rst +++ b/docs/INSTALL_ARCH.rst @@ -4,6 +4,8 @@ Installing python-openzwave from archive ======================================== +This method is deprecated for 0.4.X. Use pip with --embed flavor. Look at README. + This is the simplest (and the fastest) way to install python-openzwave. It comes with openzwave source files and is already cythonized. This is surely the best solution to install python-openzwave on a raspberry pi. diff --git a/docs/INSTALL_MAC.rst b/docs/INSTALL_MAC.rst index 9ded5e53..6369ee7f 100755 --- a/docs/INSTALL_MAC.rst +++ b/docs/INSTALL_MAC.rst @@ -4,6 +4,4 @@ Installing python-openzwave on MacOs ==================================== -To be done - -Looking for volunteers +Look at README for 0.4.X installation. diff --git a/docs/INSTALL_REPO.rst b/docs/INSTALL_REPO.rst index 06f1f3a9..14145af0 100755 --- a/docs/INSTALL_REPO.rst +++ b/docs/INSTALL_REPO.rst @@ -4,6 +4,8 @@ Installing python-openzwave from repository =========================================== +This method is deprecated for 0.4.X. Use pip with --git flavor. Look at README. + Install the needed tools ======================== diff --git a/docs/INSTALL_WIN.rst b/docs/INSTALL_WIN.rst index 05d7846f..8c102ef1 100755 --- a/docs/INSTALL_WIN.rst +++ b/docs/INSTALL_WIN.rst @@ -5,6 +5,10 @@ Installing python-openzwave on Windows ====================================== +This HOW-TO is for 0.4.X. + +It should be possible to make it pip friendly. Need a command line to build openzwave c++ lib. + How To Build python-openzwave on Windows with VS2015 ==================================================== @@ -25,7 +29,7 @@ Get sources cd openzwave git checkout Dev cd .. - git checkout python3 + git checkout Build open-zwave @@ -38,43 +42,14 @@ When asked, accept the project upgrade to VS2015 Build Win32|Release -Build python-openzwave lib --------------------------- - -Patch libopenzwave.pyx - -Cause: ValueID has no default constructor and cython needs one for allocating objects on the stack - -Fix: Allocate object on the the heap as a workaround +Build python_openzwave +---------------------- -Open test/python-openzwave/src-lib/libopenzwave/libopenzwave.pyx - -Go to line 437 and change: +From a Command Prompt, install it : .. code-block:: bash - values_map.insert(pair[uint64_t, ValueID](v.GetId(), v)) - -To: - -.. code-block:: bash - - newPair = new pair[uint64_t, ValueID](v.GetId(), v) - values_map.insert(deref(newPair)) - del newPair - -From a Command Prompt, build it : - -.. code-block:: bash - - python setup-lib.py build - python setup-api.py build - -And install it (in a virtualenv if needed) : - -.. code-block:: bash + python setup install --dev - python setup-lib.py install - python setup-api.py install +Reference for 0.3.X : https://github.com/OpenZWave/python-openzwave/issues/53 -Reference : https://github.com/OpenZWave/python-openzwave/issues/53 diff --git a/docs/README.rst b/docs/README.rst index 40fe1bad..3031d74d 100755 --- a/docs/README.rst +++ b/docs/README.rst @@ -65,13 +65,13 @@ python-openzwave 0.4.0 is coming !!! .. code-block:: bash - (venvX) pip install ---egg python_openzwave --install-option="--git" + (venvX) pip install python_openzwave --install-option="--git" To use fresh code from openzwave github : .. code-block:: bash - (venvX) pip install --egg python_openzwave --force --install-option="--git --cleanopzw" + (venvX) pip install python_openzwave --force --install-option="--git --cleanopzw" - If you have build and install openzwave your self, use the dynamic linking : @@ -86,19 +86,19 @@ python-openzwave 0.4.0 is coming !!! .. code-block:: bash (venvX) pip install wheel six 'Louie>=1.1' - (venvX) pip install --egg python_openzwave --force --install-option="--embed" + (venvX) pip install python_openzwave --force --install-option="--embed" For python3 .. code-block:: bash (venvX) pip install wheel six 'PyDispatcher>=2.0.5' - (venvX) pip install --egg python_openzwave --force --install-option="--embed" + (venvX) pip install python_openzwave --force --install-option="--embed" You can update to the last version of python_openzwave using : .. code-block:: bash - (venvX) pip install --egg python_openzwave --force --install-option="--embed --cleanopzw" + (venvX) pip install python_openzwave --force --install-option="--embed --cleanopzw" - At last, you can launch pyozw_check