Skip to content

Commit a35ebac

Browse files
committed
merge conflict fix
2 parents 99c40b9 + f732569 commit a35ebac

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ Currently available features:
2323
Installation
2424
------------
2525

26-
The **testcontainers** module is available from PyPi at:
26+
The **testcontainers** module is available from PyPI at:
2727

2828
* https://pypi.python.org/pypi/testcontainers
2929

30-
and can be installed using ``pip``.
30+
and can be installed using ``pip``, depending on which containers you need:
3131

32-
pip install testcontainers
32+
pip install testcontainers[mysql]
33+
pip install testcontainers[postgresql]
34+
pip install testcontainers[selenium]
35+
# or with multiple
36+
pip install testcontainers[mysql,postgresql,selenium]
3337

3438
Basic usage
3539
-----------

docs/index.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ Installation
2121
The testcontainers module is available from PyPi at:
2222

2323
https://pypi.python.org/pypi/testcontainers
24-
and can be installed using pip.
24+
and can be installed using pip, depending on which containers you need:
2525

2626
::
2727

28-
pip install testcontainers
28+
pip install testcontainers[mysql]
29+
pip install testcontainers[postgresql]
30+
pip install testcontainers[selenium]
31+
# or with multiple
32+
pip install testcontainers[mysql,postgresql,selenium]
2933

3034

3135
Compatibility

setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
'Operating System :: MacOS',
3939
],
4040
install_requires=[
41-
'selenium==2.53.1',
4241
'docker',
4342
'wrapt',
44-
'pymysql',
45-
'sqlalchemy',
46-
'psycopg2',
4743
'crayons',
4844
'blindspin',
49-
'pymysql'
5045
],
46+
extras_require={
47+
'mysql': ['sqlalchemy', 'pymysql'],
48+
'postgresql': ['sqlalchemy', 'psycopg2'],
49+
'selenium': ['selenium==2.53.1'],
50+
}
5151
)

0 commit comments

Comments
 (0)