Skip to content

Revert "CI: use pytest-timeout to avoid windows timeouts" #44858

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

Merged
merged 1 commit into from
Dec 13, 2021
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/python-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
pip install git+https://github.com/nedbat/coveragepy.git
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov pytest-timeout
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
pip list

- name: Build Pandas
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
. ~/virtualenvs/pandas-dev/bin/activate && \
python -m pip install --no-deps -U pip wheel setuptools && \
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines pytest-timeout && \
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
python setup.py build_ext -q -j2 && \
python -m pip install --no-build-isolation -e . && \
pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml"
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-db-min.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# required
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- cython>=0.29.24
- pytest>=6.0
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3
- pytest-cov>=2.10.1 # this is only needed in the coverage build, ref: GH 35737

Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- pytest-asyncio>=0.12.0
- hypothesis>=5.5.3

Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-minimum_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3
- psutil

Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-39-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-39-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/actions-39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-macos-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
# tools
- pytest>=6.0
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3
- pytest-azurepipelines

Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-windows-38.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- cython>=0.29.24
- pytest>=6.0
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3
- pytest-azurepipelines

Expand Down
1 change: 0 additions & 1 deletion ci/deps/azure-windows-39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ dependencies:
- cython>=0.29.24
- pytest>=6.0
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3
- pytest-azurepipelines

Expand Down
1 change: 0 additions & 1 deletion ci/deps/circle-38-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- cython>=0.29.24
- pytest>=6.0
- pytest-xdist>=1.31
- pytest-timeout
- hypothesis>=5.5.3

# pandas dependencies
Expand Down
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ dependencies:
- pytest>=6.0
- pytest-cov
- pytest-xdist>=1.31
- pytest-timeout
- pytest-asyncio
- pytest-instafail

Expand Down
2 changes: 0 additions & 2 deletions pandas/tests/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@
pytest.mark.filterwarnings(
"ignore:As the xlwt package is no longer maintained:FutureWarning"
),
# Troubleshooting build failures that look like network timeouts
pytest.mark.timeout(60),
]
4 changes: 0 additions & 4 deletions pandas/tests/io/test_user_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
import pandas as pd
import pandas._testing as tm

# Troubleshooting build failures on Windows that tentatively look like
# they are stalling in this file.
pytestmark = pytest.mark.timeout(60)


class BaseUserAgentResponder(http.server.BaseHTTPRequestHandler):
"""
Expand Down
1 change: 0 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ flask
pytest>=6.0
pytest-cov
pytest-xdist>=1.31
pytest-timeout
pytest-asyncio
pytest-instafail
seaborn
Expand Down