Merge pull request #14 from vmalloc/ayalas/improvments

vmalloc · web-flow · commit 4be4848ad1d7 · 2019-05-01T08:49:56.000+03:00
Ayalas/improvments
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 .vagrant
 *.egg-info
+.eggs
 build
 .tox
 flycheck-*
diff --git a/.pylintrc b/.pylintrc
@@ -0,0 +1,8 @@
+[MESSAGES CONTROL]
+disable= R,attribute-defined-outside-init,bad-continuation,bad-option-value,bare-except,invalid-name,locally-disabled,missing-docstring,redefined-builtin,ungrouped-imports,wrong-import-order,wrong-import-position,unnecessary-pass,global-statement
+
+[REPORTS]
+reports=no
+
+[FORMAT]
+max-line-length=150
diff --git a/Makefile b/Makefile
@@ -1,13 +1,12 @@
 default: test
 
 test: env
-	.env/bin/py.test tests
+	.env/bin/pytest tests
+	.env/bin/pylint --rcfile .pylintrc flask_loopback tests setup.py
 
 env: .env/.up-to-date
 
 .env/.up-to-date: setup.py Makefile
 	python -m virtualenv .env
-	.env/bin/pip install -e .
-	.env/bin/pip install pytest
+	.env/bin/pip install -e ".[testing]"
 	touch $@
