Fix pandas master build [skip ci]

This commit is contained in:
Krisztián Szűcs committed 2019-11-08 17:10:41 +01:00
1 parent 3814e0828a
commit e0e2e1f46b
3 files changed
+2 -20

No files matched your search

@@ -23,7 +23,7 @@ FROM ${org}/${arch}-conda-${conda}-python-${python}:latest
ARG dask=latest
RUN if [ "${dask}" = "master" ]; then \
pip install https://github.com/dask/dask/archive/master.zip; \
pip install git+https://github.com/dask/dask; \
elif [ "${dask}" = "latest" ]; then \
conda install -q dask && conda clean --all; \
else \
@@ -23,7 +23,7 @@ FROM ${org}/${arch}-conda-${conda}-python-${python}:latest
ARG pandas=latest
RUN if [ "${pandas}" = "master" ]; then \
pip install https://github.com/pandas-dev/pandas/archive/master.zip; \
pip install git+https://github.com/pandas-dev/pandas; \
elif [ "${pandas}" = "latest" ]; then \
conda install -q pandas && conda clean --all; \
else \
-18
View File
@@ -98,7 +98,6 @@ groups:
- test-conda-python-3.6
- test-conda-python-3.7
- test-debian-10-python-3
- test-ubuntu-16.04-python-3
- test-ubuntu-18.04-python-3
- test-fedora-29-python-3
- test-ubuntu-18.04-r-3.6
@@ -138,7 +137,6 @@ groups:
- test-conda-python-3.6
- test-conda-python-3.7
- test-debian-10-python-3
- test-ubuntu-16.04-python-3
- test-ubuntu-18.04-python-3
- test-fedora-29-python-3
- test-ubuntu-18.04-r-3.6
@@ -168,7 +166,6 @@ groups:
- test-conda-python-3.6
- test-conda-python-3.7
- test-debian-10-python-3
- test-ubuntu-16.04-python-3
- test-ubuntu-18.04-python-3
- test-fedora-29-python-3
@@ -250,7 +247,6 @@ groups:
- test-conda-python-3.6
- test-conda-python-3.7
- test-debian-10-python-3
- test-ubuntu-16.04-python-3
- test-ubuntu-18.04-python-3
- test-fedora-29-python-3
- test-ubuntu-18.04-r-3.6
@@ -1718,20 +1714,6 @@ tasks:
- docker-compose run debian-python
- docker-compose push --ignore-push-failures debian-python
test-ubuntu-16.04-python-3:
ci: circle
platform: linux
template: docker-tests/circle.linux.yml
params:
commands:
- export UBUNTU=16.04
- docker-compose pull --ignore-pull-failures ubuntu-cpp
- docker-compose pull --ignore-pull-failures ubuntu-python
- docker-compose build ubuntu-cpp
- docker-compose build ubuntu-python
- docker-compose run ubuntu-python
- docker-compose push --ignore-push-failures ubuntu-python
test-ubuntu-18.04-python-3:
ci: circle
platform: linux