Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: pin MarkupSafe dependency (backport #3478) #3876

Merged
merged 1 commit into from
Jun 28, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .github/workflows/test_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
# django.tests.requests module interferes with requests library patching in the tracer -> disable requests patch
run: DD_TRACE_REQUESTS_ENABLED=0 ddtrace-run tests/runtests.py

fastapi-testsuite-0_63:
fastapi-testsuite-0_75:
runs-on: ubuntu-latest
env:
DD_TESTING_RAISE: true
Expand All @@ -112,21 +112,18 @@ jobs:
- uses: actions/checkout@v2
with:
repository: tiangolo/fastapi
ref: 0.63.0
ref: 0.75.0
path: fastapi
#This step installs Flit, a way to put Python packages and modules on PyPI (More info at https://flit.readthedocs.io/en/latest/)
- name: Install Flit
run: pip install flit
#Installs all dependencies needed for FastAPI
- name: Install Dependencies
run: flit install --symlink
#Reverts SQLalchemy to v1.3.24. Newest version breaks tests due to RowProxy module being deprecated in latest v1.4.11 More info: (https://docs.sqlalchemy.org/en/14/changelog/migration_14.html#rowproxy-is-no-longer-a-proxy-is-now-called-row-and-behaves-like-an-enhanced-named-tuple)
- name: Downgrade SQLalchemy
run: pip install --force-reinstall SQLAlchemy==1.3.24
- name: Inject ddtrace
run: pip install ../ddtrace
- name: Test
run: ddtrace-run pytest tests
run: ddtrace-run pytest -p no:warnings tests

flask-testsuite-1_1_4:
runs-on: ubuntu-latest
Expand All @@ -153,13 +150,16 @@ jobs:
run: pip install tox
- name: Create tox env
run: tox -e py38 --notest
- name: Inject ddtrace
run: .tox/py38/bin/pip install ../ddtrace
- name: Add pytest configuration for ddtrace
run: echo -e "[pytest]\nddtrace-patch-all = 1" > pytest.ini
- name: Run tests
# test_exception_propagation is broken upstream
run: tox -e py38 -- -k 'not test_exception_propagation and not test_memory_consumption'
run: |
source .tox/py38/bin/activate
pip install ../ddtrace
pip install -e .
pip install --upgrade MarkupSafe==2.0.1
pytest -p no:warnings -k 'not test_exception_propagation and not test_memory_consumption' tests/

httpx-testsuite-0_22_0:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -276,6 +276,8 @@ jobs:
run: pip install ../ddtrace
- name: Install dependencies
run: "make init"
- name: MarkupSafe fix
run: pip install --upgrade MarkupSafe==2.0.1
- name: Run tests
run: ddtrace-run pytest -p no:warnings tests

Expand Down