Skip to content

Commit a231262

Browse files
committed
Removing moto from all .pip
Attempting to install where we install pytest (which is from conda) in the main shell / config files.
1 parent bee1b82 commit a231262

12 files changed

+4
-9
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ install:
7272
- cmd: conda info -a
7373

7474
# create our env
75-
- cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist
75+
- cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist moto
7676
- cmd: activate pandas
7777
- SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run
7878
- cmd: echo "installing requirements from %REQ%"

ci/install_circle.sh

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ fi
6565
echo "[create env: ${REQ_BUILD}]"
6666
time conda create -n pandas -q --file=${REQ_BUILD} || exit 1
6767
time conda install -n pandas pytest>=3.1.0 || exit 1
68+
time conda install -n pandas moto || exit 1
6869

6970
source activate pandas
7071

ci/install_travis.sh

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ if [ -e ${REQ} ]; then
104104
fi
105105

106106
time conda install -n pandas pytest>=3.1.0
107+
time conda install -n pandas moto
107108
time pip install pytest-xdist
108109

109110
if [ "$LINT" ]; then

ci/requirements-2.7.pip

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ py
88
PyCrypto
99
mock
1010
ipython
11-
moto

ci/requirements-2.7_SLOW.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
moto

ci/requirements-2.7_WIN.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
moto

ci/requirements-3.5.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
xarray==0.9.1
22
pandas-gbq
3-
moto

ci/requirements-3.5_OSX.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
python-dateutil==2.5.3
2-
moto

ci/requirements-3.6.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
brotlipy
2-
moto

ci/requirements-3.6_LOCALE.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
moto

ci/requirements-3.6_LOCALE_SLOW.pip

-1
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
moto

ci/requirements_dev.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ cython
55
pytest>=3.1.0
66
pytest-cov
77
flake8
8+
moto

0 commit comments

Comments
 (0)