From d76d74d6c56f5ca033d7e5dd2bb863b76ab6619a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moise=CC=81s=20Guimara=CC=83es?= Date: Sun, 15 May 2016 15:03:07 -0300 Subject: [PATCH] updates Linux deps on README --- Vagrantfile | 12 ++++++------ wrapper/include.am | 32 ++++++++++++++++++++++++++++++++ wrapper/python/README.rst | 18 ++++++++++++++++++ wrapper/python/tox.ini | 3 ++- 4 files changed, 58 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ddf37ce83..ee7b4c49f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,13 +8,13 @@ apt-get update apt-get install -y git autoconf libtool make valgrind libpq-dev -URL=https://sourceforge.net/projects/levent/files/libevent -LIB=libevent-2.0 -VER=22-stable +URL=https://github.com/libevent/libevent/releases/download/release +LIB=libevent +VER=2.0.22-stable -wget -q $URL/$LIB/$LIB.$VER.tar.gz && tar -zxf $LIB.$VER.tar.gz -cd $LIB.$VER/ && ./autogen.sh && ./configure -q && make -s -sudo make install && cd .. && rm -rf $LIB.$VER* +wget -q $URL-$VER/$LIB-$VER.tar.gz && tar -zxf $LIB-$VER.tar.gz +cd $LIB-$VER/ && ./autogen.sh && ./configure -q && make -s +sudo make install && cd .. && rm -rf $LIB-$VER* DST=wolfssl diff --git a/wrapper/include.am b/wrapper/include.am index bb61de307..6da65d42b 100644 --- a/wrapper/include.am +++ b/wrapper/include.am @@ -28,3 +28,35 @@ EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/Properties/Resources.Designer.cs EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/Properties/Resources.resx EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/wolfSSL_CSharp.csproj + +# wolfcrypt python wrapper files +EXTRA_DIST+= wrapper/python/docs +EXTRA_DIST+= wrapper/python/docs/_static +EXTRA_DIST+= wrapper/python/docs/_templates +EXTRA_DIST+= wrapper/python/docs/asymmetric.rst +EXTRA_DIST+= wrapper/python/docs/conf.py +EXTRA_DIST+= wrapper/python/docs/digest.rst +EXTRA_DIST+= wrapper/python/docs/index.rst +EXTRA_DIST+= wrapper/python/docs/mac.rst +EXTRA_DIST+= wrapper/python/docs/Makefile +EXTRA_DIST+= wrapper/python/docs/random.rst +EXTRA_DIST+= wrapper/python/docs/symmetric.rst +EXTRA_DIST+= wrapper/python/LICENSING.rst +EXTRA_DIST+= wrapper/python/MANIFEST.in +EXTRA_DIST+= wrapper/python/README.rst +EXTRA_DIST+= wrapper/python/requirements-testing.txt +EXTRA_DIST+= wrapper/python/setup.py +EXTRA_DIST+= wrapper/python/test +EXTRA_DIST+= wrapper/python/test/test_ciphers.py +EXTRA_DIST+= wrapper/python/test/test_hashes.py +EXTRA_DIST+= wrapper/python/test/test_random.py +EXTRA_DIST+= wrapper/python/tox.ini +EXTRA_DIST+= wrapper/python/wolfcrypt +EXTRA_DIST+= wrapper/python/wolfcrypt/__about__.py +EXTRA_DIST+= wrapper/python/wolfcrypt/__init__.py +EXTRA_DIST+= wrapper/python/wolfcrypt/build_ffi.py +EXTRA_DIST+= wrapper/python/wolfcrypt/ciphers.py +EXTRA_DIST+= wrapper/python/wolfcrypt/exceptions.py +EXTRA_DIST+= wrapper/python/wolfcrypt/hashes.py +EXTRA_DIST+= wrapper/python/wolfcrypt/random.py +EXTRA_DIST+= wrapper/python/wolfcrypt/utils.py diff --git a/wrapper/python/README.rst b/wrapper/python/README.rst index ea7cbfd1a..8e81382cc 100644 --- a/wrapper/python/README.rst +++ b/wrapper/python/README.rst @@ -19,6 +19,15 @@ You can install ``wolfcrypt`` via ``pip`` or ``source code``, but before installing it, make sure you have ``wolfssl`` C library installed in your machine. +**Linux ONLY:** Make sure you have ``python-dev``, ``python3-dev``, +``python-pip`` and ``libffi-dev`` installed: + +.. code-block:: console + + $ sudo apt-get update + $ sudo apt-get install python-dev python3-dev python-pip libffi-dev + + To install wolfssl do: .. code-block:: console @@ -30,6 +39,12 @@ To install wolfssl do: $ make $ sudo make install +**Linux ONLY:** Update your dynamic linker bindings with: + +.. code-block:: console + + $ sudo ldconfig + wolfcrypt pip installation ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -94,5 +109,8 @@ Test ``wolfcrypt`` locally with ``tox``: ... _________________________________ summary _________________________________ py27: commands succeeded + SKIPPED: py34: InterpreterNotFound: python3.4 py35: commands succeeded congratulations :) + +Note that some tests might be skipped if you don't have the proper interpreter. diff --git a/wrapper/python/tox.ini b/wrapper/python/tox.ini index 9cb8be548..98ec7f995 100644 --- a/wrapper/python/tox.ini +++ b/wrapper/python/tox.ini @@ -1,5 +1,6 @@ [tox] -envlist=py27,py35 +envlist=py27,py34,py35 +skip_missing_interpreters=true [testenv] deps=-rrequirements-testing.txt