Skip to content

Commit 5021f5c

Browse files
Lorak-mmkfruch
authored andcommitted
Fix requirements
Add missing packages to requirements.txt / test-requirements.txt, so that it works with both Python 3 and Python 2. Replace nose with pytest
1 parent ac03767 commit 5021f5c

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
CIBW_TEST_COMMAND_LINUX: "pytest --import-mode append {project}/tests/unit -k 'not (test_connection_initialization or test_cloud)' && EVENT_LOOP_MANAGER=gevent pytest --import-mode append {project}/tests/unit/io/test_geventreactor.py && EVENT_LOOP_MANAGER=eventlet pytest --import-mode append {project}/tests/unit/io/test_eventletreactor.py "
88
CIBW_TEST_COMMAND_MACOS: "pytest --import-mode append {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_connection_initialization or test_timer_cancellation or test_cloud)' "
99
CIBW_TEST_COMMAND_WINDOWS: "pytest --import-mode append {project}/tests/unit -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor or test_connection_initialization or test_cloud)\" "
10-
CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt pytest"
10+
CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt"
1111
CIBW_BEFORE_BUILD_LINUX: "rm -rf ~/.pyxbld && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
1212
CIBW_ENVIRONMENT: "CASS_DRIVER_BUILD_CONCURRENCY=2 CFLAGS='-g0 -O3'"
1313
CIBW_SKIP: cp35* cp36* *musllinux*

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
geomet>=0.1,<0.3
22
six >=1.9
3-
futures <=2.2.0
3+
futures==3.4.0; python_version < '3.0.0'
44
# Futures is not required for Python 3, but it works up through 2.2.0 (after which it introduced breaking syntax).
55
# This is left here to make sure install -r works with any runtime. When installing via setup.py, futures is omitted
66
# for Python 3, in favor of the standard library implementation.

test-requirements.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-r requirements.txt
22
scales
3-
nose
3+
pytest
44
mock>1.1
55
pytz
66
sure
77
pure-sasl
8-
twisted[tls]; python_version >= '3.5'
9-
twisted[tls]==19.2.1; python_version < '3.5'
8+
twisted[tls]; python_version >= '3.5' or python_version < '3.0'
9+
twisted[tls]==19.2.1; python_version < '3.5' and python_version >= '3.0'
1010
gevent>=1.0; platform_machine != 'i686' and platform_machine != 'win32'
1111
gevent==20.5.0; platform_machine == 'i686' or platform_machine == 'win32'
1212
eventlet
@@ -17,3 +17,4 @@ backports.ssl_match_hostname; python_version < '2.7.9'
1717
futurist; python_version >= '3.7'
1818
asynctest; python_version >= '3.5'
1919
ipaddress; python_version < '3.3.0'
20+
pyyaml

0 commit comments

Comments
 (0)