From 2fa809ee33b3ea58fdb260111d3f3926ffb050e8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Jun 2014 00:31:22 +0100 Subject: [PATCH 1/2] `requirements.txt` should have been removed. --- requirements.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69de29bb2..0000000000 From badd67c43abdd84d85ebd401c07bb5caaffab3fe Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Jun 2014 00:37:00 +0100 Subject: [PATCH 2/2] Differentiate ZeroMQ from RAET installations. Refs #13687 --- HACKING.rst | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 4c2a0b3017..ff7cfdaed3 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -162,12 +162,19 @@ Activate the virtualenv:: source /path/to/your/virtualenv/bin/activate -Install Salt (and dependencies) into the virtualenv:: +Install Salt (and dependencies) into the virtualenv. - pip install -r requirements.txt +ZeroMQ Transport: + +.. code-block:: bash + + pip install -r zeromq-requirements.txt pip install psutil pip install -e . + +.. note:: Installing M2Crypto + .. note:: Installing M2Crypto You may need ``swig`` and ``libssl-dev`` to build M2Crypto. If you @@ -177,6 +184,15 @@ Install Salt (and dependencies) into the virtualenv:: env SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" pip install M2Crypto +RAET Transport: + +.. code-block:: bash + + pip install -r raet-requirements.txt + pip install psutil + pip install -e . + + Running a self-contained development version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~