Remove deprecated features.

Author: tillahoffmann

core/setup.py

@@ -13,7 +13,6 @@
     install_requires=[
         "docker>=4.0.0",
         "wrapt",
-        "deprecation",
     ],
     python_requires=">=3.7",
 )

core/testcontainers/core/container.py

@@ -1,5 +1,4 @@
 import os
-from deprecation import deprecated
 from docker.models.containers import Container
 
 from testcontainers.core.waiting_utils import wait_container_is_ready
@@ -36,10 +35,6 @@ def with_exposed_ports(self, *ports) -> 'DockerContainer':
             self.ports[port] = None
         return self
 
-    @deprecated(details='Use `with_kwargs`.')
-    def with_kargs(self, **kargs) -> 'DockerContainer':
-        return self.with_kwargs(**kargs)
-
     def with_kwargs(self, **kwargs) -> 'DockerContainer':
         self._kwargs = kwargs
         return self

core/testcontainers/core/generic.py

@@ -13,8 +13,8 @@
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_container_is_ready
-from deprecation import deprecated
 ADDITIONAL_TRANSIENT_ERRORS = []
+
 try:
     from sqlalchemy.exc import DBAPIError
     ADDITIONAL_TRANSIENT_ERRORS.append(DBAPIError)
@@ -57,9 +57,3 @@ def start(self):
 
     def _configure(self):
         raise NotImplementedError
-
-
-class GenericContainer(DockerContainer):
-    @deprecated(details="Use `DockerContainer`.")
-    def __init__(self, image):
-        super(GenericContainer, self).__init__(image)

elasticsearch/testcontainers/elasticsearch/__init__.py

@@ -15,8 +15,6 @@
 import urllib
 from typing import Dict
 
-from deprecation import deprecated
-
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_container_is_ready
 
@@ -100,9 +98,3 @@ def start(self):
         super().start()
         self._connect()
         return self
-
-
-@deprecated(details='Use `ElasticSearchContainer` with a capital S instead '
-                    'of `ElasticsearchContainer`.')
-class ElasticsearchContainer(ElasticSearchContainer):
-    pass

mysql/testcontainers/mysql/__init__.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.
-from deprecation import deprecated
 from os import environ
 
 from testcontainers.core.generic import DbContainer
@@ -69,20 +68,3 @@ def get_connection_url(self):
                                               password=self.MYSQL_PASSWORD,
                                               db_name=self.MYSQL_DATABASE,
                                               port=self.port_to_expose)
-
-
-class MariaDbContainer(MySqlContainer):
-    """
-    Maria database container, a commercially-supported fork of MySql.
-
-    Example
-    -------
-    .. doctest::
-
-        with MariaDbContainer("mariadb:latest") as mariadb:
-            e = sqlalchemy.create_engine(mariadb.get_connection_url())
-            result = e.execute("select version()")
-    """
-    @deprecated(details="Use `MySqlContainer` with 'mariadb:latest' image.")
-    def __init__(self, image="mariadb:latest", **kwargs):
-        super(MariaDbContainer, self).__init__(image, **kwargs)

nginx/testcontainers/nginx/__init__.py

@@ -10,12 +10,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from deprecation import deprecated
 from testcontainers.core.container import DockerContainer
 
 
 class NginxContainer(DockerContainer):
-    @deprecated(details="Use `DockerContainer` with 'nginx:latest' image and expose port 80.")
     def __init__(self, image="nginx:latest", port_to_expose=80, **kwargs):
         super(NginxContainer, self).__init__(image, **kwargs)
         self.port_to_expose = port_to_expose

requirements/3.10.txt

@@ -134,8 +134,6 @@ cryptography==36.0.2
     #   secretstorage
 cx-oracle==8.3.0
     # via testcontainers-oracle
-deprecation==2.1.0
-    # via testcontainers-core
 distro==1.8.0
     # via docker-compose
 dnspython==2.2.1
@@ -237,7 +235,6 @@ outcome==1.2.0
     # via trio
 packaging==22.0
     # via
-    #   deprecation
     #   docker
     #   pytest
     #   sphinx
@@ -344,7 +341,7 @@ requests-toolbelt==0.9.1
     #   twine
 rfc3986==2.0.0
     # via twine
-rich==13.0.0
+rich==13.0.1
     # via twine
 rsa==4.9
     # via

requirements/3.7.txt

@@ -140,8 +140,6 @@ cryptography==36.0.2
     #   secretstorage
 cx-oracle==8.3.0
     # via testcontainers-oracle
-deprecation==2.1.0
-    # via testcontainers-core
 distro==1.8.0
     # via docker-compose
 dnspython==2.2.1
@@ -253,7 +251,6 @@ outcome==1.2.0
     # via trio
 packaging==22.0
     # via
-    #   deprecation
     #   docker
     #   pytest
     #   sphinx
@@ -360,7 +357,7 @@ requests-toolbelt==0.9.1
     #   twine
 rfc3986==2.0.0
     # via twine
-rich==13.0.0
+rich==13.0.1
     # via twine
 rsa==4.9
     # via

requirements/3.8.txt

@@ -138,8 +138,6 @@ cryptography==36.0.2
     #   secretstorage
 cx-oracle==8.3.0
     # via testcontainers-oracle
-deprecation==2.1.0
-    # via testcontainers-core
 distro==1.8.0
     # via docker-compose
 dnspython==2.2.1
@@ -244,7 +242,6 @@ outcome==1.2.0
     # via trio
 packaging==22.0
     # via
-    #   deprecation
     #   docker
     #   pytest
     #   sphinx
@@ -351,7 +348,7 @@ requests-toolbelt==0.9.1
     #   twine
 rfc3986==2.0.0
     # via twine
-rich==13.0.0
+rich==13.0.1
     # via twine
 rsa==4.9
     # via

requirements/3.9.txt

@@ -134,8 +134,6 @@ cryptography==36.0.2
     #   secretstorage
 cx-oracle==8.3.0
     # via testcontainers-oracle
-deprecation==2.1.0
-    # via testcontainers-core
 distro==1.8.0
     # via docker-compose
 dnspython==2.2.1
@@ -238,7 +236,6 @@ outcome==1.2.0
     # via trio
 packaging==22.0
     # via
-    #   deprecation
     #   docker
     #   pytest
     #   sphinx
@@ -345,7 +342,7 @@ requests-toolbelt==0.9.1
     #   twine
 rfc3986==2.0.0
     # via twine
-rich==13.0.0
+rich==13.0.1
     # via twine
 rsa==4.9
     # via