Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- "master"
pull_request_target:
pull_request:
branches:
- "*"
schedule:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pymare/results.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading