Skip to content

Commit df0f9fd

Browse files
tests: skip thread test on windows (seems to hang travis often)
1 parent ace9d37 commit df0f9fd

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ before_install:
2525
- ./ci/01-setup-conda.sh
2626
- export PATH="$HOME/miniconda/bin:$PATH"
2727
- ./ci/02-create-vaex-dev-env.sh $PYTHON_VERSION
28-
- source activate test-environment
28+
- source activate vaex-dev
2929
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
3030
conda install gxx_linux-64 -y;
3131
fi

ci/01-setup-conda.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ bash miniconda.sh -b -p $HOME/miniconda
1414
export PATH="$HOME/miniconda/bin:$PATH"
1515
hash -r
1616
# conda config --set always_yes yes --set changeps1 no
17-
# gxx compiler needed otherwise we get an undefined symbol problem for pcre
18-
conda install -y -q -c conda-forge mamba gxx_linux-64 -y;
17+
conda install -y -q -c conda-forge mamba -y;

ci/02-create-vaex-dev-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PYTHON_VERSION=${1:-3.7}
44
CONDA=${2:-conda}
55
conda config --set always_yes yes --set changeps1 no
66
$CONDA update -y -q -c conda-forge $CONDA
7-
$CONDA create -y -q -n vaex-dev python=$PYTHON_VERSION
7+
$CONDA create -y -q -c conda-forge -n vaex-dev python=$PYTHON_VERSION
88
source activate vaex-dev
99
$CONDA install -y -q --file ci/conda-env-nightlies.yml -c arrow-nightlies -c conda-forge
10-
$CONDA install -y -q --file ci/conda-env.yml --file ci/conda-env-notebooks.yml -c conda-forge
10+
$CONDA install -y -q compilers --file ci/conda-env.yml --file ci/conda-env-notebooks.yml -c conda-forge
1111
$CONDA init bash

ci/04-run-test-suite.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22
set -e
3-
PYTHON_VERSION=${1:-3.7}
3+
44
source activate vaex-dev
55
py.test tests packages/vaex-core/vaex/test/dataset.py::TestDataset

tests/execution_test.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
from common import small_buffer
2-
import pytest
31
from unittest.mock import MagicMock
42
from concurrent.futures import ThreadPoolExecutor
53
import concurrent.futures
4+
import platform
5+
6+
import pytest
7+
8+
from common import small_buffer
69
import vaex
710

811

@@ -35,6 +38,7 @@ def progress(fraction):
3538
assert 'nested' in str(exc.value)
3639

3740

41+
@pytest.mark.skipif(platform.system().lower() == 'windows', reason="hangs appveyor very often, bug?")
3842
def test_thread_safe(df_local):
3943
df = df_local
4044

0 commit comments

Comments
 (0)