From 5efb8fd0afd49dd2a53bb0a6eb448ff79f683f76 Mon Sep 17 00:00:00 2001
From: Atsushi Sakai <asakai.amsl+github@gmail.com>
Date: Wed, 6 Jan 2021 21:34:45 +0900
Subject: [PATCH] Remove workaround codes for CI (#455)

* remove workaround codes

* remove workaround codes

* remove workaround codes
---
 .circleci/config.yml           | 4 +---
 .github/workflows/Linux_CI.yml | 2 --
 .github/workflows/MacOS_CI.yml | 2 --
 appveyor.yml                   | 3 +--
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ec05a3a..4cb628ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,13 +8,11 @@ jobs:
     docker:
       - image: circleci/python:3.9
     steps:
-      - run: sudo apt-get update && sudo apt-get install -y cmake # TODO: remove after osqp wheels released
       - checkout
       - python/load-cache
-      - run: pip install numpy # TODO: remove after osqp wheels released
       - python/install-deps
       - python/save-cache
-      - run: pip install sphinx sphinx-autobuild sphinx-rtd-theme
+      - run: pip install sphinx sphinx-autobuild sphinx-rtd-theme pytest
       - run:
           command: cd docs;make html
           name: doc_build
diff --git a/.github/workflows/Linux_CI.yml b/.github/workflows/Linux_CI.yml
index 61be0991..d4ec8862 100644
--- a/.github/workflows/Linux_CI.yml
+++ b/.github/workflows/Linux_CI.yml
@@ -21,10 +21,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      # TODO: remove numpy installation after fix cvxpy install issue
       run: |
         python -m pip install --upgrade pip
-        pip install numpy
         python -m pip install -r requirements.txt
     - name: install coverage
       run: pip install coverage
diff --git a/.github/workflows/MacOS_CI.yml b/.github/workflows/MacOS_CI.yml
index 84ef7515..8c2fe849 100644
--- a/.github/workflows/MacOS_CI.yml
+++ b/.github/workflows/MacOS_CI.yml
@@ -23,10 +23,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        # TODO: remove numpy installation after fix cvxpy install issue
         run: |
           python -m pip install --upgrade pip
-          pip install numpy
           pip install -r requirements.txt
       - name: install coverage
         run: pip install coverage
diff --git a/appveyor.yml b/appveyor.yml
index 9fd74302..2a925433 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,7 +33,6 @@ install:
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH%
   - SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
   - "python -m pip install --upgrade pip"
-  - "pip install numpy" # TODO: remove this line after osqp wheel released
   - "python -m pip install -r requirements.txt"
 
   # Check that we have the expected version and architecture for Python
@@ -43,4 +42,4 @@ install:
 build: off
 
 test_script:
-  - "python -Wignore -m unittest discover tests"
+  - "pytest tests -Werror --durations=0"