Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

working towards #11 & #12 [DO NOT MERGE] #13

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Community.

While this approach has served us well, as the Project grows we see a
need for a more formal governance model. Moving forward The Project
leadership will consist of a BDFL and Steering Council, consisting of 3 elected Package Maintainers serving 1 year terms. We view this governance model as
leadership will consist of a BDFL and Steering Council, consisting of 3 elected Package Maintainers serving 3-year terms. We view this governance model as
the formalization of what we are already doing, rather than a change in
direction.

Expand Down Expand Up @@ -132,7 +132,7 @@ Steering Council
----------------

The Project will have a Steering Council that consists of 3 Core
Developers and Package Maintainers who are nominated and elected to 1 year terms. The overall role of the Council is
Developers and Package Maintainers who are nominated and elected to 3-year terms. The overall role of the Council is
to ensure, through working with the BDFL and taking input from the
Community, the long-term well-being of the Project, both technically and
as a community.
Expand Down Expand Up @@ -195,7 +195,9 @@ nominated by existing Council Members and voted upon by the existing
Council after asking if the potential Member is interested and willing
to serve in that capacity. The Council was be initially formed from the
set of existing Core Developers who, as of January 2018, have been
active as Package Maintainers. This model was adjusted in March 2022 to consist of 3 nomiated and elected Council members that serve 1 year terms.
active as Package Maintainers. This model was adjusted in:
* March 2022 to consist of 3 nominated and elected Council members that serve 1-year terms.
* July 2024 to consist of 3 nominated and elected Council members that serve 3-year terms.

When considering potential Members, the Council will look at candidates
with a comprehensive view of their contributions. This will include but
Expand Down Expand Up @@ -295,7 +297,7 @@ The Council will also be responsible for:

- Ensuring a summary of any relevant organisational updates and issues yearly.
- Ensuring the composition of the Steering Council stays current.
- Ensuring matters discussed in private by the Steering Council get summarized as meeting minutes (Hack md) to keep the Community informed.
- Ensuring matters discussed in private by the Steering Council get summarized as meeting minutes ([GitHub Discussions](https://github.com/orgs/pysal/discussions/1278)) to keep the Community informed.
- Ensuring other important organisational documents (e.g. Code of Conduct, Fiscal Sponsorship Agreement) stay current after they are added.


Expand Down Expand Up @@ -369,7 +371,7 @@ landing page.
Document history
----------------

<https://github.com/pysal/governance/commits/master/README.md>
<https://github.com/pysal/governance/commits/main/README.md>

Acknowledgments
----------------
Expand Down
12 changes: 6 additions & 6 deletions conduct/code_of_conduct.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ directly, or ask the Committee for advice, in confidence.

You can report issues to the PySAL Code of Conduct committee at
[email protected]. Also, resolutions are announced via the
`Code of Conduct gitter channel`_. Currently, the committee
`Code of Conduct discord channel`_. Currently, the committee
consists of:

- Stefanie Lumnitz
- Stefanie Lumnitz ***Need a new person***

- [email protected]

- James Gaboardi
- James D. Gaboardi

- [email protected]

Expand All @@ -140,11 +140,11 @@ themselves from considering your report. Alternatively, if for any
reason you feel uncomfortable making a report to the committee, then you
can also contact:

- Julia Koschinsky
- Julia Koschinsky ***Need a new outside member?***

- [email protected]

.. _Code of Conduct gitter channel: https://gitter.im/pysal/code_of_conduct
.. _Code of Conduct gitter channel: https://gitter.im/pysal/code_of_conduct ***Need a CoC discord channel***


Incident reporting resolution & Code of Conduct enforcement
Expand Down Expand Up @@ -189,6 +189,6 @@ we drew content and inspiration:
- `SciPy Code of Conduct`_
- `Open Source Guides - Your Code of Conduct`_

.. _NumPy Code of Conduct: https://github.com/numpy/numpy/blob/master/doc/source/dev/conduct/code_of_conduct.rst#id1
.. _NumPy Code of Conduct: https://github.com/numpy/numpy/blob/master/doc/source/dev/conduct/code_of_conduct.rst#id1 ***this link no longer works***
.. _SciPy Code of Conduct: https://docs.scipy.org/doc/scipy/reference/dev/conduct/code_of_conduct.html
.. _Open Source Guides - Your Code of Conduct: https://opensource.guide/code-of-conduct/