-
Notifications
You must be signed in to change notification settings - Fork 16
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
SIT-2 Release [main] #83
Closed
Changes from all commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
421d095
adding templates for issues
GFMoraga 47d62d9
Initial commit of style guide
bourque 8cef76a
Reordered some sections, added some recommended tools/libraries
bourque 1371063
Some clarifications on the git workflow
bourque 6976940
DOC: Start of sphinx documentation
greglucas ccef051
Fixed some broken links; addressed some review comments
bourque 64585b1
Added poetry section, added tl;dr section, more consistent use of mar…
bourque f235f2e
Merge pull request #20 from IMAP-Science-Operations-Center/main
greglucas ed73bf9
Added release workflow section, reformatted to use 120 characters ins…
bourque 54b58ac
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] 7cdb578
Added section on updating poetry environments
maxinelasp 6dcb24b
Added checklist for contributors and reviewers of PRs
bourque 35210dc
Added all-contributors section and badge
bourque d4480e9
docs: update README.md [skip ci]
allcontributors[bot] 1cdae3a
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] b253925
Merge pull request #15 from greglucas/docs
greglucas 2cf10d4
docs: update README.md [skip ci]
allcontributors[bot] b598479
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] a08e5dd
docs: update README.md [skip ci]
allcontributors[bot] 5fecfcb
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] ce6c35a
docs: update README.md [skip ci]
allcontributors[bot] 6e86993
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] 6e56c49
docs: update README.md [skip ci]
allcontributors[bot] a55a9d9
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] c632b52
docs: update README.md [skip ci]
allcontributors[bot] cf14510
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] 3514083
docs: update README.md [skip ci]
allcontributors[bot] 554ee02
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] 8548e67
docs: update README.md [skip ci]
allcontributors[bot] 04eea50
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 130517b
Merge pull request #25 from bourque/all-contributors
bourque b23f252
Merge branch 'dev' into all-contributors/add-greglucas
bourque 0747901
Merge pull request #27 from IMAP-Science-Operations-Center/all-contri…
bourque ffed985
Updates on templates + new file. Thanks @greglucas @tech3371 @maxinel…
GFMoraga e4494c7
Merge branch 'dev' into all-contributors/add-tech3371
bourque c56378f
Merge pull request #28 from IMAP-Science-Operations-Center/all-contri…
bourque 01b14a4
Merge branch 'dev' into all-contributors/add-sdhoyt
bourque dc517ba
Merge pull request #32 from IMAP-Science-Operations-Center/all-contri…
bourque 1a27716
Merge branch 'dev' into all-contributors/add-GFMoraga
bourque 41e114d
Merge pull request #33 from IMAP-Science-Operations-Center/all-contri…
bourque e1fc757
Merge branch 'dev' into all-contributors/add-bourque
bourque f5d40b4
Merge pull request #26 from IMAP-Science-Operations-Center/all-contri…
bourque bd524e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 7b508e6
docs: update README.md [skip ci]
allcontributors[bot] 534337c
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] d806536
Changes from review comments. Thank you @maxinelasp, @greglucas, @tec…
bourque 8010dcd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] d7ea872
Merge branch 'dev' into all-contributors/add-maxinelasp
bourque fe4a73e
Merge pull request #34 from IMAP-Science-Operations-Center/all-contri…
bourque 0ff0820
Merge pull request #18 from GFMoraga/issue_templates
GFMoraga 7ca8d02
Merge pull request #19 from bourque/style-guide
bourque 57518e2
Merge pull request #21 from IMAP-Science-Operations-Center/pre-commit…
greglucas dcf7e06
BLD: Update Poetry lock file for Poetry v1.5.0
greglucas 88bdcfb
added yaml
sdhoyt e66113d
Merge pull request #42 from sdhoyt/readthedocs-yaml
greglucas 2ee0b67
Merge pull request #41 from greglucas/poetry-update
greglucas ba59f2a
BLD: Update Poetry lock file for Poetry v1.5.0
greglucas 3b6ee46
Updating documentation to include a documentation guide and move the …
maxinelasp ac66a9d
Merge branch 'dev' into docs
maxinelasp 79f377d
Merge pull request #46 from maxinelasp/docs
maxinelasp 92d05bb
adding module path in imap_processing
tech3371 ccf1a8e
Merge pull request #47 from tech3371/dev
tech3371 d4f3f12
Added check to prevent direct commits to main and dev branches
bourque e014a05
Merge pull request #50 from bourque/add-pre-commit-branch-check
bourque 81251ea
Converted style guide from markdown to rst to be consistent with othe…
bourque 5342714
Removed erroneous repeating line
bourque b4b5b9c
Changes from code review suggestions; made wording to be more generic…
bourque 25bb3b6
Merge pull request #51 from bourque/convert-style-guide-to-rst
bourque 1c2daad
Moved sections of the style guide into their own pages
bourque de52244
Broke up style guide into several rst files, changed toctree to inclu…
bourque 335dd53
Fixed typo
bourque fcfbfa0
Moved style guide pages to their own directory and created toctree to…
bourque 874c9a9
Merge pull request #53 from bourque/style-guide-multiple-pages
bourque 2325020
Updated to relfect the versioning schemes the dev team has decided on…
bourque 6e1ef5e
Added some notes about deployment
bourque cc4471d
Fixed typo
bourque 369610d
docs: update README.md [skip ci]
allcontributors[bot] c1e20d7
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 2e82297
Merge pull request #56 from IMAP-Science-Operations-Center/all-contri…
bourque 6252b68
docs: update README.md [skip ci]
allcontributors[bot] 1e9f9b9
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 03c11b5
Merge pull request #57 from IMAP-Science-Operations-Center/all-contri…
bourque 02db9c0
docs: update README.md [skip ci]
allcontributors[bot] 01eb1b8
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 390972f
Merge pull request #58 from IMAP-Science-Operations-Center/all-contri…
bourque 2716f59
docs: update README.md [skip ci]
allcontributors[bot] 985b2b4
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] cce66d3
Merge pull request #59 from IMAP-Science-Operations-Center/all-contri…
bourque 54c419b
docs: update README.md [skip ci]
allcontributors[bot] 2c1cd82
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 877909d
Merge pull request #60 from IMAP-Science-Operations-Center/all-contri…
bourque c6939f6
docs: update README.md [skip ci]
allcontributors[bot] a91829d
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] 50b197d
docs: update README.md [skip ci]
allcontributors[bot] da792fe
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] ade1f11
Merge pull request #62 from IMAP-Science-Operations-Center/all-contri…
bourque c9b91fb
Merge branch 'dev' into all-contributors/add-laspsandoval
bourque 2d358ab
Merge pull request #61 from IMAP-Science-Operations-Center/all-contri…
bourque 31f33f9
Fixed typo
bourque 196e117
Merge pull request #54 from bourque/document-versioning-schemes
bourque de7ee0c
Merge pull request #55 from bourque/document-release-workflow
bourque c4468ff
Added workflow to uploading release to PyPI
bourque e6915fd
Fixed indentation, added step to download sdist
bourque 690038f
Workflow now triggers only on published release
bourque File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
{ | ||
"files": [ | ||
"README.md" | ||
], | ||
"imageSize": 100, | ||
"commit": false, | ||
"commitType": "docs", | ||
"commitConvention": "angular", | ||
"contributors": [ | ||
{ | ||
"login": "greglucas", | ||
"name": "Greg Lucas", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/12417828?v=4", | ||
"profile": "http://greglucas.github.io", | ||
"contributions": [ | ||
"code", | ||
"doc", | ||
"ideas", | ||
"infra", | ||
"maintenance", | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "tech3371", | ||
"name": "Tenzin Choedon", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/36522642?v=4", | ||
"profile": "https://github.com/tech3371", | ||
"contributions": [ | ||
"code", | ||
"ideas", | ||
"infra", | ||
"example", | ||
"maintenance", | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "laspsandoval", | ||
"name": "Laura Sandoval", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/46567335?v=4", | ||
"profile": "https://github.com/laspsandoval", | ||
"contributions": [ | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "sdhoyt", | ||
"name": "Sean Hoyt", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/7146374?v=4", | ||
"profile": "https://github.com/sdhoyt", | ||
"contributions": [ | ||
"code", | ||
"ideas", | ||
"infra", | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "GFMoraga", | ||
"name": "Gabriel M.", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/104743000?v=4", | ||
"profile": "https://github.com/GFMoraga", | ||
"contributions": [ | ||
"code", | ||
"ideas", | ||
"infra", | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "bourque", | ||
"name": "Matthew Bourque", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/2250769?v=4", | ||
"profile": "https://github.com/bourque", | ||
"contributions": [ | ||
"code", | ||
"doc", | ||
"ideas", | ||
"infra", | ||
"review" | ||
] | ||
}, | ||
{ | ||
"login": "maxinelasp", | ||
"name": "Maxine Hartnett", | ||
"avatar_url": "https://avatars.githubusercontent.com/u/117409426?v=4", | ||
"profile": "https://github.com/maxinelasp", | ||
"contributions": [ | ||
"code", | ||
"ideas", | ||
"infra", | ||
"review", | ||
"doc" | ||
] | ||
} | ||
], | ||
"contributorsPerLine": 7, | ||
"skipCi": true, | ||
"repoType": "github", | ||
"repoHost": "https://github.com", | ||
"projectName": "imap_processing", | ||
"projectOwner": "IMAP-Science-Operations-Center" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
### Algorithm Description: | ||
|
||
### Requirements: | ||
|
||
> **Specify: (optional)** | ||
|
||
### Algorithm Code Information: | ||
> Input data: | ||
> > **Specify details:** | ||
> | ||
> Algorithim steps/psuedocode: | ||
> > **Specify details:** | ||
> | ||
> Output data: | ||
> > **Specify details:** | ||
|
||
|
||
### Code: | ||
|
||
```python | ||
# Code | ||
``` | ||
|
||
#### Specify if any dependicies were added | ||
|
||
|
||
|
||
### Other Notes: | ||
|
||
### Related Issues/PRs: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
## Description of the issue | ||
|
||
### Steps to reproduce the issue | ||
|
||
1. | ||
2. | ||
3. | ||
|
||
### Code Snippet: | ||
|
||
```python | ||
# Code | ||
``` | ||
|
||
### Expected behavior (What should happen) | ||
|
||
### Actual behavior (What does happen) | ||
|
||
#### Additional notes | ||
|
||
### Affected areas (code, data, or process) | ||
|
||
### Suggested fix? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
### Topic: | ||
|
||
### Description: | ||
|
||
### Requirements | ||
|
||
> **Specify: (optional)** | ||
|
||
### Code Snippet (optional): | ||
|
||
```python | ||
# Code | ||
``` | ||
|
||
### Related (optional): | ||
|
||
### Follow-up comments: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
name: "Documentation Build" | ||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }} | ||
cancel-in-progress: true | ||
on: | ||
- pull_request | ||
- release | ||
|
||
jobs: | ||
docs: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
|
||
- name: Set up Python | ||
uses: actions/setup-python@v4 | ||
with: | ||
python-version: '3.11' | ||
|
||
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install .[doc] | ||
|
||
- name: Build documentation | ||
run: | | ||
make -C docs html | ||
|
||
- uses: actions/upload-artifact@v2 | ||
with: | ||
name: DocumentationHTML | ||
path: docs/build/html/ | ||
|
||
# Publish built docs to gh-pages branch | ||
- name: Commit documentation changes | ||
# push docs only when a GitHub Release is made | ||
if: github.event_name == 'release' && github.event.action == 'published' | ||
run: | | ||
git clone https://github.com/IMAP-Science-Operations-Center/imap_processing.git --branch gh-pages --single-branch gh-pages | ||
cp -r docs/build/html/* gh-pages/ | ||
cd gh-pages | ||
git config --local user.email "[email protected]" | ||
git config --local user.name "GitHub Action" | ||
git add . | ||
git commit -m "Update documentation" -a || true | ||
# The above command will fail if no changes were present, so we ignore that. | ||
|
||
- name: Publish docs | ||
# push docs only when a GitHub Release is made | ||
if: github.event_name == 'release' && github.event.action == 'published' | ||
|
||
uses: ad-m/github-push-action@master | ||
with: | ||
branch: gh-pages | ||
directory: gh-pages | ||
github_token: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,68 @@ | ||||||
name: Build and upload to PyPI | ||||||
|
||||||
concurrency: | ||||||
group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }} | ||||||
cancel-in-progress: true | ||||||
|
||||||
on: | ||||||
release: | ||||||
types: | ||||||
- published | ||||||
|
||||||
jobs: | ||||||
|
||||||
build_sdist: | ||||||
name: Build source distribution | ||||||
runs-on: ubuntu-latest | ||||||
outputs: | ||||||
SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }} | ||||||
|
||||||
steps: | ||||||
- uses: actions/checkout@v4 | ||||||
with: | ||||||
# We need the full history to generate the proper version number | ||||||
fetch-depth: 0 | ||||||
|
||||||
- uses: actions/setup-python@v4 | ||||||
name: Install Python | ||||||
with: | ||||||
python-version: '3.11' | ||||||
|
||||||
- name: Install dependencies | ||||||
run: python -m pip install build twine | ||||||
|
||||||
- name: Build sdist | ||||||
id: sdist | ||||||
run: | | ||||||
python -m build --sdist | ||||||
# Get the name of the build sdist file for later use | ||||||
echo "SDIST_NAME=$(ls -1 dist)" >> $GITHUB_OUTPUT | ||||||
Comment on lines
+38
to
+39
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
- name: Check README rendering for PyPI | ||||||
run: twine check dist/* | ||||||
|
||||||
- name: Upload sdist result | ||||||
uses: actions/upload-artifact@v3 | ||||||
with: | ||||||
name: sdist | ||||||
path: dist/*.tar.gz | ||||||
if-no-files-found: error | ||||||
|
||||||
pypi-publish: | ||||||
name: Upload release to PyPI | ||||||
runs-on: ubuntu-latest | ||||||
environment: | ||||||
name: pypi | ||||||
url: https://pypi.org/p/imap_processing | ||||||
permissions: | ||||||
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing | ||||||
|
||||||
steps: | ||||||
- name: Download sdist | ||||||
uses: actions/download-artifact@v3 | ||||||
with: | ||||||
name: sdist | ||||||
path: dist | ||||||
|
||||||
- name: Publish package distributions to PyPI | ||||||
uses: pypa/[email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
version: 2 | ||
|
||
build: | ||
os: "ubuntu-22.04" | ||
tools: | ||
python: "3.10" | ||
|
||
sphinx: | ||
configuration: docs/source/conf.py | ||
|
||
python: | ||
install: | ||
- method: pip | ||
path: . | ||
extra_requirements: | ||
- doc | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we use that here. It is only used in those other examples when combining sdists and wheels, but it looks like you are just doing sdist and avoiding needing this.