Merge pull request #92 from rmarkello/actions

[TEST] Fix GHA

Author: rmarkello

.github/workflows/tests.yml

@@ -2,6 +2,10 @@ name: netneurotools tests
 
 on: [push, pull_request]
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   check_skip:
     runs-on: ubuntu-latest
@@ -25,6 +29,7 @@ jobs:
       matrix:
         os: ['ubuntu-latest', 'windows-latest', 'macos-latest']
         python-version: ['3.6', '3.7', '3.8', '3.9']
+        architecture: ['x64', 'x86']
         install: ['setup']
         check: ['test']
         optional-depends: ['']
@@ -51,7 +56,7 @@ jobs:
             optional-depends: ''
           - os: ubuntu-latest
             python-version: 3.8
-            install: bdist_wheel
+            install: wheel
             check: test
             optional-depends: ''
         exclude:

.travis.yml

@@ -611,7 +611,7 @@ def gen_spinsamples(coords, hemiid, n_rotate=1000, check_duplicates=True,
         array([[0],
                [0],
                [2],
-               [3]], dtype=int32)
+               [3]])
 
     While this is reasonable in most circumstances, if you feel incredibly
     strongly about having a perfect "permutation" (i.e., all indices appear
@@ -623,13 +623,13 @@ def gen_spinsamples(coords, hemiid, n_rotate=1000, check_duplicates=True,
         array([[1],
                [0],
                [2],
-               [3]], dtype=int32)
+               [3]])
         >>> nnstats.gen_spinsamples(coords, hemi, n_rotate=1, seed=1,
         ...                         method='hungarian', check_duplicates=False)
         array([[0],
                [1],
                [2],
-               [3]], dtype=int32)
+               [3]])
 
     Note that setting this parameter may increase the runtime of the function
     (especially for `method='hungarian'`). Refer to [ST1]_ for information on
@@ -698,11 +698,9 @@ def gen_spinsamples(coords, hemiid, n_rotate=1000, check_duplicates=True,
                          .format(np.unique(hemiid)))
 
     # empty array to store resampling indices
-    # int32 should be enough; if you're ever providing `coords` with more than
-    # 2147483647 rows please reconsider your life choices
-    spinsamples = np.zeros((len(coords), n_rotate), dtype='int32')
+    spinsamples = np.zeros((len(coords), n_rotate), dtype=int)
     cost = np.zeros((len(coords), n_rotate))
-    inds = np.arange(len(coords), dtype='int32')
+    inds = np.arange(len(coords), dtype=int)
 
     # generate rotations and resampling array!
     msg, warned = '', False

netneurotools/stats.py

@@ -149,7 +149,7 @@ def run(cmd, env=None, return_proc=False, quiet=False):
     >>> p = utils.run('echo "hello world"', return_proc=True, quiet=True)
     >>> p.returncode
     0
-    >>> p.stdout
+    >>> p.stdout  # doctest: +SKIP
     'hello world\\n'
     """
 

netneurotools/utils.py

@@ -44,7 +44,7 @@ plotting =
     pysurfer
 numba =
     numba
-linting =
+style =
     flake8
 test =
     coverage
@@ -54,7 +54,7 @@ all =
     %(doc)s
     %(plotting)s
     %(numba)s
-    %(linting)s
+    %(style)s
     %(test)s
 
 [options.package_data]