Merge branch 'master' into patch-1

tillahoffmann · web-flow · commit feadfc4003f6 · 2023-02-16T17:58:35.000-05:00
diff --git a/.github/workflows/attention-label.yml b/.github/workflows/attention-label.yml
@@ -0,0 +1,30 @@
+name: Automatically add or remove labels
+on:
+  issue_comment:
+    types:
+      - created
+jobs:
+  show-metadata:
+    runs-on: ubuntu-latest
+    steps:
+    # Use environment variable to print the metadata (cf. https://github.com/actions/runner/issues/1656#issuecomment-1030077729).
+    - name: Show metadata
+      run: echo $JSON
+      env:
+        JSON: ${{ toJson(github.event) }}
+  add-label:
+    if: ${{ github.event.comment.user.login != 'tillahoffmann' }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Add label
+      uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: '👀 requires attention'
+  remove-label:
+    if: ${{ github.event.comment.user.login == 'tillahoffmann' }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Remove label
+      uses: actions-ecosystem/action-remove-labels@v1
+      with:
+        labels: '👀 requires attention'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,7 +8,6 @@ on:
 jobs:
   build:
     strategy:
-      fail-fast: false
       matrix:
         python-version:
           - "3.7"
diff --git a/.github/workflows/triage-label.yml b/.github/workflows/triage-label.yml
@@ -0,0 +1,13 @@
+name: Automatically add triage labels to new issues and pull requests
+on:
+  issues:
+    types:
+      - opened
+jobs:
+  add-label:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Add label
+      uses: actions-ecosystem/action-add-labels@v1
+      with:
+        labels: '🔀 requires triage'
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,23 @@
+/arangodb @nshine
+/azurite @pffijt
+/clickhouse @yakimka
+# /compose
+# /core
+/elasticsearch @nivm @daTokenizer
+/google @tillahoffmann
+/kafka @ash1425
+/keycloak @timbmg
+/localstack @ImFlog
+# /meta
+/minio @maltehedderich
+/mongodb @dabrign
+# /mssql
+# /mysql
+/neo4j @eastlondoner
+# /nginx
+/opensearch @maltehedderich
+# /oracle
+# /postgres
+/rabbitmq @KerstenBreuer
+/redis @daTokenizer
+# /selenium
diff --git a/elasticsearch/testcontainers/elasticsearch/__init__.py b/elasticsearch/testcontainers/elasticsearch/__init__.py
@@ -14,6 +14,7 @@
 import re
 import urllib
 from typing import Dict
+from urllib.error import URLError
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.waiting_utils import wait_container_is_ready
@@ -83,7 +84,7 @@ def __init__(self, image="elasticsearch", port_to_expose=9200, **kwargs) -> None
         for key, value in _environment_by_version(major_version).items():
             self.with_env(key, value)
 
-    @wait_container_is_ready()
+    @wait_container_is_ready(URLError)
     def _connect(self) -> None:
         res = urllib.request.urlopen(self.get_url())
         if res.status != 200:
diff --git a/mssql/testcontainers/mssql/__init__.py b/mssql/testcontainers/mssql/__init__.py
@@ -15,8 +15,9 @@ class SqlServerContainer(DbContainer):
             >>> from testcontainers.mssql import SqlServerContainer
 
             >>> with SqlServerContainer() as mssql:
-            ...    e = sqlalchemy.create_engine(mssql.get_connection_url())
-            ...    result = e.execute("select @@VERSION")
+            ...    engine = sqlalchemy.create_engine(mssql.get_connection_url())
+            ...    with engine.begin() as connection:
+            ...        result = connection.execute(sqlalchemy.text("select @@VERSION"))
     """
 
     def __init__(self, image: str = "mcr.microsoft.com/mssql/server:2019-latest", user: str = "SA",
diff --git a/mssql/tests/test_mssql.py b/mssql/tests/test_mssql.py
@@ -6,13 +6,15 @@ def test_docker_run_mssql():
     image = 'mcr.microsoft.com/azure-sql-edge'
     dialect = 'mssql+pymssql'
     with SqlServerContainer(image, dialect=dialect) as mssql:
-        e = sqlalchemy.create_engine(mssql.get_connection_url())
-        result = e.execute('select @@servicename')
-        for row in result:
-            assert row[0] == 'MSSQLSERVER'
+        engine = sqlalchemy.create_engine(mssql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text('select @@servicename'))
+            for row in result:
+                assert row[0] == 'MSSQLSERVER'
 
     with SqlServerContainer(image, password="1Secure*Password2", dialect=dialect) as mssql:
-        e = sqlalchemy.create_engine(mssql.get_connection_url())
-        result = e.execute('select @@servicename')
-        for row in result:
-            assert row[0] == 'MSSQLSERVER'
+        engine = sqlalchemy.create_engine(mssql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text('select @@servicename'))
+            for row in result:
+                assert row[0] == 'MSSQLSERVER'
diff --git a/mysql/testcontainers/mysql/__init__.py b/mysql/testcontainers/mysql/__init__.py
@@ -32,9 +32,10 @@ class MySqlContainer(DbContainer):
             >>> from testcontainers.mysql import MySqlContainer
 
             >>> with MySqlContainer('mysql:5.7.17') as mysql:
-            ...     e = sqlalchemy.create_engine(mysql.get_connection_url())
-            ...     result = e.execute("select version()")
-            ...     version, = result.fetchone()
+            ...     engine = sqlalchemy.create_engine(mysql.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select version()"))
+            ...         version, = result.fetchone()
     """
 
     def __init__(self, image: str = "mysql:latest", MYSQL_USER: Optional[str] = None,
diff --git a/mysql/tests/test_mysql.py b/mysql/tests/test_mysql.py
@@ -10,18 +10,20 @@
 def test_docker_run_mysql():
     config = MySqlContainer('mysql:5.7.17')
     with config as mysql:
-        e = sqlalchemy.create_engine(mysql.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].startswith('5.7.17')
+        engine = sqlalchemy.create_engine(mysql.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].startswith('5.7.17')
 
 
 def test_docker_run_mariadb():
     with MySqlContainer("mariadb:10.6.5").maybe_emulate_amd64() as mariadb:
-        e = sqlalchemy.create_engine(mariadb.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].startswith('10.6.5')
+        engine = sqlalchemy.create_engine(mariadb.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].startswith('10.6.5')
 
 
 def test_docker_env_variables():
diff --git a/oracle/testcontainers/oracle/__init__.py b/oracle/testcontainers/oracle/__init__.py
@@ -13,8 +13,9 @@ class OracleDbContainer(DbContainer):
             >>> from testcontainers.oracle import OracleDbContainer
 
             >>> with OracleDbContainer() as oracle:
-            ...     e = sqlalchemy.create_engine(oracle.get_connection_url())
-            ...     result = e.execute("select * from V$VERSION")
+            ...     engine = sqlalchemy.create_engine(oracle.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select * from V$VERSION"))
     """
 
     def __init__(self, image: str = "wnameless/oracle-xe-11g-r2:latest", **kwargs) -> None:
diff --git a/oracle/tests/test_oracle.py b/oracle/tests/test_oracle.py
@@ -5,12 +5,13 @@
 
 @pytest.mark.skip(reason="needs oracle client libraries unavailable on Travis")
 def test_docker_run_oracle():
+    versions = {'Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production',
+                'PL/SQL Release 11.2.0.2.0 - Production',
+                'CORE\t11.2.0.2.0\tProduction',
+                'TNS for Linux: Version 11.2.0.2.0 - Production',
+                'NLSRTL Version 11.2.0.2.0 - Production'}
     with OracleDbContainer() as oracledb:
-        e = sqlalchemy.create_engine(oracledb.get_connection_url())
-        result = e.execute("select * from V$VERSION")
-        versions = {'Oracle Database 11g Express Edition Release 11.2.0.2.0 - 64bit Production',
-                    'PL/SQL Release 11.2.0.2.0 - Production',
-                    'CORE\t11.2.0.2.0\tProduction',
-                    'TNS for Linux: Version 11.2.0.2.0 - Production',
-                    'NLSRTL Version 11.2.0.2.0 - Production'}
-        assert {row[0] for row in result} == versions
+        engine = sqlalchemy.create_engine(oracledb.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select * from V$VERSION"))
+            assert {row[0] for row in result} == versions
diff --git a/postgres/testcontainers/postgres/__init__.py b/postgres/testcontainers/postgres/__init__.py
@@ -31,9 +31,10 @@ class PostgresContainer(DbContainer):
 
             >>> postgres_container = PostgresContainer("postgres:9.5")
             >>> with postgres_container as postgres:
-            ...     e = sqlalchemy.create_engine(postgres.get_connection_url())
-            ...     result = e.execute("select version()")
-            ...     version, = result.fetchone()
+            ...     engine = sqlalchemy.create_engine(postgres.get_connection_url())
+            ...     with engine.begin() as connection:
+            ...         result = connection.execute(sqlalchemy.text("select version()"))
+            ...         version, = result.fetchone()
             >>> version
             'PostgreSQL 9.5...'
     """
diff --git a/postgres/tests/test_postgres.py b/postgres/tests/test_postgres.py
@@ -5,14 +5,16 @@
 def test_docker_run_postgres():
     postgres_container = PostgresContainer("postgres:9.5")
     with postgres_container as postgres:
-        e = sqlalchemy.create_engine(postgres.get_connection_url())
-        result = e.execute("select version()")
-        for row in result:
-            assert row[0].lower().startswith("postgresql 9.5")
+        engine = sqlalchemy.create_engine(postgres.get_connection_url())
+        with engine.begin() as connection:
+            result = connection.execute(sqlalchemy.text("select version()"))
+            for row in result:
+                assert row[0].lower().startswith("postgresql 9.5")
 
 
 def test_docker_run_postgres_with_driver_pg8000():
     postgres_container = PostgresContainer("postgres:9.5", driver="pg8000")
     with postgres_container as postgres:
-        e = sqlalchemy.create_engine(postgres.get_connection_url())
-        e.execute("select 1=1")
+        engine = sqlalchemy.create_engine(postgres.get_connection_url())
+        with engine.begin() as connection:
+            connection.execute(sqlalchemy.text("select 1=1"))
diff --git a/requirements/3.10.txt b/requirements/3.10.txt
diff --git a/requirements/3.7.txt b/requirements/3.7.txt
diff --git a/requirements/3.8.txt b/requirements/3.8.txt
diff --git a/requirements/3.9.txt b/requirements/3.9.txt
