From a15c91dd16ab63a4f1888322b6d66a9ac91d2707 Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Thu, 2 May 2019 14:12:43 +0100 Subject: [PATCH] Update installation information - List python 3 as a supported version - Add information for installing from GitHub --- README.rst | 8 +++++++- doc/source/index.rst | 8 +++++++- setup.py | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index dd23e09..d0d21a1 100644 --- a/README.rst +++ b/README.rst @@ -15,10 +15,16 @@ part of this package to configure and collect measurements from that DAQ. Installation ------------ -:: +From PyPI:: sudo -H pip install daqpower +The latest developement version from GitHub:: + + git clone git@github.com:ARM-software/daq-server.git daq-server + cd daq-server + sudo -H python setup.py install + Usage ----- diff --git a/doc/source/index.rst b/doc/source/index.rst index 8c8fdb7..34d60b8 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -101,7 +101,7 @@ The DAQ power measurement solution is implemented in daqpower Python library, the package which is available for download via pip or from `Github`_. - Install NI-DAQmx driver, as described in the previous section. - - Install Python 2.7. + - Install Python 2.7 or Python3. - Download and install ``pip``, ``numpy`` and ``twisted`` Python packages. These packages have C extensions, an so you will need a native compiler set up if you want to install them from PyPI. As an easier alternative, you can @@ -111,6 +111,12 @@ the package which is available for download via pip or from `Github`_. sudo -H pip install daqpower + Or alternatively install the latest development version from GitHub:: + + git clone git@github.com:ARM-software/daq-server.git daq-server + cd daq-server + sudo -H python setup.py install + This should automatically download and install ``PyDAQmx`` package as well (the Python bindings for the NI-DAQmx driver). diff --git a/setup.py b/setup.py index 9e8cbf6..fb77c3b 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ 'Operating System :: Unix', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', ], )