-
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![Build Status] (https://secure.travis-ci.org/vmalloc/Flask-Loopback.png ) &nbsp; ![Version] (https://img.shields.io/pypi/v/Flask-Loopback.svg )
+![Build Status](https://secure.travis-ci.org/vmalloc/Flask-Loopback.png) &nbsp; ![Version](https://img.shields.io/pypi/v/Flask-Loopback.svg)
 
 Overview
 ========
diff --git a/flask_loopback/__version__.py b/flask_loopback/__version__.py
@@ -1 +1,3 @@
-__version__ = "1.4.7"
+import pkg_resources
+
+__version__ = pkg_resources.get_distribution('Flask-Loopback').version
diff --git a/flask_loopback/_compat.py b/flask_loopback/_compat.py
@@ -1,3 +1,4 @@
+# pylint: disable=import-error,unused-import
 from contextlib import contextmanager
 import gzip
 import sys
diff --git a/flask_loopback/flask_loopback.py b/flask_loopback/flask_loopback.py
@@ -77,7 +77,7 @@ def handle_request(self, session, url, request):
                     return e.response
 
             self._test_client.cookie_jar.clear()
-            for cookie in request._cookies:
+            for cookie in request._cookies:  # pylint: disable=protected-access
                 self._test_client.cookie_jar.set_cookie(cookie)
             resp = self._test_client.open(path, **open_kwargs)
             returned = requests.Response()
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,6 @@
+requests
+Flask
+URLObject
+
+unittest2; python_version<'2.7'
+contextlib2; python_version<'3.3'
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,26 @@
+[metadata]
+name = Flask-Loopback
+classifiers =
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+summary = Library for faking HTTP requests using flask applications without actual network operations
+description-file =
+    README.md
+description-content-type = text/markdown
+license = BSD3
+author = Rotem Yaari
+author_email = vmalloc@gmail.com
+url = https://github.com/vmalloc/flask-loopback
+
+[extras]
+testing =
+    pytest
+    astroid~=1.5.3; python_version=='2.7'
+    astroid>=2.0; python_version >= '3.4'
+    pylint~=1.7.2; python_version=='2.7'
+    pylint~=2.3.1; python_version >= '3.4'
+
+[tool:pytest]
+testpaths = tests
diff --git a/setup.py b/setup.py
@@ -1,38 +1,9 @@
-import os
-import sys
-from setuptools import setup, find_packages
+#!/usr/bin/env python
+from setuptools import setup
 
-with open(os.path.join(os.path.dirname(__file__), "flask_loopback", "__version__.py")) as version_file:
-    exec(version_file.read()) # pylint: disable=W0122
 
-_INSTALL_REQUIERS = [
-    "requests",
-    "Flask",
-    "URLObject",
-]
-
-if sys.version_info < (2, 7):
-    _INSTALL_REQUIERS.append("unittest2")
-
-if sys.version_info < (3, 3):
-    _INSTALL_REQUIERS.append("contextlib2")
-
-setup(name="Flask-Loopback",
-      classifiers = [
-          "Programming Language :: Python :: 2.6",
-          "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3.3",
-          ],
-      description="Library for faking HTTP requests using flask applications without actual network operations",
-      license="BSD3",
-      author="Rotem Yaari",
-      author_email="vmalloc@gmail.com",
-      version=__version__, # pylint: disable=E0602
-      packages=find_packages(exclude=["tests"]),
-
-      url="https://github.com/vmalloc/flask-loopback",
-
-      install_requires=_INSTALL_REQUIERS,
-      scripts=[],
-      namespace_packages=[]
-      )
+setup(
+    setup_requires=['pbr>=3.0', 'setuptools>=17.1'],
+    pbr=True,
+    long_description_content_type='text/markdown; charset=UTF-8',
+)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,3 @@
-import gzip
 import hashlib
 
 import pytest
diff --git a/tests/test_flask_loopback.py b/tests/test_flask_loopback.py
@@ -15,6 +15,7 @@
 _g_counter = 0
 
 def create_sample_app():
+    # pylint: disable=unused-variable
     returned = flask.Flask(__name__)
 
     @returned.route("/sample/url")
@@ -36,6 +37,7 @@ def get_remote_addr():
     return returned, l
 
 class FlaskLoopbackActivationTest(TestCase):
+    # pylint: disable=protected-access
 
     def setUp(self):
         super(FlaskLoopbackActivationTest, self).setUp()
@@ -45,9 +47,9 @@ def setUp(self):
         self.loopback.activate_address(("b.com", 1234))
 
     def test_deactivate_one_by_one(self):
-        self.assertEquals(len(dispatch._registered_addresses), 2)
+        self.assertEqual(len(dispatch._registered_addresses), 2)
         self.loopback.deactivate_address(("a.com", 123))
-        self.assertEquals(len(dispatch._registered_addresses), 1)
+        self.assertEqual(len(dispatch._registered_addresses), 1)
         with self.assertRaises(LookupError):
             self.loopback.deactivate_address(("a.com", 123))
         self.loopback.deactivate_address(("b.com", 1234))
@@ -65,18 +67,18 @@ def setUp(self):
         self.address = ("somehost.com", 1234)
         self.root_url = _url(self.address)
         self._ctx = self.loopback.on(self.address)
-        ctx_result = self._ctx.__enter__()
+        ctx_result = self._ctx.__enter__()  # pylint: disable=unused-variable
         self.addCleanup(self._ctx.__exit__, None, None, None)
 
     def test_simple_request(self):
-        self.assertEquals(requests.get(self.root_url.add_path("/sample/url")).content.decode("utf-8"), OK_RESPONSE)
+        self.assertEqual(requests.get(self.root_url.add_path("/sample/url")).content.decode("utf-8"), OK_RESPONSE)
 
     def test_response_attributes(self):
         url = self.root_url
         response = requests.get(url)
-        self.assertEquals(response.url, url)
-        self.assertEquals(response.request.url, url)
-        self.assertEquals(response.request.method, "GET")
+        self.assertEqual(response.url, url)
+        self.assertEqual(response.request.url, url)
+        self.assertEqual(response.request.method, "GET")
 
     def test_remote_addr(self):
         response = requests.get(self.root_url.add_path('remote_addr'))
@@ -85,35 +87,35 @@ def test_remote_addr(self):
 
     def test_not_found(self):
         response = requests.get(self.root_url.add_path("not_found"))
-        self.assertEquals(response.status_code, httplib.NOT_FOUND)
-        self.assertEquals(response.reason, "Not Found")
+        self.assertEqual(response.status_code, httplib.NOT_FOUND)
+        self.assertEqual(response.reason, "Not Found")
 
     def test_request_context_handler(self):
         initial_counter = _g_counter
 
         @self.loopback.register_request_context_handler
         @contextmanager
-        def increase_counter(request):
+        def increase_counter(request):  # pylint: disable=unused-argument,unused-variable
             global _g_counter
             _g_counter += 1
             yield
             _g_counter += 1
 
         returned = requests.get(self.root_url.add_path("increase_counter")).json()["result"]
-        self.assertEquals(_g_counter, initial_counter + 3)
-        self.assertEquals(returned, initial_counter + 2)
+        self.assertEqual(_g_counter, initial_counter + 3)
+        self.assertEqual(returned, initial_counter + 2)
 
     def test_request_context_handler_custom_response(self):
         initial_counter = _g_counter
 
         @self.loopback.register_request_context_handler
         @contextmanager
-        def return_custom_code(request):
+        def return_custom_code(request):  # pylint: disable=unused-variable
             raise CustomHTTPResponse(request, 666)
 
         response = requests.get(self.root_url.add_path("increase_counter"))
         assert response.status_code == 666
-        self.assertEquals(_g_counter, initial_counter)
+        self.assertEqual(_g_counter, initial_counter)
         self.assertIsNone(response.content)
 
 
diff --git a/tests/test_readme.py b/tests/test_readme.py
@@ -2,9 +2,10 @@
 import os
 import doctest
 
+
 class ReadMeDocTest(TestCase):
     def test_readme_doctests(self):
         readme_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "README.md"))
         self.assertTrue(os.path.exists(readme_path))
         result = doctest.testfile(readme_path, module_relative=False)
