Skip to content

Commit d9eced8

Browse files
committed
PyOpenSSL -> twsited[tls] in test-requirements
1 parent ff32e6e commit d9eced8

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

‎build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ schedules:
2525
branches:
2626
include: [/python.*/]
2727
env_vars: |
28-
EVENT_LOOP_MANAGER='twisted'
28+
EVENT_LOOP_MANAGER='libev'
2929
EXCLUDE_LONG=1
3030
matrix:
3131
exclude:

‎docs/security.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,5 @@ the `python ssl documentation <https://docs.python.org/2/library/ssl.html#ssl.wr
8888
your configuration. For further reading, Andrew Mussey has published a thorough guide on
8989
`Using SSL with the DataStax Python driver <http://blog.amussey.com/post/64036730812/cassandra-2-0-client-server-ssl-with-datastax-python>`_.
9090

91-
*Note*: In case the twisted event loop is used PyOpenSSL must be installed or an exception will be risen. Also
92-
to set the ``ssl_version`` and ``cert_reqs`` in ``ssl_opts`` the appropriate constants from PyOpenSSL are expected.
91+
*Note*: In case the twisted event loop is used pyOpenSSL must be installed or an exception will be risen. Also
92+
to set the ``ssl_version`` and ``cert_reqs`` in ``ssl_opts`` the appropriate constants from pyOpenSSL are expected.

‎test-requirements.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ PyYAML
88
pytz
99
sure
1010
pure-sasl
11-
twisted
11+
twisted[tls]
1212
gevent>=1.0
1313
eventlet
1414
cython>=0.20,<0.28
1515
packaging
1616
asynctest; python_version > '3.4'
17-
pyOpenSSL

‎tests/integration/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ def _get_dse_version_from_cass(cass_version):
111111
KEEP_TEST_CLUSTER=bool(os.getenv('KEEP_TEST_CLUSTER', False))
112112
SIMULACRON_JAR=os.getenv('SIMULACRON_JAR', None)
113113

114-
default_cassandra_version='3.11'
115-
116114
CASSANDRA_IP=os.getenv('CASSANDRA_IP', '127.0.0.1')
117115
CASSANDRA_DIR=os.getenv('CASSANDRA_DIR', None)
118116

0 commit comments

Comments
(0)