Merge pull request #47626 from gtmanfred/2017.7

Implement Pipfile and remove extra requirements.txt files

.gitignore

@@ -11,6 +11,8 @@ MANIFEST
 *.wpr
 *.wpu
 *.DS_Store
+.pytest_cache
+Pipfile.lock
 
 # virtualenv
 # - ignores directories of a virtualenv when you create it right on

Pipfile

@@ -0,0 +1,40 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+Jinja2 = "*"
+msgpack-python = ">0.3,!=0.5.5"
+PyYAML = "*"
+MarkupSafe = "*"
+requests = ">=1.0.0"
+tornado = ">=4.2.1,<5.0"
+pycrypto = ">=2.6.1"
+pyzmq = ">=2.2.0"
+
+[dev-packages]
+mock = ">=2.0.0"
+apache-libcloud = ">=0.14.0"
+boto = ">=2.32.1"
+boto3 = ">=1.2.1"
+moto = ">=0.3.6"
+SaltPyLint = ">=v2017.3.6"
+pytest = ">=3.5.0"
+
+[packages.futures]
+# Required by Tornado to handle threads stuff.
+version = ">=2.0"
+markers = "python_version < '3.0'"
+
+[dev-packages.pytest-salt]
+git = "git://github.com/saltstack/pytest-salt.git"
+ref = "master"
+
+[dev-packages.httpretty]
+# httpretty Needs to be here for now even though it's a dependency of boto.
+# A pip install on a fresh system will decide to target httpretty 0.8.10 to
+# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that
+# prevent it from being successfully installed (at least on Python 3.4).
+version = "*"
+markers = "python_version >= '3.4'"

requirements/base-py2.txt

@@ -1,4 +0,0 @@
--r base.txt
-
-# Required by Tornado to handle threads stuff.
-futures>=2.0

requirements/base-py3.txt

@@ -1 +0,0 @@
--r base.txt

requirements/base.txt

@@ -7,4 +7,4 @@ MarkupSafe
 requests>=1.0.0
 tornado>=4.2.1,<5.0
 # Required by Tornado to handle threads stuff.
-futures>=2.0
+futures>=2.0; python_version < '3.0'

requirements/dev.txt

@@ -0,0 +1,16 @@
+-r base.txt
+
+mock>=2.0.0
+apache-libcloud>=0.14.0
+boto>=2.32.1
+boto3>=1.2.1
+moto>=0.3.6
+SaltPyLint>=v2017.3.6
+pytest>=3.5.0
+git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt
+
+# httpretty Needs to be here for now even though it's a dependency of boto.
+# A pip install on a fresh system will decide to target httpretty 0.8.10 to
+# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that
+# prevent it from being successfully installed (at least on Python 3.4).
+httpretty; python_version >= '3.4'

requirements/dev_python27.txt

@@ -1,11 +1,2 @@
--r base-py2.txt
-
-mock>=2.0.0
-apache-libcloud>=0.14.0
-boto>=2.32.1
-boto3>=1.2.1
-moto>=0.3.6
-SaltPyLint>=v2017.3.6
-pytest>=3.5.0
-git+https://github.com/eisensheng/pytest-catchlog.git@develop#egg=Pytest-catchlog
-git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt
+# This is a legacy file, use dev.txt
+-r dev.txt

requirements/dev_python34.txt

@@ -1,15 +1,2 @@
--r base-py3.txt
-
-mock>=2.0.0
-apache-libcloud>=0.14.0
-boto>=2.32.1
-boto3>=1.2.1
-moto>=0.3.6
-# httpretty Needs to be here for now even though it's a dependency of boto.
-# A pip install on a fresh system will decide to target httpretty 0.8.10 to
-# satisfy other requirements, and httpretty 0.8.10 has bugs in setup.py that
-# prevent it from being successfully installed (at least on Python 3.4).
-httpretty
-SaltPyLint>=v2017.2.29
-pytest>=3.5.0
-git+https://github.com/saltstack/pytest-salt.git@master#egg=pytest-salt
+# This is a legacy file, use dev.txt
+-r dev.txt

tests/conftest.py

@@ -102,6 +102,14 @@ def pytest_addoption(parser):
              'SSH server on your machine. In certain environments, this '
              'may be insecure! Default: False'
     )
+    test_selection_group.addoption(
+        '--proxy',
+        '--proxy-tests',
+        dest='ssh',
+        action='store_true',
+        default=False,
+        help='Run proxy tests'
+    )
     test_selection_group.addoption(
         '--run-destructive',
         action='store_true',
@@ -640,7 +648,8 @@ def test_daemon(request):
               ('sysinfo', request.config.getoption('--sysinfo')),
               ('no_colors', request.config.getoption('--no-colors')),
               ('output_columns', request.config.getoption('--output-columns')),
-              ('ssh', request.config.getoption('--ssh')))
+              ('ssh', request.config.getoption('--ssh')),
+              ('proxy', request.config.getoption('--proxy')))
     options = namedtuple('options', [n for n, v in values])(*[v for n, v in values])
     fake_parser = namedtuple('parser', 'options')(options)