Remove import-mode

It's most likely no longer necessary
scylladb · Aug 16, 2024 · 2babbb8 · 2babbb8
1 parent 966a991
commit 2babbb8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-pre-release.yml b/.github/workflows/build-pre-release.yml
@@ -3,7 +3,7 @@ name: Build pre release python versions
 on: [push, pull_request]
 
 env:
- CIBW_TEST_COMMAND_LINUX: "pytest --import-mode append {project}/tests/unit"
+ CIBW_TEST_COMMAND_LINUX: "pytest {project}/tests/unit"
  CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt"
  CIBW_BEFORE_BUILD_LINUX: "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
  CIBW_ENVIRONMENT: "CASS_DRIVER_BUILD_CONCURRENCY=2 CFLAGS='-g0 -O3'"

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -4,9 +4,9 @@ on: [push, pull_request]
 
 
 env:
- CIBW_TEST_COMMAND_LINUX: "pytest --import-mode append {project}/tests/unit && EVENT_LOOP_MANAGER=gevent pytest --import-mode append {project}/tests/unit/io/test_geventreactor.py"
- CIBW_TEST_COMMAND_MACOS: "pytest --import-mode append {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)' "
- CIBW_TEST_COMMAND_WINDOWS: "pytest --import-mode append {project}/tests/unit  -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\" "
+ CIBW_TEST_COMMAND_LINUX: "pytest {project}/tests/unit && EVENT_LOOP_MANAGER=gevent pytest {project}/tests/unit/io/test_geventreactor.py"
+ CIBW_TEST_COMMAND_MACOS: "pytest {project}/tests/unit -k 'not (test_multi_timer_validation or test_empty_connections or test_timer_cancellation)' "
+ CIBW_TEST_COMMAND_WINDOWS: "pytest {project}/tests/unit  -k \"not (test_deserialize_date_range_year or test_datetype or test_libevreactor)\" "
  CIBW_BEFORE_TEST: "pip install -r {project}/test-requirements.txt"
  CIBW_BEFORE_BUILD_LINUX: "rm -rf ~/.pyxbld && rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux && yum install -y libffi-devel libev libev-devel openssl openssl-devel"
  CIBW_ENVIRONMENT: "CASS_DRIVER_BUILD_CONCURRENCY=2 CFLAGS='-g0 -O3'"

diff --git a/README-dev.rst b/README-dev.rst
@@ -31,9 +31,9 @@ Running Unit Tests
 ------------------
 Unit tests can be run like so::
 
-    python -m pytest --import-mode append tests/unit
-    EVENT_LOOP_MANAGER=gevent python -m pytest --import-mode append tests/unit/io/test_geventreactor.py
-    EVENT_LOOP_MANAGER=eventlet python -m pytest --import-mode append tests/unit/io/test_eventletreactor.py
+    python -m pytest tests/unit
+    EVENT_LOOP_MANAGER=gevent python -m pytest tests/unit/io/test_geventreactor.py
+    EVENT_LOOP_MANAGER=eventlet python -m pytest tests/unit/io/test_eventletreactor.py
 
 You can run a specific test method like so::
 

diff --git a/scripts/run_integration_test.sh b/scripts/run_integration_test.sh
@@ -37,5 +37,5 @@ ccm remove
 # run test
 
 export MAPPED_SCYLLA_VERSION=3.11.4
-PROTOCOL_VERSION=4  pytest -rf --import-mode append $*
+PROTOCOL_VERSION=4  pytest -rf $*