8000 Merge pull request #9773 from dopplershift/fix-appveyor by tacaswell · Pull Request #9850 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Merge pull request #9773 from dopplershift/fix-appveyor #9850

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 25, 2017
Merged

Merge pull request #9773 from dopplershift/fix-appveyor #9850

merged 1 commit into from
Nov 25, 2017

Conversation

tacaswell
Copy link
Member

CI: Make sure AppVeyor fails if tests fail

PR Summary

The appveyor configuration is still a bit different between 2.1.x and master

14:17 $ git diff origin/master .appveyor.yml
diff --git a/.appveyor.yml b/.appveyor.yml
index a2a0f9f8c..52882a18f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,8 +12,10 @@ environment:
 
   global:
     PYTHONIOENCODING: UTF-8
-    PYTEST_ARGS: -rawR --numprocesses=auto --timeout=300 --durations=25
-                 --cov-report= --cov=lib -m "not network"
+    PYTEST_ARGS: -rawR --timeout=300 --durations=25 --cov-report= --cov=lib -m "not network"
+    PYTHONHASHSEED: 0  # Workaround for pytest-xdist flaky collection order
+                       # https://github.com/pytest-dev/pytest/issues/920
+                       # https://github.com/pytest-dev/pytest/issues/1075
 
   matrix:
     # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
@@ -61,12 +63,14 @@ install:
   # https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
   #
   - conda create -q -n test-environment python=%PYTHON_VERSION%
-    msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
-    pip setuptools numpy mock pandas sphinx tornado
+    pip setuptools numpy python-dateutil freetype=2.6 msinttypes "tk=8.5"
+    pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10"
+    mock sphinx pandas
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
+  - if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q pytest "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176

@tacaswell
Merge pull request matplotlib#9773 from dopplershift/fix-appveyor
88a20b7 
CI: Make sure AppVeyor fails if tests fail
@tacaswell tacaswell added this to the v2.1.1 milestone Nov 24, 2017
@tacaswell tacaswell merged commit 032b374 into matplotlib:v2.1.x Nov 25, 2017
@tacaswell tacaswell deleted the backport_appveyor_fix branch November 25, 2017 00:41
@tacaswell tacaswell mentioned this pull request Nov 25, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dopplershift dopplershift dopplershift approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.1.1
Development

Successfully merging this pull request may close these issues.
2 participants
@tacaswell @dopplershift
0