diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ae4b692..9080614 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -4,7 +4,7 @@ on: push: branches: - "master" - pull_request_target: + pull_request: branches: - "*" schedule: @@ -27,7 +27,7 @@ jobs: outputs: skip: ${{ steps.result_step.outputs.ci-skip }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - id: result_step @@ -51,7 +51,7 @@ jobs: run: shell: bash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: "Set up python" uses: actions/setup-python@v2 with: @@ -74,7 +74,7 @@ jobs: name: Lint with flake8 steps: - name: Check out source repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python environment uses: actions/setup-python@v2 diff --git a/pymare/results.py b/pymare/results.py index 19ec5d1..4981430 100644 --- a/pymare/results.py +++ b/pymare/results.py @@ -1,6 +1,7 @@ """Tools for representing and manipulating meta-regression results.""" import itertools +import math from functools import lru_cache from inspect import getfullargspec from warnings import warn @@ -322,7 +323,7 @@ def permutation_test(self, n_perm=1000): # Calculate # of permutations and determine whether to use exact test if has_mods: - n_exact = np.math.factorial(n_obs) + n_exact = math.factorial(n_obs) else: n_exact = 2**n_obs if n_exact < n_perm: diff --git a/setup.cfg b/setup.cfg index 923d850..0df3a1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,8 @@ classifiers = [options] python_requires = >= 3.8 install_requires = - numpy>=1.8.0 + numpy>=1.8.0,<2.0; python_version == "3.9" and extra == 'stan' + numpy>=1.8.0; python_version != "3.9" or extra != 'stan' pandas scipy sympy