-        self.assertEquals(result.failed, 0, "%s tests failed!" % result.failed)
+        self.assertEqual(result.failed, 0, "%s tests failed!" % result.failed)
diff --git a/tests/test_request_attributes.py b/tests/test_request_attributes.py
@@ -1,4 +1,7 @@
+import pytest
 import requests
 
-def test_request_host(active_app, url):
+
+@pytest.mark.usefixtures('active_app')
+def test_request_host(url):
     assert requests.get(url.add_path('request_vars')).json()['host'] == url.netloc
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
@@ -1,15 +1,15 @@
 import ssl
-
 import requests
-
 import pytest
 
 
-def test_ssl_fails_for_non_ssl_port(active_app, hostname, ssl_port, non_ssl_port):
+@pytest.mark.usefixtures('active_app', 'ssl_port')
+def test_ssl_fails_for_non_ssl_port(hostname, non_ssl_port):
     with pytest.raises(ssl.SSLError):
         requests.get("https://{0}:{1}".format(hostname, non_ssl_port))
 
-def test_non_ssl_fails_for_ssl_port(active_app, hostname, ssl_port, non_ssl_port):
+
+@pytest.mark.usefixtures('active_app', 'non_ssl_port')
+def test_non_ssl_fails_for_ssl_port(hostname, ssl_port):
     with pytest.raises(requests.ConnectionError):
         requests.get("http://{0}:{1}".format(hostname, ssl_port))
-

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-![Build Status] (https://secure.travis-ci.org/vmalloc/Flask-Loopback.png )   ![Version] (https://img.shields.io/pypi/v/Flask-Loopback.svg )`
	`1`	`+![Build Status](https://secure.travis-ci.org/vmalloc/Flask-Loopback.png)   ![Version](https://img.shields.io/pypi/v/Flask-Loopback.svg)`
`2`	`2`
`3`	`3`	`Overview`
`4`	`4`	`========`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# pylint: disable=import-error,unused-import`
`1`	`2`	`from contextlib import contextmanager`
`2`	`3`	`import gzip`
`3`	`4`	`import sys`