Merge branch 'master' into pre-commit-ci-update-config

physiopy · Aug 30, 2024 · 6433cf1 · 6433cf1
2 parents 97fdc71 + abb98d5
commit 6433cf1
Show file tree

Hide file tree

Showing 27 changed files with 1,340 additions and 188 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -15,6 +15,15 @@
         "ideas"
       ]
     },
+    {
+      "login": "ineschh",
+      "name": "Inés Chavarría",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
+      "profile": "https://github.com/ineschh",
+      "contributions": [
+        "infra"
+      ]
+    },
     {
       "login": "eril892",
       "name": "Raphaël Fournier",
@@ -26,6 +35,20 @@
         "doc"
       ]
     },
+    {
+      "login": "maestroque",
+      "name": "George Kikas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74024609?v=4",
+      "profile": "https://github.com/maestroque",
+      "contributions": [
+        "code",
+        "ideas",
+        "infra",
+        "bug",
+        "test",
+        "review"
+      ]
+    },
     {
       "login": "TomasLenc",
       "name": "Tomas Lenc",
@@ -56,6 +79,16 @@
         "mentoring"
       ]
     },
+    {
+      "login": "m-miedema",
+      "name": "m-miedema",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39968233?v=4",
+      "profile": "https://github.com/m-miedema",
+      "contributions": [
+        "review",
+        "mentoring"
+      ]
+    },
     {
       "login": "smoia",
       "name": "Stefano Moia",
@@ -80,6 +113,16 @@
         "code"
       ]
     },
+    {
+      "login": "me-pic",
+      "name": "Marie-Eve Picard",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77584086?v=4",
+      "profile": "https://github.com/me-pic",
+      "contributions": [
+        "review",
+        "infra"
+      ]
+    },
     {
       "login": "tsalo",
       "name": "Taylor Salo",
@@ -92,12 +135,13 @@
       ]
     },
     {
-      "login": "ineschh",
-      "name": "Inés Chavarría",
-      "avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
-      "profile": "https://github.com/ineschh",
+      "login": "RayStick",
+      "name": "Rachael Stickland",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50215726?v=4",
+      "profile": "https://github.com/RayStick",
       "contributions": [
-        "infra"
+        "infra",
+        "doc"
       ]
     },
     {

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,14 +15,14 @@ orbs:
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  test37: # This is the name of the job, feel free to change it to better match what you're trying to do!
+  test39: # This is the name of the job, feel free to change it to better match what you're trying to do!
     # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
     # You can specify an image from Dockerhub or use one of the convenience images from CircleCI's Developer Hub
     # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
     # The executor is the environment in which the steps below will be executed - below will use a python 3.6.14 container
     # Change the version below to your required version of python
     docker:
-      - image: cimg/python:3.7
+      - image: cimg/python:3.9
     working_directory: /tmp/src/phys2denoise
     resource_class: medium
     # Checkout the code as the first step. This is a dedicated CircleCI step.
@@ -46,7 +46,7 @@ jobs:
           command: |
             pytest --cov=./phys2denoise
             mkdir /tmp/src/coverage
-            mv ./.coverage /tmp/src/coverage/.coverage.py37
+            mv ./.coverage /tmp/src/coverage/.coverage.py39
       - store_artifacts:
           path: /tmp/src/coverage
       # Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
@@ -56,11 +56,11 @@ jobs:
           root: /tmp
           # Must be relative path from root
           paths:
-            - src/coverage/.coverage.py37
+            - src/coverage/.coverage.py39
 
-  test310:
+  test311:
     docker:
-      - image: cimg/python:3.10
+      - image: cimg/python:3.11
     working_directory: /tmp/src/phys2denoise
     resource_class: medium
     steps:
@@ -75,17 +75,17 @@ jobs:
           command: |
             pytest --cov=./phys2denoise
             mkdir /tmp/src/coverage
-            mv ./.coverage /tmp/src/coverage/.coverage.py310
+            mv ./.coverage /tmp/src/coverage/.coverage.py311
       - store_artifacts:
           path: /tmp/src/coverage
       - persist_to_workspace:
           root: /tmp
           paths:
-            - src/coverage/.coverage.py310
+            - src/coverage/.coverage.py311
 
   style_check:
     docker:
-      - image: cimg/python:3.7
+      - image: cimg/python:3.9
     working_directory: /tmp/src/phys2denoise
     resource_class: small
     steps:
@@ -105,7 +105,7 @@ jobs:
   merge_coverage:
     working_directory: /tmp/src/phys2denoise
     docker:
-      - image: cimg/python:3.10
+      - image: cimg/python:3.11
     resource_class: small
     steps:
       - attach_workspace:
@@ -133,13 +133,13 @@ workflows:
     # Inside the workflow, you define the jobs you want to run.
     jobs:
       - style_check
-      - test37:
+      - test39:
           requires:
             - style_check
-      - test310:
+      - test311:
           requires:
             - style_check
       - merge_coverage:
           requires:
-            - test37
-            - test310
+            - test39
+            - test311
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -20,4 +20,3 @@ python:
       path: .
       extra_requirements:
         - doc
-  system_packages: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,3 @@ python: @@
           path: .
           extra_requirements:
             - doc
-      system_packages: true