From ad33589fac59e8cf51042e7be4c04eb7ad68eb89 Mon Sep 17 00:00:00 2001 From: Justin Findlay Date: Sat, 27 Dec 2014 17:29:03 -0700 Subject: [PATCH] move requirements files into requirements dir --- .travis.yml | 4 ++-- HACKING.rst | 8 ++++---- MANIFEST.in | 8 ++++---- dev_requirements_python26.txt | 3 --- doc/man/salt.7 | 4 ++-- doc/topics/development/tests/index.rst | 4 ++-- pkg/smartos/esky/raet_requirements.txt | 2 +- pkg/smartos/esky/requirements.txt | 4 ++-- pkg/smartos/esky/zeromq_requirements.txt | 4 ++-- raet-requirements.txt | 5 ----- _requirements.txt => requirements/base.txt | 0 cloud-requirements.txt => requirements/cloud.txt | 0 requirements/dev_python26.txt | 3 +++ .../dev_python27.txt | 2 +- opt_requirements.txt => requirements/opt.txt | 0 requirements/raet.txt | 5 +++++ zeromq-requirements.txt => requirements/zeromq.txt | 2 +- setup.py | 8 ++++---- 18 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 dev_requirements_python26.txt delete mode 100644 raet-requirements.txt rename _requirements.txt => requirements/base.txt (100%) rename cloud-requirements.txt => requirements/cloud.txt (100%) create mode 100644 requirements/dev_python26.txt rename dev_requirements_python27.txt => requirements/dev_python27.txt (82%) rename opt_requirements.txt => requirements/opt.txt (100%) create mode 100644 requirements/raet.txt rename zeromq-requirements.txt => requirements/zeromq.txt (61%) diff --git a/.travis.yml b/.travis.yml index e9a8e85cda4..7b4c8ce0e50 100644 --- a/.travis.yml +++ b/.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'" diff --git a/HACKING.rst b/HACKING.rst index 2fa5f47f1d9..47c1d877a08 100644 --- a/HACKING.rst +++ b/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:: diff --git a/MANIFEST.in b/MANIFEST.in index c9e03dc4506..2cc0c36f05d 100644 --- a/MANIFEST.in +++ b/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/* diff --git a/dev_requirements_python26.txt b/dev_requirements_python26.txt deleted file mode 100644 index 8b0b463c9a7..00000000000 --- a/dev_requirements_python26.txt +++ /dev/null @@ -1,3 +0,0 @@ --r dev_requirements_python27.txt - -unittest2 diff --git a/doc/man/salt.7 b/doc/man/salt.7 index 7b5c529b2ed..484a4c6bbe5 100644 --- a/doc/man/salt.7 +++ b/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 diff --git a/doc/topics/development/tests/index.rst b/doc/topics/development/tests/index.rst index 8151e1fc6d2..0d0474a7f70 100644 --- a/doc/topics/development/tests/index.rst +++ b/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:: diff --git a/pkg/smartos/esky/raet_requirements.txt b/pkg/smartos/esky/raet_requirements.txt index 513647d938d..c307ed9581a 100644 --- a/pkg/smartos/esky/raet_requirements.txt +++ b/pkg/smartos/esky/raet_requirements.txt @@ -1,2 +1,2 @@ --r ../../../raet-requirements.txt +-r ../../../requirements/raet.txt -r requirements.txt diff --git a/pkg/smartos/esky/requirements.txt b/pkg/smartos/esky/requirements.txt index 7b11fecdf32..3ecb75a206f 100644 --- a/pkg/smartos/esky/requirements.txt +++ b/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 diff --git a/pkg/smartos/esky/zeromq_requirements.txt b/pkg/smartos/esky/zeromq_requirements.txt index c83ac57efe6..16e3aebb96f 100644 --- a/pkg/smartos/esky/zeromq_requirements.txt +++ b/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 diff --git a/raet-requirements.txt b/raet-requirements.txt deleted file mode 100644 index fd632185bf3..00000000000 --- a/raet-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --r _requirements.txt - -libnacl -ioflo -raet diff --git a/_requirements.txt b/requirements/base.txt similarity index 100% rename from _requirements.txt rename to requirements/base.txt diff --git a/cloud-requirements.txt b/requirements/cloud.txt similarity index 100% rename from cloud-requirements.txt rename to requirements/cloud.txt diff --git a/requirements/dev_python26.txt b/requirements/dev_python26.txt new file mode 100644 index 00000000000..b7b2acf9834 --- /dev/null +++ b/requirements/dev_python26.txt @@ -0,0 +1,3 @@ +-r dev_python27.txt + +unittest2 diff --git a/dev_requirements_python27.txt b/requirements/dev_python27.txt similarity index 82% rename from dev_requirements_python27.txt rename to requirements/dev_python27.txt index b78541d1fb7..38876a05bf1 100644 --- a/dev_requirements_python27.txt +++ b/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 diff --git a/opt_requirements.txt b/requirements/opt.txt similarity index 100% rename from opt_requirements.txt rename to requirements/opt.txt diff --git a/requirements/raet.txt b/requirements/raet.txt new file mode 100644 index 00000000000..98cf9e74f36 --- /dev/null +++ b/requirements/raet.txt @@ -0,0 +1,5 @@ +-r base.txt + +libnacl +ioflo +raet diff --git a/zeromq-requirements.txt b/requirements/zeromq.txt similarity index 61% rename from zeromq-requirements.txt rename to requirements/zeromq.txt index e07d8646f32..12fb294d208 100644 --- a/zeromq-requirements.txt +++ b/requirements/zeromq.txt @@ -1,4 +1,4 @@ --r _requirements.txt +-r base.txt M2Crypto pycrypto diff --git a/setup.py b/setup.py index c3d286d660e..6b5047d2575 100755 --- a/setup.py +++ b/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