diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index cb4f9117d6..100c332440 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -24,7 +24,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: ['ubuntu-18.04'] + os: ['ubuntu-latest'] python-version: [3.8] nipype-extras: ['dev'] check: ['specs', 'style'] @@ -38,12 +38,12 @@ jobs: CI_SKIP_TEST: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Display Python version @@ -64,12 +64,12 @@ jobs: - name: Run tests run: tools/ci/check.sh if: ${{ matrix.check != 'skiptests' }} - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: file: coverage.xml if: ${{ always() }} - name: Upload pytest test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: pytest-results-${{ matrix.os }}-${{ matrix.python-version }} path: test-results.xml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 92b093468a..2d4d665448 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -26,9 +26,9 @@ jobs: - os: ubuntu-latest python-version: 3.8 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Display Python version diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9252958f2d..65aba65687 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,12 +54,12 @@ jobs: CI_SKIP_TEST: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Display Python version @@ -80,12 +80,12 @@ jobs: - name: Run tests run: tools/ci/check.sh if: ${{ matrix.check != 'skiptests' }} - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: file: coverage.xml if: ${{ always() }} - name: Upload pytest test results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: pytest-results-${{ matrix.os }}-${{ matrix.python-version }} path: test-results.xml diff --git a/nipype/algorithms/tests/test_CompCor.py b/nipype/algorithms/tests/test_CompCor.py index eeb3ce42db..51b1ea60f7 100644 --- a/nipype/algorithms/tests/test_CompCor.py +++ b/nipype/algorithms/tests/test_CompCor.py @@ -12,6 +12,8 @@ def close_up_to_column_sign(a, b, rtol=1e-05, atol=1e-08, equal_nan=False): """SVD can produce sign flips on a per-column basis.""" + a = np.asanyarray(a) + b = np.asanyarray(b) kwargs = dict(rtol=rtol, atol=atol, equal_nan=equal_nan) if np.allclose(a, b, **kwargs): return True diff --git a/nipype/info.py b/nipype/info.py index 4de8f9ff01..bfc4e2f841 100644 --- a/nipype/info.py +++ b/nipype/info.py @@ -104,6 +104,7 @@ def get_nipype_gitversion(): NUMPY_MIN_VERSION = "1.17" SCIPY_MIN_VERSION = "0.14" TRAITS_MIN_VERSION = "4.6" +TRAITS_MAX_VERSION = "6.4" DATEUTIL_MIN_VERSION = "2.2" SIMPLEJSON_MIN_VERSION = "3.8.0" PROV_MIN_VERSION = "1.5.2" @@ -143,7 +144,7 @@ def get_nipype_gitversion(): "rdflib>=%s" % RDFLIB_MIN_VERSION, "scipy>=%s" % SCIPY_MIN_VERSION, "simplejson>=%s" % SIMPLEJSON_MIN_VERSION, - "traits>=%s,!=5.0" % TRAITS_MIN_VERSION, + "traits>=%s,<%s,!=5.0" % (TRAITS_MIN_VERSION, TRAITS_MAX_VERSION), "filelock>=3.0.0", "etelemetry>=0.2.0", "looseversion",