Skip to content

Commit 5060069

Browse files
Merge remote-tracking branch 'upstream/main' into preview_docs
2 parents 3f65497 + fd9a9ea commit 5060069

File tree

131 files changed

+2358
-991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2358
-991
lines changed

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ jobs:
1414
steps:
1515
- checkout
1616
- run: .circleci/setup_env.sh
17-
- run: PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH ci/run_tests.sh
17+
- run: >
18+
PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH
19+
LD_PRELOAD=$HOME/miniconda3/envs/pandas-dev/lib/libgomp.so.1:$LD_PRELOAD
20+
ci/run_tests.sh
1821
1922
workflows:
2023
test:

.github/workflows/sdist.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,4 @@ jobs:
9292
- name: Import pandas
9393
run: |
9494
cd ..
95-
conda list
9695
python -c "import pandas; pandas.show_versions();"

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
env_file: actions-pypy-38.yaml
7474
pattern: "not slow and not network and not single_cpu"
7575
test_args: "--max-worker-restart 0"
76-
error_on_warnings: "0"
7776
- name: "Numpy Dev"
7877
env_file: actions-310-numpydev.yaml
7978
pattern: "not slow and not network and not single_cpu"

.pre-commit-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,3 @@ repos:
443443
types: [python]
444444
files: ^pandas/tests
445445
language: python
446-
exclude: |
447-
(?x)
448-
^pandas/tests/generic/test_generic.py # GH50380

0 commit comments

Comments
 (0)