Skip to content

Commit

Permalink
Update installation information
Browse files Browse the repository at this point in the history
- List python 3 as a supported version
- Add information for installing from GitHub
  • Loading branch information
marcbonnici authored and setrofim committed May 2, 2019
1 parent ab7eb99 commit a15c91d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
8 changes: 7 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:ARM-software/daq-server.git daq-server
cd daq-server
sudo -H python setup.py install


Usage
-----
Expand Down
8 changes: 7 additions & 1 deletion doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 [email protected]: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).
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
'Operating System :: Unix',
'Operating System :: Microsoft :: Windows',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
],
)

Expand Down

0 comments on commit a15c91d

Please sign in to comment.