Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/maint/23.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
effigies committed Oct 12, 2023
2 parents 188a245 + 1e772fb commit 2c5eaa0
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 6 deletions.
29 changes: 23 additions & 6 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
"name": "Markiewicz, Christopher J.",
"orcid": "0000-0002-6533-164X"
},
{
"affiliation": "Department of Psychology, Stanford University",
"name": "Goncalves, Mathias",
"orcid": "0000-0002-7252-7771"
},
{
"affiliation": "Department of Psychology, Stanford University",
"name": "Poldrack, Russell A.",
Expand All @@ -35,17 +40,29 @@
"orcid": "0000-0003-3456-2493",
"type": "Researcher"
},
{
"affiliation": "MIT",
"name": "Goncalves, Mathias",
"orcid": "0000-0002-7252-7771",
"type": "Researcher"
},
{
"affiliation": "MIT, HMS",
"name": "Ghosh, Satrajit",
"orcid": "0000-0002-5312-6729",
"type": "Researcher"
},
{
"affiliation": "University of Gothenburg, Sweden",
"name": "Thompson, William H.",
"orcid": "0000-0002-0533-6035",
"type": "Researcher"
},
{
"affiliation": "Charite Universitatsmedizin Berlin, Germany",
"name": "Waller, Lea",
"orcid": "0000-0002-3239-6957",
"type": "Researcher"
},
{
"affiliation": "Department of Psychiatry, Columbia University",
"name": "Schmidt, Mike F.",
"orcid": "0000-0003-4721-1457",
"type": "Researcher"
}
],
"keywords": [
Expand Down
9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
23.1.0 (October 12, 2023)
=========================
Minor release including support for Python 3.12.

Python 3.7 support has been removed.

* FIX: Use Path.as_posix() and f-strings to build correct URLs on Windows (#107)
* MNT: Python 3.12 support, drop Python 3.7 and pkg_resources (#109)

23.0.0 (February 2, 2023)
=========================
Minor release including additional API features and an updated skeleton.
Expand Down

0 comments on commit 2c5eaa0

Please sign in to comment.