Merge branch 'master' into patch-1

filmor · web-flow · commit aaf8599db450 · 2017-09-21T10:10:00.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ before_install:
   - export LD_LIBRARY_PATH=$PY_LIBDIR:$LD_LIBRARY_PATH
 
 install:
+  - pip install --upgrade setuptools # TEMP - due to setuptools 36.2.0 bug
   - pip install --upgrade -r requirements.txt
   - coverage run setup.py install
 
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ static void Main(string[] args)
         dynamic a = np.array(new List<float> { 1, 2, 3 });
         Console.WriteLine(a.dtype);
 
-        dynamic b = np.array(new List<float> { 6, 5, 4 }, dtype=np.int32);
+        dynamic b = np.array(new List<float> { 6, 5, 4 }, dtype: np.int32);
         Console.WriteLine(b.dtype);
 
         Console.WriteLine(a * b);
diff --git a/appveyor.yml b/appveyor.yml
@@ -47,11 +47,11 @@ test_script:
 on_finish:
   # Temporary disable multiple upload due to codecov limit of 20 per commit.
   # https://docs.codecov.io/blog/week-8-2017
-  # - coverage xml -i
+  - coverage xml -i
   # - codecov --file coverage.xml --flags setup_windows
   # - codecov --file py.coverage --flags python_tests
   # - codecov --file cs.coverage --flags embedded_tests
-  - codecov --flags setup_windows
+  - codecov --file py.coverage cs.coverage coverage.xml --flags setup_windows
 
 artifacts:
   - path: dist\*
diff --git a/requirements.txt b/requirements.txt
@@ -2,11 +2,10 @@
 pytest
 coverage
 
+# Coverage upload
+codecov
+
 # Platform specific requirements
 pip; sys_platform == 'win32'
 wheel; sys_platform == 'win32'
 pycparser; sys_platform != 'win32'
-
-# Coverage upload
-# codecov v2.0.6 isn't on PyPi
-https://github.com/codecov/codecov-python/tarball/v2.0.6
