cleanup tests (make them faster)

4 files changed, 45 insertions, 141 deletions

diff --git a/Makefile b/Makefile
index 8c07cdef..5d7b9ae7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,17 @@
 .PHONY: docs
 
 init:
-	pip install pipenv
-	pipenv install --dev
-	pipenv run pip install -e .[socks]
-
+	pip install -r requirements.txt
 test:
 	# This runs all of the tests. To run an individual test, run py.test with
 	# the -k flag, like "py.test -k test_path_is_not_double_encoded"
-	pipenv run py.test tests
+	py.test tests
 
 test-readme:
-	pipenv run python setup.py check -r -s
+	python setup.py check -r -s
 
 coverage:
-	pipenv run py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
-
-certs:
-	curl http://ci.kennethreitz.org/job/ca-bundle/lastSuccessfulBuild/artifact/cacerts.pem -o requests/cacert.pem
+	py.test --cov-config .coveragerc --verbose --cov-report term --cov-report xml --cov=requests tests
 
 publish:
 	pip install 'twine>=1.5.0'
diff --git a/Pipfile b/Pipfile
deleted file mode 100644
index 2bf3c273..00000000
--- a/Pipfile
+++ /dev/null
@@ -1,14 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-
-[dev-packages]
-pytest = ">=2.8.0"
-codecov = "*"
-pytest-httpbin = "==0.0.7"
-pytest-mock = "*"
-pytest-cov = "*"
-alabaster = "*"
-readme_renderer = "*"
-Sphinx = "<=1.5.5"
-PySocks = "*"
\ No newline at end of file
diff --git a/Pipfile.lock b/Pipfile.lock
deleted file mode 100644
index 1652b05b..00000000
--- a/Pipfile.lock
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "a26ef57f42fa3da7d70d1c1decb4e6445a6ff66e47c9094ddc9ab8e1f4c0a5b6"
-        },
-        "requires": {},
-        "sources": [
-            {
-                "url": "https://pypi.python.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {},
-    "develop": {
-        "alabaster": {
-            "version": "==0.7.10"
-        },
-        "appdirs": {
-            "version": "==1.4.3"
-        },
-        "babel": {
-            "version": "==2.4.0"
-        },
-        "click": {
-            "version": "==6.7"
-        },
-        "codecov": {
-            "version": "==2.0.9"
-        },
-        "coverage": {
-            "version": "==4.4.1"
-        },
-        "decorator": {
-            "version": "==4.0.11"
-        },
-        "docutils": {
-            "version": "==0.13.1"
-        },
-        "flask": {
-            "version": "==0.12.2"
-        },
-        "funcsigs": {
-            "version": "==1.0.2"
-        },
-        "httpbin": {
-            "version": "==0.5.0"
-        },
-        "imagesize": {
-            "version": "==0.7.1"
-        },
-        "itsdangerous": {
-            "version": "==0.24"
-        },
-        "jinja2": {
-            "version": "==2.9.6"
-        },
-        "markupsafe": {
-            "version": "==1.0"
-        },
-        "mock": {
-            "version": "==2.0.0"
-        },
-        "packaging": {
-            "version": "==16.8"
-        },
-        "pbr": {
-            "version": "==3.0.0"
-        },
-        "py": {
-            "version": "==1.4.33"
-        },
-        "pygments": {
-            "version": "==2.2.0"
-        },
-        "pyparsing": {
-            "version": "==2.2.0"
-        },
-        "pysocks": {
-            "version": "==1.6.7"
-        },
-        "pytest": {
-            "version": "==3.0.7"
-        },
-        "pytest-cov": {
-            "version": "==2.5.1"
-        },
-        "pytest-httpbin": {
-            "version": "==0.0.7"
-        },
-        "pytest-mock": {
-            "version": "==1.6.0"
-        },
-        "pytz": {
-            "version": "==2017.2"
-        },
-        "requests": {
-            "version": "==2.14.2"
-        },
-        "setuptools": {
-            "version": "==35.0.2"
-        },
-        "six": {
-            "version": "==1.10.0"
-        },
-        "snowballstemmer": {
-            "version": "==1.2.1"
-        },
-        "sphinx": {
-            "version": "==1.5.5"
-        },
-        "werkzeug": {
-            "version": "==0.12.2"
-        }
-    }
-}
diff --git a/requirements.txt b/requirements.txt
index ecf975e2..90f66218 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,41 @@
--e .
\ No newline at end of file
+-e .[socks]
+alabaster==0.7.10
+appdirs==1.4.3
+Babel==2.4.0
+bleach==2.0.0
+certifi==2017.4.17
+chardet==3.0.3
+click==6.7
+codecov==2.0.9
+coverage==4.4.1
+decorator==4.0.11
+docutils==0.13.1
+Flask==0.12.2
+funcsigs==1.0.2
+html5lib==0.999999999
+httpbin==0.5.0
+idna==2.5
+imagesize==0.7.1
+itsdangerous==0.24
+Jinja2==2.9.6
+MarkupSafe==1.0
+mock==2.0.0
+packaging==16.8
+pbr==3.0.1
+py==1.4.33
+Pygments==2.2.0
+pyparsing==2.2.0
+PySocks==1.6.7
+pytest==3.1.0
+pytest-cov==2.5.1
+pytest-httpbin==0.0.7
+pytest-mock==1.6.0
+pytz==2017.2
+readme-renderer==17.2
+requests==2.16.4
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.5.5
+urllib3==1.21.1
+webencodings==0.5.1
+Werkzeug==0.12.2