Skip to content

Commit b2bf510

Browse files
authored
Merge branch 'main' into coco-github-policy
2 parents 72081cf + 81edc39 commit b2bf510

15 files changed

+220
-173
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
name: Astropy Github Organisation Administration
33
about: Request that an Astropy GitHub org admin performs some action.
4-
labels: [github-admin]
5-
assignees:
6-
- astropy/coordinators
4+
title: ''
5+
labels: github-admin
6+
assignees: ''
7+
78
---
89

910
### Description
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Add maintainer checklist
3+
about: Reminder to check list of steps when modifying team
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
If you are adding or removing someone from a team please check that the list of items on the [Adding New Role Members page](https://github.com/astropy/astropy-project/blob/main/policies/adding-new-role-members.md) has been completed. In particular,
11+
12+
- [ ] PR to the Team page
13+
- [ ] privileges and/or permissions updated
14+
- [ ] (if adding a new member) email to the community
15+
- [ ] (if adding a new member) add to astropy-core-maintainers mailing list
16+

affiliated/affiliated_package_review_guidelines.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ it exists) and see how the package fares:
106106
</tr>
107107
<tr>
108108
<td><img src="https://img.shields.io/badge/Green-brightgreen.svg" alt="Green"></td>
109-
<td>Extensive documentation, including at least: motivation/scope of package, installation instructions, usage examples, API documentation. In terms of infrastructure, the documentation should be automatically built on readthedocs.org. If appropriate, one or more tutorials should be included in the Astropy tutorials at http://tutorials.astropy.org.</td>
109+
<td>Extensive documentation, including at least: motivation/scope of package, installation instructions,
110+
usage examples, and API documentation.
111+
A preferred method of citation of this package and citations to relevant papers and software included where appropriate.
112+
In terms of infrastructure, the documentation should be automatically built on readthedocs.org.
113+
If appropriate, one or more tutorials should be included in the Astropy tutorials at http://tutorials.astropy.org.</td>
110114
</tr>
111115
</table>
112116

