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

SIT-2 Release [main] #83

Closed
wants to merge 104 commits into from
Closed
Show file tree
Hide file tree
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 Jul 7, 2023
47d62d9
Initial commit of style guide
bourque Jul 7, 2023
8cef76a
Reordered some sections, added some recommended tools/libraries
bourque Jul 7, 2023
1371063
Some clarifications on the git workflow
bourque Jul 7, 2023
6976940
DOC: Start of sphinx documentation
greglucas Jun 26, 2023
ccef051
Fixed some broken links; addressed some review comments
bourque Jul 10, 2023
64585b1
Added poetry section, added tl;dr section, more consistent use of mar…
bourque Jul 10, 2023
f235f2e
Merge pull request #20 from IMAP-Science-Operations-Center/main
greglucas Jul 11, 2023
ed73bf9
Added release workflow section, reformatted to use 120 characters ins…
bourque Jul 11, 2023
54b58ac
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jun 26, 2023
7cdb578
Added section on updating poetry environments
maxinelasp Jul 11, 2023
6dcb24b
Added checklist for contributors and reviewers of PRs
bourque Jul 11, 2023
35210dc
Added all-contributors section and badge
bourque Jul 11, 2023
d4480e9
docs: update README.md [skip ci]
allcontributors[bot] Jul 11, 2023
1cdae3a
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 11, 2023
b253925
Merge pull request #15 from greglucas/docs
greglucas Jul 12, 2023
2cf10d4
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
b598479
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
a08e5dd
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
5fecfcb
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
ce6c35a
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
6e86993
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
6e56c49
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
a55a9d9
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
c632b52
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
cf14510
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
3514083
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
554ee02
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
8548e67
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
04eea50
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
130517b
Merge pull request #25 from bourque/all-contributors
bourque Jul 12, 2023
b23f252
Merge branch 'dev' into all-contributors/add-greglucas
bourque Jul 12, 2023
0747901
Merge pull request #27 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
ffed985
Updates on templates + new file. Thanks @greglucas @tech3371 @maxinel…
GFMoraga Jul 12, 2023
e4494c7
Merge branch 'dev' into all-contributors/add-tech3371
bourque Jul 12, 2023
c56378f
Merge pull request #28 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
01b14a4
Merge branch 'dev' into all-contributors/add-sdhoyt
bourque Jul 12, 2023
dc517ba
Merge pull request #32 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
1a27716
Merge branch 'dev' into all-contributors/add-GFMoraga
bourque Jul 12, 2023
41e114d
Merge pull request #33 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
e1fc757
Merge branch 'dev' into all-contributors/add-bourque
bourque Jul 12, 2023
f5d40b4
Merge pull request #26 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
bd524e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 12, 2023
7b508e6
docs: update README.md [skip ci]
allcontributors[bot] Jul 12, 2023
534337c
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Jul 12, 2023
d806536
Changes from review comments. Thank you @maxinelasp, @greglucas, @tec…
bourque Jul 12, 2023
8010dcd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 12, 2023
d7ea872
Merge branch 'dev' into all-contributors/add-maxinelasp
bourque Jul 12, 2023
fe4a73e
Merge pull request #34 from IMAP-Science-Operations-Center/all-contri…
bourque Jul 12, 2023
0ff0820
Merge pull request #18 from GFMoraga/issue_templates
GFMoraga Jul 14, 2023
7ca8d02
Merge pull request #19 from bourque/style-guide
bourque Jul 14, 2023
57518e2
Merge pull request #21 from IMAP-Science-Operations-Center/pre-commit…
greglucas Jul 17, 2023
dcf7e06
BLD: Update Poetry lock file for Poetry v1.5.0
greglucas Jul 17, 2023
88bdcfb
added yaml
sdhoyt Jul 18, 2023
e66113d
Merge pull request #42 from sdhoyt/readthedocs-yaml
greglucas Jul 21, 2023
2ee0b67
Merge pull request #41 from greglucas/poetry-update
greglucas Jul 21, 2023
ba59f2a
BLD: Update Poetry lock file for Poetry v1.5.0
greglucas Jul 17, 2023
3b6ee46
Updating documentation to include a documentation guide and move the …
maxinelasp Jul 25, 2023
ac66a9d
Merge branch 'dev' into docs
maxinelasp Jul 26, 2023
79f377d
Merge pull request #46 from maxinelasp/docs
maxinelasp Jul 26, 2023
92d05bb
adding module path in imap_processing
tech3371 Jul 26, 2023
ccf1a8e
Merge pull request #47 from tech3371/dev
tech3371 Jul 26, 2023
d4f3f12
Added check to prevent direct commits to main and dev branches
bourque Jul 31, 2023
e014a05
Merge pull request #50 from bourque/add-pre-commit-branch-check
bourque Jul 31, 2023
81251ea
Converted style guide from markdown to rst to be consistent with othe…
bourque Aug 4, 2023
5342714
Removed erroneous repeating line
bourque Aug 4, 2023
b4b5b9c
Changes from code review suggestions; made wording to be more generic…
bourque Aug 4, 2023
25bb3b6
Merge pull request #51 from bourque/convert-style-guide-to-rst
bourque Aug 4, 2023
1c2daad
Moved sections of the style guide into their own pages
bourque Aug 4, 2023
de52244
Broke up style guide into several rst files, changed toctree to inclu…
bourque Aug 6, 2023
335dd53
Fixed typo
bourque Aug 6, 2023
fcfbfa0
Moved style guide pages to their own directory and created toctree to…
bourque Aug 7, 2023
874c9a9
Merge pull request #53 from bourque/style-guide-multiple-pages
bourque Aug 7, 2023
2325020
Updated to relfect the versioning schemes the dev team has decided on…
bourque Aug 7, 2023
6e1ef5e
Added some notes about deployment
bourque Aug 7, 2023
cc4471d
Fixed typo
bourque Aug 7, 2023
369610d
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
c1e20d7
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
2e82297
Merge pull request #56 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
6252b68
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
1e9f9b9
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
03c11b5
Merge pull request #57 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
02db9c0
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
01eb1b8
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
390972f
Merge pull request #58 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
2716f59
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
985b2b4
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
cce66d3
Merge pull request #59 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
54c419b
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
2c1cd82
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
877909d
Merge pull request #60 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
c6939f6
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
a91829d
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
50b197d
docs: update README.md [skip ci]
allcontributors[bot] Aug 7, 2023
da792fe
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Aug 7, 2023
ade1f11
Merge pull request #62 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 7, 2023
c9b91fb
Merge branch 'dev' into all-contributors/add-laspsandoval
bourque Aug 8, 2023
2d358ab
Merge pull request #61 from IMAP-Science-Operations-Center/all-contri…
bourque Aug 8, 2023
31f33f9
Fixed typo
bourque Aug 8, 2023
196e117
Merge pull request #54 from bourque/document-versioning-schemes
bourque Aug 8, 2023
de7ee0c
Merge pull request #55 from bourque/document-release-workflow
bourque Aug 8, 2023
c4468ff
Added workflow to uploading release to PyPI
bourque Sep 28, 2023
e6915fd
Fixed indentation, added step to download sdist
bourque Sep 28, 2023
690038f
Workflow now triggers only on published release
bourque Sep 28, 2023
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
104 changes: 104 additions & 0 deletions .all-contributorsrc
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"
}
30 changes: 30 additions & 0 deletions .github/issue_templates/Algorithim_development.md
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:
23 changes: 23 additions & 0 deletions .github/issue_templates/Bug_reporting.md
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?
17 changes: 17 additions & 0 deletions .github/issue_templates/General_issue.md
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:
56 changes: 56 additions & 0 deletions .github/workflows/docs.yml
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 }}
68 changes: 68 additions & 0 deletions .github/workflows/release.yml
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 }}
Comment on lines +17 to +18
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
outputs:
SDIST_NAME: ${{ steps.sdist.outputs.SDIST_NAME }}

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.


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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Get the name of the build sdist file for later use
echo "SDIST_NAME=$(ls -1 dist)" >> $GITHUB_OUTPUT


- 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]
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Documentation ignore
docs/source/reference/generated

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -158,3 +161,4 @@ cython_debug/
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.DS_Store
7 changes: 5 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ repos:
- id: detect-private-key
- id: mixed-line-ending
- id: trailing-whitespace
- id: no-commit-to-branch
args: [--branch, main, --branch, dev]
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: 'v0.0.276'
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.0.277'
hooks:
- id: ruff
args: [--fix]
Expand All @@ -26,3 +28,4 @@ repos:
hooks:
- id: poetry-check
- id: poetry-lock
args: [--no-update]
18 changes: 18 additions & 0 deletions .readthedocs.yaml
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


Loading
Loading