Clean up appveyor.yml

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jul 20, 2015 · e5c0122 · e5c0122
1 parent ad32b46
commit e5c0122
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ install:
 # We run tests and nikola (to see if the command is executable) OR flake8.
 # We run `nikola` and `nikola help` because things may break due to human
 # errors in argument parsing (cf. 96e78dd)
-# WARNING: if you edit this, make sure to replicate your changes in dodo.py.
+# WARNING: if you edit this, make sure to replicate your changes in dodo.py and appveyor.yml.
 script:
   - "if [[ $NMODE == 'nikola' ]]; then py.test --doctest-modules nikola/; fi"
   - "if [[ $NMODE == 'nikola' ]]; then py.test --cov nikola --cov-report term-missing tests/; fi"

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,16 +8,13 @@ init:
   - "ECHO %PYTHON%"
   - ps: "ls C:/Python*"
 install:
-  - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py')
-  - "%PYTHON%/python.exe C:/get-pip.py"
-  - "%PYTHON%/Scripts/pip.exe install --upgrade setuptools"
   - "%PYTHON%/Scripts/pip.exe install -r requirements-extras.txt pytest mock freezegun"
-  - "%PYTHON%/python.exe setup.py install"
+  - "%PYTHON%/Scripts/pip.exe install ."
 
 test_script:
   - "set path=%PYTHON%/Scripts;%path%"
   - "%PYTHON%/python.exe --version"
   - "%PYTHON%/Scripts/pip.exe --version"
-  - "%PYTHON%/python.exe setup.py test"
-  - "%nikola"
-  - "%nikola help"
+  - "py.test tests/"
+  - "nikola"
+  - "nikola help"