Skip to content

Commit 039c2f0

Browse files
authored
Merge branch 'master' into cassandra_scylla_support
2 parents d3d1af6 + 6641b25 commit 039c2f0

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Usage within Docker (i.e. in a CI)
5959

6060
When trying to launch a testcontainer from within a Docker container two things have to be provided:
6161

62-
1. The container has to provide a docker client installation. Either use an image that has docker pre-installed (e.g. the [official docker images](https://hub.docker.com/_/docker)) or install the client from within the `Dockerfile` specification.
62+
1. The container has to provide a docker client installation. Either use an image that has docker pre-installed (e.g. the `official docker images <https://hub.docker.com/_/docker>`_) or install the client from within the `Dockerfile` specification.
6363
2. The container has to have access to the docker daemon which can be achieved by mounting `/var/run/docker.sock` or setting the `DOCKER_HOST` environment variable as part of your `docker run` command.
6464

6565

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ description-file = README.md
1313

1414
[flake8]
1515
max-line-length = 100
16+
exclude = .git,__pycache__,build,dist,venv,.venv

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@
7070
},
7171
long_description_content_type="text/x-rst",
7272
long_description=long_description,
73-
python_requires='>=3.5',
73+
python_requires='>=3.6',
7474
)

testcontainers/oracle.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class OracleDbContainer(DbContainer):
99
-------
1010
::
1111
12-
with OracleDbContainer():
12+
with OracleDbContainer() as oracle:
1313
e = sqlalchemy.create_engine(oracle.get_connection_url())
1414
result = e.execute("select 1 from dual")
1515
"""
@@ -24,3 +24,6 @@ def get_connection_url(self):
2424
dialect="oracle", username="system", password="oracle", port=self.container_port,
2525
db_name="xe"
2626
)
27+
28+
def _configure(self):
29+
pass

0 commit comments

Comments
 (0)