Skip to content
Merged
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
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run and Deploy
name: Test and Deploy

on:
push:
Expand All @@ -18,10 +18,10 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Set up Python 3.12
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.13"
- name: Install dependencies
run: |
python -m pip install tox
Expand All @@ -34,10 +34,10 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Set up Python 3.12
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.13"
- name: Install dependencies
run: |
python -m pip install tox
Expand All @@ -52,7 +52,7 @@ jobs:
/home/runner/work/infrastructure/infrastructure/docs/_build/html/*

deploy:
needs: [build_docs]
needs: [check_style, build_docs]
if: |
(
github.event_name != 'pull_request' && (
Expand Down
43 changes: 12 additions & 31 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,17 @@
repos:
- repo: https://github.com/myint/docformatter
rev: v1.7.5
- repo: https://github.com/PyCQA/docformatter
rev: eb1df347edd128b30cd3368dddc3aa65edcfac38
hooks:
- id: docformatter
args: [--in-place, --pre-summary-newline, --make-summary-multi]
- repo: https://github.com/myint/autoflake
rev: v2.3.1
hooks:
- id: autoflake
args:
[
"--in-place",
"--remove-all-unused-imports",
"--remove-unused-variable",
]
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.6.1"
rev: "v0.9.4"
hooks:
- id: ruff
args: ["--fix"]
- repo: https://github.com/psf/black
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.13.2
hooks:
- id: isort
args: ["--fix", "--unsafe-fixes"]
- id: ruff-format
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-ast
- id: check-case-conflict
Expand All @@ -37,13 +20,11 @@ repos:
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
hooks:
- id: codespell
additional_dependencies:
- tomli
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v4.0.0-alpha.8
- repo: https://github.com/JoC0de/pre-commit-prettier
rev: v3.4.2
hooks:
- id: prettier
- repo: https://github.com/crate-ci/typos
rev: typos-dict-v0.12.4
hooks:
- id: typos
3 changes: 3 additions & 0 deletions _typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
default.extend-ignore-identifiers-re = [
"alog",
]
35 changes: 13 additions & 22 deletions docs/charter.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
****************************************
Project Infrastructure Committee Charter
****************************************
*****************
Committee Charter
*****************

The Project Infrastructure Committee is established under Article 5, Sections 1-2 of the NumFOCUS Bylaws.
The Infrastructure Committee is established under Article 5, Sections 1-2 of the NumFOCUS Bylaws.

Purpose
=======
Expand All @@ -12,19 +12,21 @@ Digital infrastructure includes but is not limited to:

- Cloud accounts and credits
- Domain registrations and hosting
- Conference management software
- CI/CD documentation and best practices

Mission
=======

The Project Infrastructure Committee will manage project digital infrastructure in a way that is fair, equitable, and supports long-term sustainability and project development.
The Infrastructure Committee will manage project digital infrastructure in a way that is fair, equitable, and supports long-term sustainability and project development.

The Committee will:

- Advise NF staff infrastructure team on how to administer account credentials and access
- Make ongoing recommendations to improve and enhance available infrastructure
- Act as a liaison between sponsored projects and the NF Infrastructure Staff, (who works with vendors)
- Have a representative at monthly project meetings
- Triage new request, e.g. is a request a common need or one off
- Triage new request, e.g., is a request a common need or one off?
- Present best practices from various projects
- Review its charter annually and recommend changes to the board for review

Expand All @@ -44,7 +46,7 @@ Membership will reflect the NumFOCUS Diversity Statement by welcoming and encour
The committee will consist of at least 5 members from NumFOCUS at-large community, with the following constraints:

- 1 member is a project contributor to a NumFOCUS sponsored project
- No 2 members are related in employment or NumFOCUS project leadership committee
- No more than 2 members are related in employment or NumFOCUS project leadership committee
- 1 member is a NumFOCUS Staff member

Officers
Expand All @@ -63,9 +65,9 @@ The secretary will be elected by the committee's members.
Terms
^^^^^

Committee members will serve a one-year term, at which time they will have the option for unlimited renewals.
The Vice President will serve a one-year term with the option to renew for one additional term.
The Secretary will serve a one-year term with the option to renew for one additional term.
Committee members will serve a two-year term, at which time they will have the option for unlimited renewals.
The Vice President will serve a two-year term with the option to renew for one additional term.
The Secretary will serve a two-year term with the option to renew for one additional term.

Meetings
========
Expand All @@ -78,15 +80,4 @@ Record Keeping and Reporting

All committee records will be kept in https://github.com/numfocus/infrastructure

A report on the state of project digital infrastructure including all committee actions will be submitted to the board of directors quarterly on or before the 15th of March, June, September, and December.

Officers and Members
====================

2023-2024 Term
---------------

* Vice-President: Andy R. Terrel
* Secretary: Nabil Freij
* Members: Katrina Riehl, Irfan Alibay, Mridul Seth,
* Observing Members: Nicole Foster, Matt Moore, Arliss Collins
A annual report on the state of project digital infrastructure including all committee actions will be submitted to the board of directors before the 15th of January.
8 changes: 4 additions & 4 deletions docs/ci_cd_guide/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
******************************
Paying for CI/CD with numFOCUS
******************************
****************
Paying for CI/CD
****************

This guide is intended to help you set up a CI/CD pipeline for your project and get it paid for by numFOCUS.
This guide is intended to help you set up a CI/CD pipeline for your project and get it paid for by NumFOCUS.

**WIP**

Expand Down
10 changes: 5 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import datetime

author = "numFOCUS Infrastructure Committee"
project = "numFOCUS Project Infrastructure"
author = "NumFOCUS Infrastructure Committee"
project = "NumFOCUS Infrastructure Committee"
release = ""
copyright = f"{datetime.now().year}, {author}" # NOQA: A001 DTZ005
html_theme = "pydata_sphinx_theme"
Expand All @@ -11,8 +11,8 @@
html_favicon = "_static/NumFocus_LRG.png"
html_theme_options = {
"logo": {
"text": "Project Infrastructure",
"text": "Infrastructure",
"image_light": "_static/NumFocus_LRG.png", # For light mode
"image_dark": "_static/NumFocus_LRG.png", # For dark mode
}
"image_dark": "_static/NumFocus_LRG.png", # For dark mode
},
}
13 changes: 10 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
===============================
numFOCUS Project Infrastructure
===============================
=================================
NumFOCUS Infrastructure Committee
=================================

This site details the activities and governance of the NumFOCUS Infrastructure Committee.

The Committee is "responsible for managing project digital infrastructure in a way that is fair, equitable, and supports long-term sustainability and project development."

We also advice the NumFOCUS staff on infrastructure-related matters.

.. toctree::
:maxdepth: 1
:caption: Contents

charter
membership
meeting_notes/index
review_process
ci_cd_guide/index
Expand Down
75 changes: 75 additions & 0 deletions docs/meeting_notes/2024-08-21.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
************
Aug 21, 2024
************

* Attendees:

- Andy Terrel, Seth Mridul, Nabil Freij

* Observers:

- Nicole Foster, Arliss Collins, Claudia Alvarado

* Apologies:

- Katrina Riehl, Irfan Alibay, Matt Moore

Notes
=====

Pretalx Proposal Decision
-------------------------

- It seems to be a cheaper option than currently
- Nicole and Jim need to get proper quote and moving forward

- Jim is concerned about getting quick support

* Can this be part of the contract?

- Need to decide if Marty's work on Pretalx would fall under the DevOp role
- Decision: wait to pursue after we hire devop role

DevOps Role
------------

- Currently 2k+ applications have around ~13 in a shortlist
- Infrastructure committee wants to be involved in the technical interview

- Need to come up with some fixed questions to ask them
- Want to ensure that the interview is the same across all candidates

NF Summit
----------

- There will be one unconference session on the infrastructure committee

- Want to bring up CI/CD guide
- See if people know about the new process for requests from the committee
- Do committees need common infrastructure that we can set up?

* Possible to unify how we do voting, notes and requests?
* Want to improve transparency?

CI/CD Guide
------------

- Skeleton setup on the repo. Now we can add the information needed

Action Items
============

- Create a Google Forms survey which details: Nabil Freij

- What CI services are using currently and what architectures do you use on them?
- Do they need paid services? If so, what ones and how much (rough estimate)?
- What architectures do you want to run on?

- ~~Claudia - Create Calendly for Nabil, Andy, and Mridul for interviews (I'll create a group chat amongst us all to coordinate)~~

- ~~First interview- technical interview, add in fixed 85k rate in email send to Andy nvidia's email for faster response~~
- ~~Create spreadsheet tracking candidates stages (contacted, interested, etc)~~

- ~~Andy, Mridul and Nabil: Create a checklist of questions to ensure a fair interview process via a shared Google Doc~~

- Nabil Freij: Upload these notes to the website
58 changes: 58 additions & 0 deletions docs/meeting_notes/2024-09-18.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
************
Sep 18, 2024
************

* Attendees:

- Andy Terrel, Nabil Freij

* Observers:

- Nicole Foster, Claudia Alvarado

* Apologies:

- Katrina Riehl, Irfan Alibay, Matt Moore, Arliss Collins, Seth Mridul


Notes
=====

IT DevOps Candidates
--------------------

- DevOps Candidates Tracker
- Go forward with one candidate for one final interview

* Andy will do the interview

Rackspace Billing
-----------------

- 3 machines for conferences had networking turned off and no one said anything

* Machines will hopefully be deleted

- Need to check with Marty about if the machines have been backed up
- Several projects or conferences have machines in Rackspace

* Need to contact the relevant parties to check if they are still being used

- New NumFOCUS account added
- Bill is around $600 a month

Action Items
------------

- Claudia: Contact Addo about final interview with Andy
- Andy:

* Call Marty to check which Rackspace servers he needs before deleting anything
* Claudia will ask Jim if Andy can join Marty's weekly check-in
* Call Tom about pandas

- Claudia: Ask Jim about PyData Berlin and let Andy know
- Nabil:

* Upload notes to repo
* Create a list of items to discuss at the next meeting based on the summit BOF
Loading