Skip to content

Commit

Permalink
use SQLAlchemy 1.1 for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mnbbrown committed Jul 24, 2021
1 parent 3a7c84d commit 5e38f5a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_trace_integration(self):

@pytest.mark.skipif(
not sqlalchemy.__version__.startswith("1.4"),
reason="on run async tests for 1.4",
reason="only run async tests for 1.4",
)
def test_async_trace_integration(self):
async def run():
Expand Down Expand Up @@ -97,7 +97,7 @@ def test_create_engine_wrapper(self):

@pytest.mark.skipif(
not sqlalchemy.__version__.startswith("1.4"),
reason="on run async tests for 1.4",
reason="only run async tests for 1.4",
)
def test_create_async_engine_wrapper(self):
async def run():
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ envlist =
py3{6,7,8,9}-test-instrumentation-grpc

; opentelemetry-instrumentation-sqlalchemy
py3{6,7,8,9}-test-instrumentation-sqlalchemy{13,14}
pypy3-test-instrumentation-sqlalchemy{13,14}
py3{6,7,8,9}-test-instrumentation-sqlalchemy{11,14}
pypy3-test-instrumentation-sqlalchemy{11,14}

; opentelemetry-instrumentation-redis
py3{6,7,8,9}-test-instrumentation-redis
Expand Down Expand Up @@ -173,7 +173,7 @@ deps =
elasticsearch6: elasticsearch>=6.0,<7.0
elasticsearch7: elasticsearch-dsl>=7.0,<8.0
elasticsearch7: elasticsearch>=7.0,<8.0
sqlalchemy13: sqlalchemy~=1.3,<1.4
sqlalchemy11: sqlalchemy>=1.1,<1.2
sqlalchemy14: aiosqlite
sqlalchemy14: sqlalchemy~=1.4

Expand Down Expand Up @@ -208,7 +208,7 @@ changedir =
test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
test-instrumentation-sklearn: instrumentation/opentelemetry-instrumentation-sklearn/tests
test-instrumentation-sqlalchemy{13,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
test-instrumentation-sqlalchemy{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
test-instrumentation-tornado: instrumentation/opentelemetry-instrumentation-tornado/tests
Expand Down Expand Up @@ -293,7 +293,7 @@ commands_pre =

sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]

sqlalchemy{13,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
sqlalchemy{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]

elasticsearch{2,5,6,7}: pip install {toxinidir}/opentelemetry-python-core/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]

Expand Down

0 comments on commit 5e38f5a

Please sign in to comment.