From dbb1b256e6f4012cd2aeecf64dbedcaf1548a6d8 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Mon, 25 Mar 2019 21:23:46 +0100 Subject: [PATCH] address @flub review comments, some other fixes --- .travis.yml | 6 +++++- python/README.rst | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c84d65c0..d45e4a24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,10 @@ addons: - python3.5-dev - python-software-properties - doxygen + +services: + - docker + install: - export CC=gcc-7 - export CXX=g++-7 @@ -36,7 +40,7 @@ install: - tar xfv cyrus-sasl2_2.1.27~101-g0780600+dfsg.orig.tar.xz - pushd cyrus-sasl2-2.1.27~101-g0780600+dfsg.orig && ./autogen.sh && make && sudo make install && popd -script: + script: - export BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} - echo "BRANCH=$BRANCH" diff --git a/python/README.rst b/python/README.rst index c894697c..d816a92a 100644 --- a/python/README.rst +++ b/python/README.rst @@ -10,8 +10,7 @@ Installing pre-built packages (linux-only) ========================================== If you have a linux system you may install the ``deltachat`` binary "wheel" package -without any "build-from-source" steps. There are no other platforms yet -with automated +without any "build-from-source" steps. 1. `Install virtualenv `_, then create a fresh python environment and activate it in your shell:: @@ -32,12 +31,11 @@ with automated python -c "import deltachat" -Installing a wheel from a github branch +Installing a wheel from a PR/branch --------------------------------------- -For Linux, we automatically build wheels for all PRs -and push them to a devpi/pypi index which case be used -with ``pip``. For example, to install the latest "master" built:: +For Linux, we automatically build wheels for all github PR branches +and push them to a python package index. To install the latest github master:: pip install -i https://m.devpi.net/dc/master deltachat @@ -46,12 +44,15 @@ Installing bindings from source =============================== If you can't use "binary" method above then you will need -to `install the delta-core C-library `_ before you invoke the ``pip install deltachat`` command above. +to `install the delta-core C-library `_ and then invoke installation of the source bindings:: + + pip install --no-binary deltachat .. note:: - If you can help with provide a way to automate the building of wheels - for Mac or Windows, please provide a PR here or open an issue. + If you can help to automate the building of wheels for Mac or Windows, + that'd be much appreciated! please then get + `in contact with us `_. Code examples