Skip to content

Commit 6f7e566

Browse files
authored
Revert xdist addition (#277)
* Revert "Add xdist to image compare (#266)" This reverts commit 500e45b. * Revert "Racing condition xdist fix (#273)" This reverts commit c939ae7.
1 parent b37e7be commit 6f7e566

File tree

17 files changed

+197
-2064
lines changed

17 files changed

+197
-2064
lines changed

.github/workflows/build-ultraplot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Test Ultraplot
4545
run: |
46-
pytest -n auto --cov=ultraplot --cov-branch --cov-report term-missing --cov-report=xml ultraplot
46+
pytest --cov=ultraplot --cov-branch --cov-report term-missing --cov-report=xml ultraplot
4747
4848
- name: Upload coverage reports to Codecov
4949
uses: codecov/codecov-action@v5
@@ -76,14 +76,14 @@ jobs:
7676
git fetch origin ${{ github.event.pull_request.base.sha }}
7777
git checkout ${{ github.event.pull_request.base.sha }}
7878
python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
79-
pytest -n auto -W ignore --mpl-generate-path=baseline --mpl-default-style="./ultraplot.yml"
79+
pytest -W ignore --mpl-generate-path=baseline --mpl-default-style="./ultraplot.yml"
8080
git checkout ${{ github.sha }} # Return to PR branch
8181
8282
- name: Image Comparison Ultraplot
8383
run: |
8484
mkdir -p results
8585
python -c "import ultraplot as plt; plt.config.Configurator()._save_yaml('ultraplot.yml')"
86-
pytest -n auto -W ignore --mpl --mpl-baseline-path=baseline --mpl-generate-summary=html --mpl-results-path=./results/ --mpl-default-style="./ultraplot.yml" --store-failed-only ultraplot/tests
86+
pytest -W ignore --mpl --mpl-baseline-path=baseline --mpl-generate-summary=html --mpl-results-path=./results/ --mpl-default-style="./ultraplot.yml" --store-failed-only ultraplot/tests
8787
8888
# Return the html output of the comparison even if failed
8989
- name: Upload comparison failures

environment.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@ name: ultraplot-dev
22
channels:
33
- conda-forge
44
dependencies:
5-
- basemap >=1.4.1
6-
- cartopy
7-
- jupyter
8-
- jupytext
9-
- matplotlib>=3.9
10-
- nbsphinx
11-
- networkx
5+
- python>=3.10,<3.14
126
- numpy
7+
- matplotlib>=3.9
8+
- cartopy
9+
- xarray
10+
- seaborn
1311
- pandas
14-
- pint
15-
- pip
16-
- pre-commit
17-
- pyarrow
1812
- pytest
19-
- pytest-cov
2013
- pytest-mpl
21-
- pytest-xdist
22-
- python>=3.10,<3.14
23-
- seaborn
14+
- pytest-cov
15+
- jupyter
16+
- pip
17+
- pint
2418
- sphinx
19+
- nbsphinx
20+
- jupytext
21+
- sphinx-copybutton
2522
- sphinx-autoapi
2623
- sphinx-automodapi
27-
- sphinx-copybutton
28-
- sphinx-design
2924
- sphinx-rtd-theme
3025
- typing-extensions
31-
- xarray
26+
- basemap >=1.4.1
27+
- pre-commit
28+
- sphinx-design
29+
- networkx
30+
- pyarrow
3231
- pip:
3332
- git+https://github.com/ultraplot/UltraTheme.git

0 commit comments

Comments
 (0)