Merge branch 'master' into py310

.github/workflows/python-publish.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.7'
+        python-version: '3.8'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/testing.yml

@@ -6,10 +6,10 @@ on:
       - "master"
   pull_request:
     branches:
-      - '*'
+      - "*"
   schedule:
     # Run tests every Sunday at 12am
-    - cron: '0 0 * * 0'
+    - cron: "0 0 * * 0"
 
 concurrency:
   group: environment-${{ github.ref }}
@@ -28,38 +28,39 @@ jobs:
       - id: result_step
         uses: mstachniuk/ci-skip@master
         with:
-          commit-filter: '[skip ci];[ci skip];[skip github]'
-          commit-filter-separator: ';'
+          commit-filter: "[skip ci];[ci skip];[skip github]"
+          commit-filter-separator: ";"
 
   run_tests:
     needs: check_skip
     if: ${{ needs.check_skip.outputs.skip == 'false' }}
     runs-on: ${{ matrix.os }}
     strategy:
-        fail-fast: false
-        matrix:
-            os: ["ubuntu-latest", "macos-latest"]
-            python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10"]
+
     name: ${{ matrix.os }} with Python ${{ matrix.python-version }}
     defaults:
       run:
         shell: bash
     steps:
       - uses: actions/checkout@v2
-      - name: 'Set up python'
+      - name: "Set up python"
         uses: actions/setup-python@v2
         with:
-            python-version: ${{ matrix.python-version }}
-      - name: 'Display Python version'
+          python-version: ${{ matrix.python-version }}
+      - name: "Display Python version"
         shell: bash {0}
         run: python -c "import sys; print(sys.version)"
-      - name: 'Install PyMARE'
+      - name: "Install PyMARE"
         shell: bash {0}
         run: pip install -e .[tests,stan]
-      - name: 'Run tests'
+      - name: "Run tests"
         shell: bash {0}
         run: python -m pytest --pyargs pymare --cov=pymare
-      - name: 'Upload coverage to CodeCov'
+      - name: "Upload coverage to CodeCov"
         uses: codecov/codecov-action@v1
         if: success()
 
@@ -73,7 +74,7 @@ jobs:
       - name: Set up Python environment
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
 
       - name: "Install the package"
         shell: bash {0}

.readthedocs.yml

@@ -5,15 +5,18 @@
 # Required
 version: 2
 
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.9"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
 python:
-  version: 3.7
   install:
     - method: pip
       path: .
       extra_requirements:
         - doc
-  system_packages: true

.zenodo.json

@@ -9,6 +9,16 @@
       "name": "Salo, Taylor",
       "affiliation": "Florida International University",
       "orcid": "0000-0001-9813-3167"
+    },
+    {
+      "name": "Peraza, Julio A.",
+      "affiliation": "Florida International University",
+      "orcid": "0000-0003-3816-5903"
+    },
+    {
+      "name": "Nichols, Thomas E.",
+      "affiliation": "Big Data Institute, University of Oxford",
+      "orcid": "0000-0002-4516-5103"
     }
   ],
   "keywords": [

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting our code of conduct enforcer, James Kent, at **[email protected]**.
+All complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances.
+The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -18,8 +18,7 @@ By starting the governance structure early in our development, we hope to welcom
 We are committed to continuing to update the governance structures as necessary.
 Every member of the ``PyMARE`` community is encouraged to comment on these processes and suggest improvements.
 
-As the first interim [Benevolent Dictator for Life (BDFL)](https://en.wikipedia.org/wiki/Benevolent_dictator_for_life), Tal Yarkoni is ultimately responsible for any major decisions pertaining to ``PyMARE`` development.
-However, all potential changes are explicitly and openly discussed in the described channels of communication, and we strive for consensus amongst all community members.
+All potential changes to ``PyMARE`` are explicitly and openly discussed in the described channels of communication, and we strive for consensus amongst all community members.
 
 ## Code of conduct