From cc40a7eacc9cd9b6dd38a147888259cfe5d791d2 Mon Sep 17 00:00:00 2001 From: Blaise Thompson Date: Thu, 29 Sep 2022 13:42:00 -0500 Subject: [PATCH] advertise new conda-forge installation option --- README.md | 17 ++++++++++++++++- doc/index.rst | 6 ++++++ doc/installation.rst | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b2aa680..6871d24 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,26 @@ Windows 7. It works with Python 2 (from 2.7) and Python 3. ## Installation -To install this package: +### source + +To install this package from [source](https://github.com/clade/PyDAQmx): 1. Install the NI-DAQmx driver. 2. Run `python setup.py install`. +### PyPI + +To install this package from [PyPI](https://pypi.org/project/PyDAQmx/): + +1. Install the NI-DAQmx driver. +2. Run `python -m pip install PyDAQmx` + +### conda-forge + +To install this package from [conda-forge](https://anaconda.org/conda-forge/pydaqmx): + +1. Install the NI-DAQmx driver +2. Run `conda install -c conda-forge pydaqmx` ## License diff --git a/doc/index.rst b/doc/index.rst index 83f0847..b53ab70 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -41,6 +41,12 @@ or using `pip `_: pip install PyDAQmx +or using `conda-forge `_: + +.. code-block:: sh + + conda install -c conda-forge pydaqmx + You can also directly *move* the :file:`PyDAQmx` directory to a location that Python can import from (the directory in which scripts using :mod:`PyDAQmx` are run, :data:`sys.path`, etc.) diff --git a/doc/installation.rst b/doc/installation.rst index 83063a1..d388adf 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -25,6 +25,12 @@ or using `pip `_: pip install PyDAQmx +or using `conda-forge `_: + +.. code-block:: sh + + conda install -c conda-forge pydaqmx + You can also directly *move* the :file:`PyDAQmx` directory to a location that Python can import from (the directory in which scripts using :mod:`PyDAQmx` are run, :data:`sys.path`, etc.)