Skip to content

Commit 40d19c0

Browse files
committed
chore: rename GEVENT_STARLETTE_TEST
- remove `py39starlette` job - remove `gevent` from `tests/requirements` file Signed-off-by: Varsha GS <varsha.gs@ibm.com>
1 parent f277944 commit 40d19c0

File tree

9 files changed

+9
-27
lines changed

9 files changed

+9
-27
lines changed

.circleci/config.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ commands:
6666
name: Run Tests With Coverage Report
6767
environment:
6868
CASSANDRA_TEST: "<<parameters.cassandra>>"
69-
GEVENT_STARLETTE_TEST: "<<parameters.gevent>>"
69+
GEVENT_TEST: "<<parameters.gevent>>"
7070
KAFKA_TEST: "<<parameters.kafka>>"
7171
command: |
7272
. venv/bin/activate
@@ -208,21 +208,6 @@ jobs:
208208
- store-pytest-results
209209
- store-coverage-report
210210

211-
py39starlette:
212-
docker:
213-
- image: public.ecr.aws/docker/library/python:3.9
214-
working_directory: ~/repo
215-
steps:
216-
- checkout
217-
- check-if-tests-needed
218-
- pip-install-deps
219-
- pip-install-tests-deps:
220-
requirements: "tests/requirements-gevent-starlette.txt"
221-
- run-tests-with-coverage-report:
222-
tests: "tests/frameworks/test_starlette.py"
223-
- store-pytest-results
224-
- store-coverage-report
225-
226211
py39gevent:
227212
docker:
228213
- image: public.ecr.aws/docker/library/python:3.9
@@ -321,7 +306,6 @@ workflows:
321306
- python314
322307
- py39cassandra
323308
- py39gevent
324-
- py39starlette
325309
- py312aws
326310
- py312kafka
327311
- autowrapt:
@@ -335,7 +319,6 @@ workflows:
335319
# - python314
336320
- py39cassandra
337321
- py39gevent
338-
- py39starlette
339322
- py312aws
340323
- py312kafka
341324
- autowrapt

tests/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import os
55

6-
if os.environ.get('GEVENT_STARLETTE_TEST'):
6+
if os.environ.get('GEVENT_TEST'):
77
from gevent import monkey
88
monkey.patch_all()
99

tests/apps/aiohttp_app/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
APP_THREAD = None
1010

11-
if not any((os.environ.get('GEVENT_STARLETTE_TEST'),
11+
if not any((os.environ.get('GEVENT_TEST'),
1212
os.environ.get('CASSANDRA_TEST'),
1313
sys.version_info < (3, 5, 3))):
1414
APP_THREAD = launch_background_thread(server, "AIOHTTP")

tests/apps/aiohttp_app2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
APP_THREAD = None
99

10-
if not any((os.environ.get('GEVENT_STARLETTE_TEST'),
10+
if not any((os.environ.get('GEVENT_TEST'),
1111
os.environ.get('CASSANDRA_TEST'),
1212
sys.version_info < (3, 5, 3))):
1313
APP_THREAD = launch_background_thread(server, "AIOHTTP")

tests/apps/grpc_server/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import time
77
import threading
88

9-
if not any((os.environ.get('GEVENT_STARLETTE_TEST'),
9+
if not any((os.environ.get('GEVENT_TEST'),
1010
os.environ.get('CASSANDRA_TEST'),
1111
sys.version_info < (3, 5, 3))):
1212
# Background RPC application

tests/apps/tornado_server/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
app_thread = None
1010

11-
if not any((app_thread, os.environ.get('GEVENT_STARLETTE_TEST'), os.environ.get('CASSANDRA_TEST'))):
11+
if not any((app_thread, os.environ.get('GEVENT_TEST'), os.environ.get('CASSANDRA_TEST'))):
1212
testenv["tornado_port"] = 10813
1313
testenv["tornado_server"] = ("http://127.0.0.1:" + str(testenv["tornado_port"]))
1414

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
if not os.environ.get("COUCHBASE_TEST"):
5151
collect_ignore_glob.append("*test_couchbase*")
5252

53-
if not os.environ.get("GEVENT_STARLETTE_TEST"):
53+
if not os.environ.get("GEVENT_TEST"):
5454
collect_ignore_glob.extend(
5555
[
5656
"*test_gevent*",

tests/frameworks/test_gevent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from tests.helpers import testenv, get_spans_by_filter, filter_test_span
1515

1616

17-
# Skip the tests if the environment variable `GEVENT_STARLETTE_TEST` is not set
18-
pytestmark = pytest.mark.skipif(not os.environ.get("GEVENT_STARLETTE_TEST"), reason="GEVENT_STARLETTE_TEST not set")
17+
# Skip the tests if the environment variable `GEVENT_TEST` is not set
18+
pytestmark = pytest.mark.skipif(not os.environ.get("GEVENT_TEST"), reason="GEVENT_TEST not set")
1919

2020

2121
class TestGEvent:

tests/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Django>=4.2.16
1010
fastapi>=0.92.0; python_version < "3.13"
1111
fastapi>=0.115.0; python_version >= "3.13"
1212
flask>=2.3.2
13-
gevent>=23.9.0.post1
1413
grpcio>=1.14.1
1514
google-cloud-pubsub>=2.0.0
1615
google-cloud-storage>=1.24.0

0 commit comments

Comments
 (0)