From a3f0cac7b49d1384d3c4726e99cc0c6f248af5da Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 20 Nov 2024 13:25:23 -0700 Subject: [PATCH 1/5] fix: issues with build --- .gitignore | 4 ++ CONTRIBUTING.md | 31 ++++++------- index.md | 7 ++- noxfile.py | 44 ++++++++++++++++++- .../meeting-notes/2019/2019-08-01-notes.md | 25 +++++++++++ 5 files changed, 90 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 53c83b2..63dae84 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,8 @@ tmp/ __pycache__ /.luarc.json +<<<<<<< Updated upstream .ipynb_checkpoints/ +======= +**/.ipynb_checkpoints +>>>>>>> Stashed changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54014a5..f2beee1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,37 +1,36 @@ # Contributing Guide for pyOpenSci -This guide is a high level contributing guide that provide guidelines for -contributing to resources across our organization. You will find specific contributing guidelines in each of the repositories that +This guide provides high-level contributing guidelines for resources across our organization. You will find specific contributing guidelines in each repository that we maintain. -pyOpenSci develops and maintains numerous community resources including: +pyOpenSci develops and maintains numerous community resources, including: - [Python packaging guide](https://github.com/pyOpenSci/python-package-guide) - Python [software peer review guide](https://github.com/pyOpenSci/software-peer-review) - Our [pyopensci.org website](https://github.com/pyOpenSci/pyopensci.github.io) -- Our [software review repo](https://github.com/pyOpenSci/software-submission): contains templates templates for software submission and a small ci build +- Our [software review repo](https://github.com/pyOpenSci/software-submission): contains templates templates for software submission and a small CI (Continuous Integration) build This document applies to any of our online content that you contribute to. Most of our content lives in the [pyOpenSci GitHub organization](https://github.com/pyopensci). -## High level guidelines +## High-level guidelines 1. Anyone contributing to pyOpenSci must follow our [organization-wide code of conduct](https://www.pyopensci.org/governance/CODE_OF_CONDUCT.html). -2. Please open an issue before submitting a pull request with new or revised content. Issues will allow us to discussed the changes with you before they are submitted. Submitting an issue first will expedite the speed at which your pull request is merged. +2. Please open an issue before submitting a pull request with new or revised content. Issues will allow us to discuss the changes with you before submitting them. Submitting an issue first will expedite the speed at which your pull request is merged. - In some instances, if your pull request is a simple fix of a link or typo, we may accept it without an issue being opened. -3. If you submit a pull request please be sure to use a branch in your fork. Do not use the `main` branch from your fork to submit a pull request. -4. Please try to spell check and editor pull requests before opening them in our repository. This will save us time when reviewing your suggested change(s)! +3. If you submit a pull request, please be sure to use a branch in your fork. Do not use your fork's `main` branch to submit a pull request. +4. Please try to spell check and editor pull requests before opening them in our repository. This will save us time when reviewing your suggested change(s). ## Contributor attributions We welcome and value contributions of all kinds. Some ways that -you can contribute to pyOpenSci include: +you can contribute to pyOpenSci, include: -- Identifying typos / issues in our online documentation -- Fixing bad urls and references in our issue and peer review templates +- Identifying typos/issues in our online documentation +- Fixing bad URLs and references in our issue and peer-review templates - Opening issues about content in our peer review and packaging guides - Reviewing pull requests that update content on our website - Contributing to the peer review process @@ -108,12 +107,12 @@ To build live documentation that updates when you update local files, run:: nox -s docs-live ``` -The `docs-live` command will provide ou with a url that you can enter into your -browser to see the docs update as you make updates to files. +The `docs-live` command will provide you with a URL that you can enter into your +browser to see the docs update as you update files. ### CircleCI Previews -Each book is setup with a GitHub action redirect that will take you to a online +Each book is set up with a GitHub action redirect that will take you to an online build of the current pull request in CircleCI. To view the build: - Click on the GitHub action called `ci/circleci: build_book` after it has run at the bottom of your pull request. This will @@ -128,7 +127,3 @@ browser. ### Website build Our website is a `jekyll`/`markdown` driven site. Thus, you will need to install `ruby`, and the gems needed to build the website following the contributing guide in our pyopensci.github.io repository. - -``` - -``` diff --git a/index.md b/index.md index c9a71d0..5d09a06 100644 --- a/index.md +++ b/index.md @@ -1,9 +1,14 @@ # pyOpenSci Handbook & Governance This guide is designed to define the structure and processes -that support operations of pyOpenSci. +that support pyOpenSci operations. +<<<<<<< Updated upstream ![GitHub release (latest by date)](https://img.shields.io/github/v/release/pyopensci/governance?color=purple&display_name=tag&style=plastic) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7120880.svg)](https://doi.org/10.5281/zenodo.7120880) [![All Contributors](https://img.shields.io/badge/all_contributors-4-blue.svg?style=flat-square)](https://github.com/pyopensci/handbook/?tab=readme-ov-file#contributors-) +======= +[![GitHub release (latest by date)](https://img.shields.io/github/v/release/pyopensci/governance?color=purple&display_name=tag&style=plastic)](https://github.com/pyOpenSci/handbook/releases) [![DOI](https://zenodo.org/badge/161679308.svg)](https://zenodo.org/badge/latestdoi/161679308) [![All Contributors](https://img.shields.io/badge/all_contributors-3-blue.svg?style=flat-square)](https://github.com/pyOpenSci/handbook?tab=readme-ov-file#contributors-) + +>>>>>>> Stashed changes :::::{grid} 1 1 3 3 :class-container: text-center diff --git a/noxfile.py b/noxfile.py index e7597db..2fc0685 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,14 +1,24 @@ +<<<<<<< Updated upstream +======= +import os +>>>>>>> Stashed changes import pathlib import nox -nox.options.reuse_existing_virtualenvs = True +# Sphinx output and source directories +BUILD_DIR = "_build" +OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html") +SOURCE_DIR = pathlib.Path(".") +<<<<<<< Updated upstream # Sphinx output and source directories BUILD_DIR = "_build" OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html") SOURCE_DIR = pathlib.Path(".") +======= +>>>>>>> Stashed changes # Sphinx build commands SPHINX_BUILD = "sphinx-build" SPHINX_AUTO_BUILD = "sphinx-autobuild" @@ -40,11 +50,37 @@ def docs(session): OUTPUT_DIR, *session.posargs, ) +<<<<<<< Updated upstream +======= + + +@nox.session(name="docs-test") +def docs_test(session): + """ + Build the packaging guide with more restricted parameters. + + Note: this is the session used in CI/CD to release the guide. + """ + session.install("-e", ".") + session.run( + SPHINX_BUILD, + *BUILD_PARAMETERS, + *TEST_PARAMETERS, + SOURCE_DIR, + OUTPUT_DIR, + *session.posargs, + ) + # When building the guide with additional parameters, also build the translations in RELEASE_LANGUAGES + # with those same parameters. + session.notify("build-translations", ["release-build", *TEST_PARAMETERS]) +>>>>>>> Stashed changes @nox.session(name="docs-live") def docs_live(session): - session.install("-e", ".") + session.install("-e", ".[dev]") + if not os.path.exists(OUTPUT_DIR): + os.makedirs(OUTPUT_DIR) cmd = [ SPHINX_AUTO_BUILD, @@ -55,6 +91,10 @@ def docs_live(session): ] for folder in AUTOBUILD_IGNORE: cmd.extend(["--ignore", f"*/{folder}/*"]) +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes session.run(*cmd) diff --git a/reference/meeting-notes/2019/2019-08-01-notes.md b/reference/meeting-notes/2019/2019-08-01-notes.md index 0f9a484..4cf3f96 100644 --- a/reference/meeting-notes/2019/2019-08-01-notes.md +++ b/reference/meeting-notes/2019/2019-08-01-notes.md @@ -38,6 +38,7 @@ Please add your name to the list below! * Chris * Martin * Website +<<<<<<< Updated upstream * who's involved -- generate this programmatically? pull from the list of anyone in the organization -- someone would have to build this - twitter api / travis -- They do this for jupyter hub .. * Chris might be able to copy over what jupyter hub does -- read the docs will build it * Following the all contributors specs!! -- Chris can work on that next @@ -60,3 +61,27 @@ Please add your name to the list below! * AGU event potentially?? Open source software session presentation * Leo --- ask about something associated with the plenary or something else!! * other topics?? +======= + * who's involved -- generate this programmatically? pull from the list of anyone in the organization -- someone would have to build this - twitter api / travis -- They do this for jupyter hub .. + * Chris might be able to copy over what jupyter hub does -- https://jupyterhub-team-compass.readthedocs.io/en/latest/team.html#jupyterhub-team read the docs will build it + * Following the all contributors specs!! https://github.com/jupyterhub/team-compass/blob/master/docs/team/contributors-jupyterhub.yaml -- Chris can work on that next + * https://github.com/jupyterhub/team-compass/tree/master/docs/team + * Website -- links that take you to a github search that filters by tag! -- easy quick (Leah can add this!) + * in the future, we can automate this +* Create a design repository in the org -- and place the images and branding items in it!! (leah can do this as well) +* Funding + * pyopensci -- [working draft of 2-3 pager]( https://docs.google.com/document/d/13S_HOGS89Zm1j257gC8Oja_Yol3j6xCp68Sr2Ln5MM0/edit) + * IDEA -- fund a fellowship position that works full time?? or focuses on this organization + * hire them as a contractor -- could be remote, etc + * Martin, Daniel, and Mike are both in DC area -- NIH (National Institute of Health) + * workshop on packaging your project -- to get more exposure + * partnership with Carpentries would be good + * other existing online resources: [ Molecular Sciences Software Institute (MolSSI) materials](https://molssi-education.github.io/CMS-Python-DevOps/) + * Martin - organizer for a local meetup + * Stats Programming DC: https://www.meetup.com/stats-prog-dc/ + * Leah to followup with NumFOCUS about sponsorship + +* Agu event potentially?? Open source software session presentation + * Leo --- ask about something associated with the plenary or something else!! +* other topics?? +>>>>>>> Stashed changes From 1f0bdbd5fb157d7955940e15294a764d54b2641f Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 20 Nov 2024 14:24:23 -0700 Subject: [PATCH 2/5] fix: various issues with files to fix build --- noxfile.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/noxfile.py b/noxfile.py index 2fc0685..43b1343 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,7 +1,4 @@ -<<<<<<< Updated upstream -======= import os ->>>>>>> Stashed changes import pathlib import nox @@ -11,14 +8,11 @@ OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html") SOURCE_DIR = pathlib.Path(".") -<<<<<<< Updated upstream # Sphinx output and source directories BUILD_DIR = "_build" OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html") SOURCE_DIR = pathlib.Path(".") -======= ->>>>>>> Stashed changes # Sphinx build commands SPHINX_BUILD = "sphinx-build" SPHINX_AUTO_BUILD = "sphinx-autobuild" @@ -50,8 +44,6 @@ def docs(session): OUTPUT_DIR, *session.posargs, ) -<<<<<<< Updated upstream -======= @nox.session(name="docs-test") @@ -73,7 +65,6 @@ def docs_test(session): # When building the guide with additional parameters, also build the translations in RELEASE_LANGUAGES # with those same parameters. session.notify("build-translations", ["release-build", *TEST_PARAMETERS]) ->>>>>>> Stashed changes @nox.session(name="docs-live") @@ -91,10 +82,7 @@ def docs_live(session): ] for folder in AUTOBUILD_IGNORE: cmd.extend(["--ignore", f"*/{folder}/*"]) -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes session.run(*cmd) From 3f77c72249d1dc8d6349859335b92d3c0a6bcb43 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 20 Nov 2024 14:25:36 -0700 Subject: [PATCH 3/5] Update .gitignore --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63dae84..832cc33 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,4 @@ tmp/ __pycache__ /.luarc.json -<<<<<<< Updated upstream - .ipynb_checkpoints/ -======= **/.ipynb_checkpoints ->>>>>>> Stashed changes From 60e82b1ebad98ad12d986d9c2bc879ebe067c215 Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 20 Nov 2024 14:27:32 -0700 Subject: [PATCH 4/5] Fix: stash rebase issue --- index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/index.md b/index.md index 5d09a06..5000497 100644 --- a/index.md +++ b/index.md @@ -3,12 +3,8 @@ This guide is designed to define the structure and processes that support pyOpenSci operations. -<<<<<<< Updated upstream -![GitHub release (latest by date)](https://img.shields.io/github/v/release/pyopensci/governance?color=purple&display_name=tag&style=plastic) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7120880.svg)](https://doi.org/10.5281/zenodo.7120880) [![All Contributors](https://img.shields.io/badge/all_contributors-4-blue.svg?style=flat-square)](https://github.com/pyopensci/handbook/?tab=readme-ov-file#contributors-) -======= [![GitHub release (latest by date)](https://img.shields.io/github/v/release/pyopensci/governance?color=purple&display_name=tag&style=plastic)](https://github.com/pyOpenSci/handbook/releases) [![DOI](https://zenodo.org/badge/161679308.svg)](https://zenodo.org/badge/latestdoi/161679308) [![All Contributors](https://img.shields.io/badge/all_contributors-3-blue.svg?style=flat-square)](https://github.com/pyOpenSci/handbook?tab=readme-ov-file#contributors-) ->>>>>>> Stashed changes :::::{grid} 1 1 3 3 :class-container: text-center From b15d91613902321660fa38840519a091e6ee1e3c Mon Sep 17 00:00:00 2001 From: Leah Wasser Date: Wed, 20 Nov 2024 14:28:46 -0700 Subject: [PATCH 5/5] Fix: make nox happy --- .../meeting-notes/2019/2019-08-01-notes.md | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/reference/meeting-notes/2019/2019-08-01-notes.md b/reference/meeting-notes/2019/2019-08-01-notes.md index 4cf3f96..ec41a1e 100644 --- a/reference/meeting-notes/2019/2019-08-01-notes.md +++ b/reference/meeting-notes/2019/2019-08-01-notes.md @@ -4,7 +4,7 @@ Please add your name to the list below! -* Leah Wasser - Earth Lab! +* Leah Wasser - EarthLab * Filipe Fernandes - NOAA/IOOS * Daniel Chen - Virginia Tech + RStudio intern @chendaniely * Chris Holdgraf - UC Berkeley - @choldgraf @@ -38,30 +38,6 @@ Please add your name to the list below! * Chris * Martin * Website -<<<<<<< Updated upstream - * who's involved -- generate this programmatically? pull from the list of anyone in the organization -- someone would have to build this - twitter api / travis -- They do this for jupyter hub .. - * Chris might be able to copy over what jupyter hub does -- read the docs will build it - * Following the all contributors specs!! -- Chris can work on that next - * - * Website -- links that take you to a github search that filters by tag! -- easy quick (Leah can add this!) - * in the future we can automate this -* Create design repository in the org -- and place the images and branding items in it!! (leah can do this as well) -* Funding - * pyOpenSci -- [working draft of 2-3 pager]( https://docs.google.com/document/d/13S_HOGS89Zm1j257gC8Oja_Yol3j6xCp68Sr2Ln5MM0/edit) - * IDEA -- fund a fellowship position that works full time?? or focuses on this organization - * hire them as a contractor -- could be remote, etc - * Martin, Daniel, and Mike are both in DC area -- NIH (National Institute of Health) - * workshop on packaging your project -- to get more exposure - * partnership with Carpentries would be good - * other existing online resources: [Molecular Sciences Software Institute (MolSSI) materials](https://molssi-education.github.io/CMS-Python-DevOps/) - * Martin - organizer for a local meetup - * Stats Programming DC: - * Leah to followup with NumFOCUS about sponsorship - -* AGU event potentially?? Open source software session presentation - * Leo --- ask about something associated with the plenary or something else!! -* other topics?? -======= * who's involved -- generate this programmatically? pull from the list of anyone in the organization -- someone would have to build this - twitter api / travis -- They do this for jupyter hub .. * Chris might be able to copy over what jupyter hub does -- https://jupyterhub-team-compass.readthedocs.io/en/latest/team.html#jupyterhub-team read the docs will build it * Following the all contributors specs!! https://github.com/jupyterhub/team-compass/blob/master/docs/team/contributors-jupyterhub.yaml -- Chris can work on that next @@ -84,4 +60,3 @@ Please add your name to the list below! * Agu event potentially?? Open source software session presentation * Leo --- ask about something associated with the plenary or something else!! * other topics?? ->>>>>>> Stashed changes