move requirements files into requirements dir

.travis.yml

@@ -16,8 +16,8 @@ before_install:
   - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting
 
 install:
-  - pip install -r zeromq-requirements.txt -r cloud-requirements.txt
-  - pip install --allow-all-external -r opt_requirements.txt
+  - pip install -r requirements/zeromq.txt -r requirements/cloud.txt
+  - pip install --allow-all-external -r requirements/opt.txt
 
 before_script:
   - "/home/travis/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pylint --rcfile=.testing.pylintrc salt/ && echo 'Finished Pylint Check Cleanly' || echo 'Finished Pylint Check With Errors'"

HACKING.rst

@@ -163,7 +163,7 @@ ZeroMQ Transport:
 
 .. code-block:: bash
 
-    pip install -r zeromq-requirements.txt
+    pip install -r requirements/zeromq.txt
     pip install psutil
     pip install -e .
 
@@ -180,7 +180,7 @@ RAET Transport:
 
 .. code-block:: bash
 
-    pip install -r raet-requirements.txt
+    pip install -r requirements/raet.txt
     pip install psutil
     pip install -e .
 
@@ -279,9 +279,9 @@ If it is less than 2047, you should increase it with::
 Running the tests
 ~~~~~~~~~~~~~~~~~
 
-For running tests, you'll also need to install ``dev_requirements_python2x.txt``::
+For running tests, you'll also need to install ``requirements/dev_python2x.txt``::
 
-    pip install -r dev_requirements_python2x.txt
+    pip install -r requirements/dev_python2x.txt
 
 Finally you use setup.py to run the tests with the following command::
 

MANIFEST.in

@@ -2,10 +2,10 @@ include AUTHORS
 include HACKING.rst
 include LICENSE
 include README.rst
-include _requirements.txt
-include raet-requirements.txt
-include cloud-requirements.txt
-include zeromq-requirements.txt
+include requirements/base.txt
+include requirements/raet.txt
+include requirements/cloud.txt
+include requirements/zeromq.txt
 include tests/*.py
 recursive-include tests *
 include tests/integration/modules/files/*

dev_requirements_python26.txt

@@ -1,3 +0,0 @@
--r dev_requirements_python27.txt
-
-unittest2

doc/man/salt.7

@@ -19970,8 +19970,8 @@ the lines below, depending on the relevant Python version:
 .sp
 .nf
 .ft C
-pip install \-r dev_requirements_python26.txt
-pip install \-r dev_requirements_python27.txt
+pip install \-r requirements/dev_python26.txt
+pip install \-r requirements/dev_python27.txt
 .ft P
 .fi
 .UNINDENT

doc/topics/development/tests/index.rst

@@ -8,8 +8,8 @@ the lines below, depending on the relevant Python version:
 
 .. code-block:: bash
 
-    pip install -r dev_requirements_python26.txt
-    pip install -r dev_requirements_python27.txt
+    pip install -r requirements/dev_python26.txt
+    pip install -r requirements/dev_python27.txt
 
 .. note::
 

pkg/smartos/esky/raet_requirements.txt

@@ -1,2 +1,2 @@
--r ../../../raet-requirements.txt
+-r ../../../requirements/raet.txt
 -r requirements.txt

pkg/smartos/esky/requirements.txt

@@ -1,4 +1,4 @@
 GitPython==0.3.2.RC1
 halite
--r ../../../opt_requirements.txt
--r ../../../cloud-requirements.txt
+-r ../../../requirements/opt.txt
+-r ../../../requirements/cloud.txt

pkg/smartos/esky/zeromq_requirements.txt

@@ -1,6 +1,6 @@
 # Need to set a specific version of pyzmq, so can't use the main project's requirements file... have to copy it in and modify...
-#-r ../../../zeromq-requirements.txt
--r ../../../_requirements.txt
+#-r ../../../requirements/zeromq.txt
+-r ../../../requirements/base.txt
 M2Crypto
 pycrypto
 pyzmq == 13.1.0

raet-requirements.txt

@@ -1,5 +0,0 @@
--r _requirements.txt
-
-libnacl
-ioflo
-raet

requirements/dev_python26.txt

@@ -0,0 +1,3 @@
+-r dev_python27.txt
+
+unittest2

requirements/dev_python27.txt

@@ -1,4 +1,4 @@
--r _requirements.txt
+-r base.txt
 -e git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting
 
 mock

requirements/raet.txt

@@ -0,0 +1,5 @@
+-r base.txt
+
+libnacl
+ioflo
+raet

requirements/zeromq.txt

@@ -1,4 +1,4 @@
--r _requirements.txt
+-r base.txt
 
 M2Crypto
 pycrypto

setup.py

@@ -102,10 +102,10 @@ except ImportError:
 
 SALT_VERSION = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', 'version.py')
 SALT_VERSION_HARDCODED = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', '_version.py')
-SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), '_requirements.txt')
-SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'zeromq-requirements.txt')
-SALT_CLOUD_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'cloud-requirements.txt')
-SALT_RAET_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'raet-requirements.txt')
+SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'base.txt')
+SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'zeromq.txt')
+SALT_CLOUD_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'cloud.txt')
+SALT_RAET_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'raet.txt')
 SALT_SYSPATHS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', 'syspaths.py')
 
 # Salt SSH Packaging Detection