Skip to content

Commit 2b6be04

Browse files
authored
Fix: various build issues and add nox docs-test to the build (#114)
* fix: issues with build * fix: various issues with files to fix build * Update .gitignore * Fix: stash rebase issue * Fix: make nox happy
1 parent b9a1d0d commit 2b6be04

File tree

5 files changed

+67
-43
lines changed

5 files changed

+67
-43
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ tmp/
77
__pycache__
88

99
/.luarc.json
10-
.ipynb_checkpoints/
10+
**/.ipynb_checkpoints

CONTRIBUTING.md

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
# Contributing Guide for pyOpenSci
22

3-
This guide is a high level contributing guide that provide guidelines for
4-
contributing to resources across our organization. You will find specific contributing guidelines in each of the repositories that
3+
This guide provides high-level contributing guidelines for resources across our organization. You will find specific contributing guidelines in each repository that
54
we maintain.
65

7-
pyOpenSci develops and maintains numerous community resources including:
6+
pyOpenSci develops and maintains numerous community resources, including:
87

98
- [Python packaging guide](https://github.com/pyOpenSci/python-package-guide)
109
- Python [software peer review guide](https://github.com/pyOpenSci/software-peer-review)
1110
- Our [pyopensci.org website](https://github.com/pyOpenSci/pyopensci.github.io)
12-
- Our [software review repo](https://github.com/pyOpenSci/software-submission): contains templates templates for software submission and a small ci build
11+
- Our [software review repo](https://github.com/pyOpenSci/software-submission): contains templates templates for software submission and a small CI (Continuous Integration) build
1312

1413
This document applies to any of our online content that you
1514
contribute to. Most of our content lives in the [pyOpenSci
1615
GitHub organization](https://github.com/pyopensci).
1716

18-
## High level guidelines
17+
## High-level guidelines
1918

2019
1. Anyone contributing to pyOpenSci must follow our [organization-wide code of conduct](https://www.pyopensci.org/governance/CODE_OF_CONDUCT.html).
21-
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.
20+
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.
2221

2322
- 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.
2423

25-
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.
26-
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)!
24+
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.
25+
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).
2726

2827
## Contributor attributions
2928

3029
We welcome and value contributions of all kinds. Some ways that
31-
you can contribute to pyOpenSci include:
30+
you can contribute to pyOpenSci, include:
3231

33-
- Identifying typos / issues in our online documentation
34-
- Fixing bad urls and references in our issue and peer review templates
32+
- Identifying typos/issues in our online documentation
33+
- Fixing bad URLs and references in our issue and peer-review templates
3534
- Opening issues about content in our peer review and packaging guides
3635
- Reviewing pull requests that update content on our website
3736
- Contributing to the peer review process
@@ -108,12 +107,12 @@ To build live documentation that updates when you update local files, run::
108107
nox -s docs-live
109108
```
110109

111-
The `docs-live` command will provide ou with a url that you can enter into your
112-
browser to see the docs update as you make updates to files.
110+
The `docs-live` command will provide you with a URL that you can enter into your
111+
browser to see the docs update as you update files.
113112

114113
### CircleCI Previews
115114

116-
Each book is setup with a GitHub action redirect that will take you to a online
115+
Each book is set up with a GitHub action redirect that will take you to an online
117116
build of the current pull request in CircleCI. To view the build:
118117

119118
- 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.
128127
### Website build
129128

130129
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.
131-
132-
```
133-
134-
```

index.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# pyOpenSci Handbook & Governance
22

33
This guide is designed to define the structure and processes
4-
that support operations of pyOpenSci.
4+
that support pyOpenSci operations.
5+
6+
[![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-)
57

6-
![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-)
78

89
:::::{grid} 1 1 3 3
910
:class-container: text-center

noxfile.py

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
import os
12
import pathlib
23

34
import nox
45

5-
nox.options.reuse_existing_virtualenvs = True
6+
# Sphinx output and source directories
7+
BUILD_DIR = "_build"
8+
OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html")
9+
SOURCE_DIR = pathlib.Path(".")
610

711
# Sphinx output and source directories
812
BUILD_DIR = "_build"
@@ -42,9 +46,32 @@ def docs(session):
4246
)
4347

4448

49+
@nox.session(name="docs-test")
50+
def docs_test(session):
51+
"""
52+
Build the packaging guide with more restricted parameters.
53+
54+
Note: this is the session used in CI/CD to release the guide.
55+
"""
56+
session.install("-e", ".")
57+
session.run(
58+
SPHINX_BUILD,
59+
*BUILD_PARAMETERS,
60+
*TEST_PARAMETERS,
61+
SOURCE_DIR,
62+
OUTPUT_DIR,
63+
*session.posargs,
64+
)
65+
# When building the guide with additional parameters, also build the translations in RELEASE_LANGUAGES
66+
# with those same parameters.
67+
session.notify("build-translations", ["release-build", *TEST_PARAMETERS])
68+
69+
4570
@nox.session(name="docs-live")
4671
def docs_live(session):
47-
session.install("-e", ".")
72+
session.install("-e", ".[dev]")
73+
if not os.path.exists(OUTPUT_DIR):
74+
os.makedirs(OUTPUT_DIR)
4875

4976
cmd = [
5077
SPHINX_AUTO_BUILD,
@@ -55,6 +82,7 @@ def docs_live(session):
5582
]
5683
for folder in AUTOBUILD_IGNORE:
5784
cmd.extend(["--ignore", f"*/{folder}/*"])
85+
5886
session.run(*cmd)
5987

6088

reference/meeting-notes/2019/2019-08-01-notes.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Please add your name to the list below!
66

7-
* Leah Wasser - Earth Lab!
7+
* Leah Wasser - EarthLab
88
* Filipe Fernandes - NOAA/IOOS
99
* Daniel Chen - Virginia Tech + RStudio intern @chendaniely
1010
* Chris Holdgraf - UC Berkeley - @choldgraf
@@ -38,25 +38,25 @@ Please add your name to the list below!
3838
* Chris
3939
* Martin
4040
* Website
41-
* 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 ..
42-
* 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
43-
* Following the all contributors specs!! <https://github.com/jupyterhub/team-compass/blob/master/docs/team/contributors-jupyterhub.yaml> -- Chris can work on that next
44-
* <https://github.com/jupyterhub/team-compass/tree/master/docs/team>
45-
* Website -- links that take you to a github search that filters by tag! -- easy quick (Leah can add this!)
46-
* in the future we can automate this
47-
* Create design repository in the org -- and place the images and branding items in it!! (leah can do this as well)
41+
* 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 ..
42+
* 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
43+
* Following the all contributors specs!! https://github.com/jupyterhub/team-compass/blob/master/docs/team/contributors-jupyterhub.yaml -- Chris can work on that next
44+
* https://github.com/jupyterhub/team-compass/tree/master/docs/team
45+
* Website -- links that take you to a github search that filters by tag! -- easy quick (Leah can add this!)
46+
* in the future, we can automate this
47+
* Create a design repository in the org -- and place the images and branding items in it!! (leah can do this as well)
4848
* Funding
49-
* pyOpenSci -- [working draft of 2-3 pager]( https://docs.google.com/document/d/13S_HOGS89Zm1j257gC8Oja_Yol3j6xCp68Sr2Ln5MM0/edit)
50-
* IDEA -- fund a fellowship position that works full time?? or focuses on this organization
51-
* hire them as a contractor -- could be remote, etc
52-
* Martin, Daniel, and Mike are both in DC area -- NIH (National Institute of Health)
53-
* workshop on packaging your project -- to get more exposure
54-
* partnership with Carpentries would be good
55-
* other existing online resources: [Molecular Sciences Software Institute (MolSSI) materials](https://molssi-education.github.io/CMS-Python-DevOps/)
56-
* Martin - organizer for a local meetup
57-
* Stats Programming DC: <https://www.meetup.com/stats-prog-dc/>
58-
* Leah to followup with NumFOCUS about sponsorship
49+
* pyopensci -- [working draft of 2-3 pager]( https://docs.google.com/document/d/13S_HOGS89Zm1j257gC8Oja_Yol3j6xCp68Sr2Ln5MM0/edit)
50+
* IDEA -- fund a fellowship position that works full time?? or focuses on this organization
51+
* hire them as a contractor -- could be remote, etc
52+
* Martin, Daniel, and Mike are both in DC area -- NIH (National Institute of Health)
53+
* workshop on packaging your project -- to get more exposure
54+
* partnership with Carpentries would be good
55+
* other existing online resources: [ Molecular Sciences Software Institute (MolSSI) materials](https://molssi-education.github.io/CMS-Python-DevOps/)
56+
* Martin - organizer for a local meetup
57+
* Stats Programming DC: https://www.meetup.com/stats-prog-dc/
58+
* Leah to followup with NumFOCUS about sponsorship
5959

60-
* AGU event potentially?? Open source software session presentation
61-
* Leo --- ask about something associated with the plenary or something else!!
60+
* Agu event potentially?? Open source software session presentation
61+
* Leo --- ask about something associated with the plenary or something else!!
6262
* other topics??

0 commit comments

Comments
 (0)