Skip to content

Commit 6433cf1

Browse files
authored
Merge branch 'master' into pre-commit-ci-update-config
2 parents 97fdc71 + abb98d5 commit 6433cf1

27 files changed

+1340
-188
lines changed

.all-contributorsrc

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
"ideas"
1616
]
1717
},
18+
{
19+
"login": "ineschh",
20+
"name": "Inés Chavarría",
21+
"avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
22+
"profile": "https://github.com/ineschh",
23+
"contributions": [
24+
"infra"
25+
]
26+
},
1827
{
1928
"login": "eril892",
2029
"name": "Raphaël Fournier",
@@ -26,6 +35,20 @@
2635
"doc"
2736
]
2837
},
38+
{
39+
"login": "maestroque",
40+
"name": "George Kikas",
41+
"avatar_url": "https://avatars.githubusercontent.com/u/74024609?v=4",
42+
"profile": "https://github.com/maestroque",
43+
"contributions": [
44+
"code",
45+
"ideas",
46+
"infra",
47+
"bug",
48+
"test",
49+
"review"
50+
]
51+
},
2952
{
3053
"login": "TomasLenc",
3154
"name": "Tomas Lenc",
@@ -56,6 +79,16 @@
5679
"mentoring"
5780
]
5881
},
82+
{
83+
"login": "m-miedema",
84+
"name": "m-miedema",
85+
"avatar_url": "https://avatars.githubusercontent.com/u/39968233?v=4",
86+
"profile": "https://github.com/m-miedema",
87+
"contributions": [
88+
"review",
89+
"mentoring"
90+
]
91+
},
5992
{
6093
"login": "smoia",
6194
"name": "Stefano Moia",
@@ -80,6 +113,16 @@
80113
"code"
81114
]
82115
},
116+
{
117+
"login": "me-pic",
118+
"name": "Marie-Eve Picard",
119+
"avatar_url": "https://avatars.githubusercontent.com/u/77584086?v=4",
120+
"profile": "https://github.com/me-pic",
121+
"contributions": [
122+
"review",
123+
"infra"
124+
]
125+
},
83126
{
84127
"login": "tsalo",
85128
"name": "Taylor Salo",
@@ -92,12 +135,13 @@
92135
]
93136
},
94137
{
95-
"login": "ineschh",
96-
"name": "Inés Chavarría",
97-
"avatar_url": "https://avatars.githubusercontent.com/u/72545702?v=4",
98-
"profile": "https://github.com/ineschh",
138+
"login": "RayStick",
139+
"name": "Rachael Stickland",
140+
"avatar_url": "https://avatars.githubusercontent.com/u/50215726?v=4",
141+
"profile": "https://github.com/RayStick",
99142
"contributions": [
100-
"infra"
143+
"infra",
144+
"doc"
101145
]
102146
},
103147
{

.circleci/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ orbs:
1515
# Define a job to be invoked later in a workflow.
1616
# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
1717
jobs:
18-
test37: # This is the name of the job, feel free to change it to better match what you're trying to do!
18+
test39: # This is the name of the job, feel free to change it to better match what you're trying to do!
1919
# These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
2020
# You can specify an image from Dockerhub or use one of the convenience images from CircleCI's Developer Hub
2121
# A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
2222
# The executor is the environment in which the steps below will be executed - below will use a python 3.6.14 container
2323
# Change the version below to your required version of python
2424
docker:
25-
- image: cimg/python:3.7
25+
- image: cimg/python:3.9
2626
working_directory: /tmp/src/phys2denoise
2727
resource_class: medium
2828
# Checkout the code as the first step. This is a dedicated CircleCI step.
@@ -46,7 +46,7 @@ jobs:
4646
command: |
4747
pytest --cov=./phys2denoise
4848
mkdir /tmp/src/coverage
49-
mv ./.coverage /tmp/src/coverage/.coverage.py37
49+
mv ./.coverage /tmp/src/coverage/.coverage.py39
5050
- store_artifacts:
5151
path: /tmp/src/coverage
5252
# Persist the specified paths (workspace/echo-output) into the workspace for use in downstream job.
@@ -56,11 +56,11 @@ jobs:
5656
root: /tmp
5757
# Must be relative path from root
5858
paths:
59-
- src/coverage/.coverage.py37
59+
- src/coverage/.coverage.py39
6060

61-
test310:
61+
test311:
6262
docker:
63-
- image: cimg/python:3.10
63+
- image: cimg/python:3.11
6464
working_directory: /tmp/src/phys2denoise
6565
resource_class: medium
6666
steps:
@@ -75,17 +75,17 @@ jobs:
7575
command: |
7676
pytest --cov=./phys2denoise
7777
mkdir /tmp/src/coverage
78-
mv ./.coverage /tmp/src/coverage/.coverage.py310
78+
mv ./.coverage /tmp/src/coverage/.coverage.py311
7979
- store_artifacts:
8080
path: /tmp/src/coverage
8181
- persist_to_workspace:
8282
root: /tmp
8383
paths:
84-
- src/coverage/.coverage.py310
84+
- src/coverage/.coverage.py311
8585

8686
style_check:
8787
docker:
88-
- image: cimg/python:3.7
88+
- image: cimg/python:3.9
8989
working_directory: /tmp/src/phys2denoise
9090
resource_class: small
9191
steps:
@@ -105,7 +105,7 @@ jobs:
105105
merge_coverage:
106106
working_directory: /tmp/src/phys2denoise
107107
docker:
108-
- image: cimg/python:3.10
108+
- image: cimg/python:3.11
109109
resource_class: small
110110
steps:
111111
- attach_workspace:
@@ -133,13 +133,13 @@ workflows:
133133
# Inside the workflow, you define the jobs you want to run.
134134
jobs:
135135
- style_check
136-
- test37:
136+
- test39:
137137
requires:
138138
- style_check
139-
- test310:
139+
- test311:
140140
requires:
141141
- style_check
142142
- merge_coverage:
143143
requires:
144-
- test37
145-
- test310
144+
- test39
145+
- test311

.readthedocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ python:
2020
path: .
2121
extra_requirements:
2222
- doc
23-
system_packages: true

0 commit comments

Comments
 (0)