Use the master branch of array-api-tests everywhere

Author: asmeurer

.github/workflows/array-api-tests.yml

@@ -45,9 +45,8 @@ jobs:
         submodules: 'true'
         path: array-api-tests
 
-        # Temporarily use https://github.com/data-apis/array-api-tests/pull/157
-        repository: asmeurer/array-api-tests
-        ref: xfails-file
+        repository: data-apis/array-api-tests
+        ref: master
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

test_cupy.sh

@@ -18,12 +18,6 @@ cd $tmpdir
 git clone https://github.com/data-apis/array-api-tests
 cd array-api-tests
 
-# Remove this once https://github.com/data-apis/array-api-tests/pull/157 is
-# merged
-git remote add asmeurer https://github.com/asmeurer/array-api-tests
-git fetch asmeurer
-git checkout asmeurer/xfails-file
-
 git submodule update --init
 
 # store the hypothesis examples database in this directory, so that failures