Some minor improvements (#17)

* pipenv check --style (flake8) fixes

* Add docker-compose to Pipfile

Author: DStape

Pipfile

@@ -17,6 +17,7 @@ blindspin = "*"
 "webdriver-manager" = "*"
 pytest = "*"
 docker = "*"
+docker-compose = "*"
 pymongo = "*"
 selenium = "*"
 sqlalchemy = "*"

testcontainers/__init__.py

@@ -1,2 +0,0 @@
-from testcontainers.core.generic import GenericContainer
-from testcontainers.core.waiting_utils import wait_container_is_ready, wait_for

testcontainers/compose.py

@@ -3,7 +3,7 @@
 import blindspin
 import requests
 
-from testcontainers import wait_container_is_ready
+from testcontainers.core.waiting_utils import wait_container_is_ready
 from testcontainers.core.exceptions import NoSuchPortExposed
 
 
@@ -32,11 +32,13 @@ def get_service_host(self, service_name, port):
         return self._get_service_info(service_name, port)[0]
 
     def _get_service_info(self, service, port):
-        output = subprocess.check_output(["docker-compose", "port", service, str(port)],
+        cmd_as_list = ["docker-compose", "port", service, str(port)]
+        output = subprocess.check_output(cmd_as_list,
                                          cwd=self.filepath).decode("utf-8")
         result = str(output).rstrip().split(":")
         if len(result) == 1:
-            raise NoSuchPortExposed("Port {} was not exposed for service {}".format(port, service))
+            raise NoSuchPortExposed("Port {} was not exposed for service {}"
+                                    .format(port, service))
         return result
 
     @wait_container_is_ready()

testcontainers/core/container.py

@@ -22,7 +22,8 @@ def with_env(self, key: str, value: str) -> 'DockerContainer':
         self.env[key] = value
         return self
 
-    def with_bind_ports(self, container: int, host: int = None) -> 'DockerContainer':
+    def with_bind_ports(self, container: int,
+                        host: int = None) -> 'DockerContainer':
         self.ports[container] = host
         return self
 
@@ -33,17 +34,20 @@ def with_exposed_ports(self, *ports) -> 'DockerContainer':
 
     def start(self):
         print("")
-        print("{} {}".format(crayons.yellow("Pulling image"), crayons.red(self.image)))
+        print("{} {}".format(crayons.yellow("Pulling image"),
+                             crayons.red(self.image)))
         with blindspin.spinner():
-            self._container = self.get_docker_client().run(self.image,
-                                                           command=self._command,
-                                                           detach=True,
-                                                           environment=self.env,
-                                                           ports=self.ports,
-                                                           name=self._name,
-                                                           volumes=self.volumes)
+            docker_client = self.get_docker_client()
+            self._container = docker_client.run(self.image,
+                                                command=self._command,
+                                                detach=True,
+                                                environment=self.env,
+                                                ports=self.ports,
+                                                name=self._name,
+                                                volumes=self.volumes)
         print("")
-        print("Container started: ", crayons.yellow(self._container.short_id, bold=True))
+        print("Container started: ",
+              crayons.yellow(self._container.short_id, bold=True))
         return self
 
     def stop(self, force=True, delete_volume=True):
@@ -72,7 +76,8 @@ def with_name(self, name: str) -> 'DockerContainer':
         self._name = name
         return self
 
-    def with_volume_mapping(self, host: str, container: str, mode: str = 'ro') -> 'DockerContainer':
+    def with_volume_mapping(self, host: str, container: str,
+                            mode: str = 'ro') -> 'DockerContainer':
         # '/home/user1/': {'bind': '/mnt/vol2', 'mode': 'rw'}
         mapping = {'bind': container, 'mode': mode}
         self.volumes[host] = mapping

testcontainers/core/generic.py

@@ -32,7 +32,8 @@ def _connect(self):
     def get_connection_url(self):
         raise NotImplementedError
 
-    def _create_connection_url(self, dialect, username, password, port, db_name):
+    def _create_connection_url(self, dialect, username, password, port,
+                               db_name):
         return "{dialect}://{username}" \
                ":{password}@{host}:" \
                "{port}/{db}".format(dialect=dialect,