Enable flake8.

tillahoffmann · tillahoffmann · commit 9269d1aec45a · 2020-02-18T18:55:52.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,7 @@ install:
 
 script:
   - pipenv install --dev
+  - pipenv run flake8
   - pipenv run py.test -sv --cov-config .coveragerc --cov-report html:skip-covered --cov-report term:skip-covered --cov=testcontainers --tb=short tests/
   - codecov
 
diff --git a/Pipfile b/Pipfile
@@ -4,6 +4,7 @@ verify_ssl = true
 
 ["dev-packages"]
 codecov = "*"
+flake8 = "*"
 
 [packages]
 crayons = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/docs/conf.py b/docs/conf.py
@@ -151,6 +151,3 @@
      author, 'testcontainers', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-
diff --git a/setup.cfg b/setup.cfg
@@ -3,3 +3,6 @@ universal = 1
 
 [metadata]
 description-file = README.md
+
+[flake8]
+max-line-length = 100
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 setuptools.setup(
     name='testcontainers',
     packages=setuptools.find_packages(exclude=['tests']),
-    version='2.5',
+    version='2.5.0',
     description=('Library provides lightweight, throwaway '
                  'instances of common databases, '
                  'Selenium web browsers, or anything else that can '
diff --git a/testcontainers/compose.py b/testcontainers/compose.py
@@ -20,7 +20,8 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
     def start(self):
         with blindspin.spinner():
-            subprocess.call(["docker-compose", "-f", self.compose_file_name, "up", "-d"], cwd=self.filepath)
+            subprocess.call(["docker-compose", "-f", self.compose_file_name, "up", "-d"],
+                            cwd=self.filepath)
 
     def stop(self):
         with blindspin.spinner():
diff --git a/testcontainers/general.py b/testcontainers/general.py
@@ -11,12 +11,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from testcontainers.core.container import DockerContainer
-from testcontainers.core.waiting_utils import wait_container_is_ready
 
 
 class TestContainer(DockerContainer):
     def __init__(self, image, port_to_expose=None):
-        super(RedisContainer, self).__init__(image)
+        super(TestContainer, self).__init__(image)
         if port_to_expose:
-		self.port_to_expose = port_to_expose
-	        self.with_exposed_ports(self.port_to_expose)
+            self.port_to_expose = port_to_expose
+            self.with_exposed_ports(self.port_to_expose)
diff --git a/testcontainers/google/__init__.py b/testcontainers/google/__init__.py
@@ -1 +1 @@
-from .pubsub import PubSubContainer
+from .pubsub import PubSubContainer  # noqa
diff --git a/testcontainers/google/pubsub.py b/testcontainers/google/pubsub.py
@@ -10,7 +10,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import os
 
 from ..core.generic import GenericContainer
 
diff --git a/testcontainers/mongodb.py b/testcontainers/mongodb.py
@@ -24,7 +24,7 @@ class MongoDbContainer(DockerContainer):
 
     def __init__(self, image="mongodb:latest"):
         super(MongoDbContainer, self).__init__(image=image)
-        self.command="mongo"
+        self.command = "mongo"
         self.port_to_expose = 27017
         self.with_exposed_ports(self.port_to_expose)
 
@@ -35,9 +35,9 @@ def _configure(self):
         self.with_env("MONGO_DB", self.MONGO_DB)
 
     def get_connection_url(self):
-        return "mongodb://{}:{}".format(self.get_container_host_ip(), self.get_exposed_port(self.port_to_expose))
+        port = self.get_exposed_port(self.port_to_expose)
+        return "mongodb://{}:{}".format(self.get_container_host_ip(), port)
 
     def get_connection_client(self):
         return MongoClient("mongodb://{}:{}".format(self.get_container_host_ip(),
                                                     self.get_exposed_port(self.port_to_expose)))
-
diff --git a/testcontainers/redis.py b/testcontainers/redis.py
@@ -11,11 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from testcontainers.core.container import DockerContainer
-from testcontainers.core.waiting_utils import wait_container_is_ready
+
 
 class RedisContainer(DockerContainer):
     def __init__(self, image="redis:latest", port_to_expose=6379):
         super(RedisContainer, self).__init__(image)
         self.port_to_expose = port_to_expose
         self.with_exposed_ports(self.port_to_expose)
-
diff --git a/tests/test_db_containers.py b/tests/test_db_containers.py
@@ -67,7 +67,7 @@ def test_docker_run_mongodb():
             "name": "Vella",
             "restaurant_id": "41704620"
         }
-        result = db.restaurants.insert_one(doc)
+        db.restaurants.insert_one(doc)
         cursor = db.restaurants.find({"borough": "Manhattan"})
         assert cursor.next()['restaurant_id'] == doc['restaurant_id']
 
diff --git a/tests/test_docker_compose.py b/tests/test_docker_compose.py
@@ -1,7 +1,6 @@
 import os
 
 import pytest
-from selenium import webdriver
 
 from testcontainers.compose import DockerCompose
 from testcontainers.core.exceptions import NoSuchPortExposed
diff --git a/tests/test_new_docker_api.py b/tests/test_new_docker_api.py
@@ -32,6 +32,7 @@ def test_docker_env_variables():
         url = db.get_connection_url()
         assert url == 'mysql+pymysql://demo:test@0.0.0.0:32785/custom_db'
 
+
 def test_docker_kargs():
     code_dir = Path(__file__).parent
     container_first = GenericContainer("nginx:latest")

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,3 @@`
`151`	`151`	`author, 'testcontainers', 'One line description of project.',`
`152`	`152`	`'Miscellaneous'),`
`153`	`153`	`]`
`154`		`-`
`155`		`-`
`156`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from .pubsub import PubSubContainer`
	`1`	`+from .pubsub import PubSubContainer # noqa`