Skip to content

MNT: Pin traits < 6.4 #3501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 22, 2022
Merged

MNT: Pin traits < 6.4 #3501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59833da
MNT: Pin traits < 6.4
effigies Aug 22, 2022
f4a1f52
CI: Update build OS, actions
effigies Aug 22, 2022
ac1e2d1
TEST: Coerce close_up_to_column_sign args to arrays before checking f…
effigies Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/contrib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions nipype/algorithms/tests/test_CompCor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion nipype/info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down