finance/README.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Astropy Financial Management
2+
3+
## Contents
4+
5+
- [`community-updates`](https://github.com/astropy/astropy-project/tree/main/finance/community-updates) is an archive of financial updates posted to the `astropy-dev` mailing list.
6+
- [`jobs`](https://github.com/astropy/astropy-project/tree/main/finance/jobs) is an archive of job advertisements issued by the Astropy Project.
7+
- [`process`](https://github.com/astropy/astropy-project/tree/main/finance/process) documents our processes and policies for financial management. In particular, it provides *guidance for requesting funding*.
8+
- [`proposal-calls`](https://github.com/astropy/astropy-project/tree/main/finance/proposal-calls) records materials related to calls for projects and proposals funded by Astropy.
9+
10+
## Finance Committee
11+
12+
The Finance Committee was convened in an interim basis in December 2019.
13+
Its status was confirmed and the “interim” designation removed following the CoCo3 election in September 2021.
14+
15+
### Charge
16+
17+
Committee members are charged with filling the role [described on the Astropy website](https://www.astropy.org/team.html#role-responsibilities).
18+
19+
### Membership
20+
21+
Current members are [listed on astropy.org](https://www.astropy.org/team.html#finance_committee_member).
22+
23+
#### Alumni
24+
25+
- Steve Crawford (Ombudsperson; @crawfordsm)
26+
- Hans Moritz Günther (@hamogu)
27+
28+
### Communications
29+
30+
#### Committee Business
31+
32+
The running notes of the committee are public and open for comment.
33+
Notes are available covering various periods:
34+
35+
- [December 2019 through April 2021](https://docs.google.com/document/d/193ERJ6wMNPaNjGSWbS94KHGnojpZ_zwXxWTi9L2etSo/edit#heading=h.w71o1ycqjoz);
36+
- [April 2021 onwards](https://docs.google.com/document/d/1OpSEtJC0jQINTB-YNexxgnHX7-J6HRSkiPKYWBSCOfg/edit?usp=sharing).
37+
38+
The committee uses the public [#finance-committee](https://astropy.slack.com/archives/CRE40TXTK) channel on Slack and the issue tracker in the [astropy-project repo](https://github.com/astropy/astropy-project/issues) to track its activities.
39+
40+
#### Feedback
41+
42+
We welcome feedback, questions, and comments on this committee's activities via any of the following methods:
43+
44+
- Comment on the running notes linked above.
45+
- Message in [#finance-committee](https://astropy.slack.com/archives/CRE40TXTK) on Slack.
46+
- Make an issue in the [astropy-project repo](https://github.com/astropy/astropy-project/issues).
47+
- Email to [email protected].
48+
49+
Note that none of these communications channels provide an expectation of privacy: the first three are self-evidently public, while the e-mail address forwards to a Google Group where your message may be archived and we cannot guarantee that it will not be disclosed in the future.
50+
If you need to discuss a private matter with the committee, please reach out to them in a Slack direct message.
51+
52+
### Policies
53+
54+
The committee conducts its business according to a set of agreed [Policies](https://github.com/astropy/project/blob/main/finance/process/policies.rst).
55+
Suggestions of changes to these policies are welcome; please use the communication channels described above.

finance/finance-ctte-intro.txt

Lines changed: 0 additions & 54 deletions
This file was deleted.

finance/finance-ctte-procedures.rst

Lines changed: 0 additions & 27 deletions
This file was deleted.

finance/funding_requests.md

Lines changed: 0 additions & 79 deletions
This file was deleted.

finance/finance-ctte-policy.rst renamed to finance/process/policies.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
##################################
2-
Interim Finance Committee Policies
3-
##################################
1+
##########################
2+
Finance Committee Policies
3+
##########################
44

5-
This document records policies adopted by the `Astropy Interim Finance Committee`_ (hereafter “the Committee”).
5+
This document records policies adopted by the `Astropy Finance Committee`_ (hereafter “the Committee”).
66
It is a “living document” which is expected to evolve over time.
77

8-
.. _Astropy Interim Finance Committee: https://github.com/astropy/astropy-project/wiki/Financial-Management#interim-finance-committee
8+
.. _Astropy Finance Committee: https://github.com/astropy/astropy-project/tree/main/finance
99

1010
Role and responsibilities of the Committee
1111
==========================================
1212

13-
#. The Committee is responsible for executing the charge described at https://github.com/astropy/astropy-project/wiki/Financial-Management.
13+
#. The Committee is responsible for executing the charge described at https://www.astropy.org/team.html#finance_committee_member.
1414

1515
(Agreed `2019-12-20`__)
1616

finance/process/procedures.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
############################
2+
Finance Committee Procedures
3+
############################
4+
5+
This document contains procedures for the Astropy Finance Committee.
6+
Note this is distinct from the `policies document <policies.rst>`_, in that this one is more focused on specific procedures/technical aspects rather than policy guidelines.
7+
8+
Adding a Member to the Committee
9+
================================
10+
11+
When a member joins the committee, the following steps are required:
12+
13+
* Confirmation the member is aware of these steps, and has read the Code of Conduct
14+
* Adding the member to the astropy finance google group/email list
15+
* Make sure CoCo has added member to core-maintainers google group/email list
16+
* Add write access to the running notes
17+
* Add write access to financial spreadsheets
18+
* Addition of name to `astropy team page <https://www.astropy.org/team.html>`_.
19+
* Make sure Coco has added member to `github team "Finance Committee" <https://github.com/orgs/astropy/teams/finance-committee>`_
20+
21+
22+
Removing a Member from the Committee
23+
====================================
24+
25+
When a member of the committee leaves, the following steps are required:
26+
27+
* Undo relevant steps above

0 commit comments

Comments
 (0)