Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
e9ea27a
Adding continuous integration.
christian-oreilly Feb 6, 2025
490f045
Boilerplate for testing.
christian-oreilly Feb 6, 2025
8080f2f
Adding Autodocing
dw42CSCE Feb 11, 2025
b975613
Fixing gitignore
dw42CSCE Feb 11, 2025
8c27b37
testing commit
dw42CSCE Feb 11, 2025
dccae35
test
dw42CSCE Feb 11, 2025
cf6001e
Making page deploy
dw42CSCE Feb 11, 2025
2f15fbb
testing build docs
dw42CSCE Feb 11, 2025
42503d0
testing build docs
dw42CSCE Feb 11, 2025
08d2d5f
Merge branch '2-add-continuous-integration'
dw42CSCE Feb 11, 2025
e7157eb
Trying to figure out the function doc
dw42CSCE Feb 11, 2025
2f3c943
Still testing autodocing
dw42CSCE Feb 12, 2025
da4f0ab
Fixed maybe?
dw42CSCE Feb 12, 2025
f4577e3
Fixing pages display
dw42CSCE Feb 12, 2025
460beef
fixing?
dw42CSCE Feb 12, 2025
2c599f2
Check
dw42CSCE Feb 12, 2025
be8ea4a
forgot jekyll
dw42CSCE Feb 12, 2025
a84860b
test
dw42CSCE Feb 12, 2025
d7edd1c
Testing autodoc
dw42CSCE Feb 12, 2025
1eeb7b0
last test
dw42CSCE Feb 12, 2025
976f10f
last test
dw42CSCE Feb 12, 2025
a566c60
?
dw42CSCE Feb 12, 2025
e80e16c
?
dw42CSCE Feb 12, 2025
ae260cc
Fixing Dependencies
dw42CSCE Feb 12, 2025
40eae07
fixing dependencies
dw42CSCE Feb 12, 2025
a7a6334
fixing dependencies
dw42CSCE Feb 12, 2025
2584642
testing
dw42CSCE Feb 12, 2025
a9f99b7
check
dw42CSCE Feb 12, 2025
3ecf2a1
Test
dw42CSCE Feb 12, 2025
87fc395
Test
dw42CSCE Feb 12, 2025
1c53d0f
Testing
dw42CSCE Feb 12, 2025
4c41158
test
dw42CSCE Feb 12, 2025
83be695
test
dw42CSCE Feb 12, 2025
987407a
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
a284a32
testing ading new functions
dw42CSCE Feb 12, 2025
8e635aa
fixing?
dw42CSCE Feb 12, 2025
1bff093
Fixed not updating
dw42CSCE Feb 12, 2025
61ab8d5
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
d1f6222
Fixed
dw42CSCE Feb 12, 2025
d1b210d
Merge branch 'main' of https://github.com/dw42CSCE/contourusv
dw42CSCE Feb 12, 2025
d4d57ee
Fixing main maybe?
dw42CSCE Feb 12, 2025
4c0877c
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
a5f5576
t
dw42CSCE Feb 12, 2025
730001e
Merge branch 'main' of https://github.com/dw42CSCE/contourusv
dw42CSCE Feb 12, 2025
a00d5ce
Fixing main
dw42CSCE Feb 12, 2025
8f7b510
Fixing main
dw42CSCE Feb 12, 2025
5244ed6
Done for the night
dw42CSCE Feb 12, 2025
486bb4a
Done for the night
dw42CSCE Feb 12, 2025
946e83f
Fixed Main I think
dw42CSCE Feb 12, 2025
c0cbd2f
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
7abdfce
Changing to push to gh pages
dw42CSCE Feb 16, 2025
c07e130
Fixing branching error
dw42CSCE Feb 16, 2025
f4edbab
Another attempted fix
dw42CSCE Feb 17, 2025
e24e410
Changing git add
dw42CSCE Feb 17, 2025
8b209a1
Fixing
dw42CSCE Feb 17, 2025
cb7580f
Fixing
dw42CSCE Feb 17, 2025
1ad9b56
Still working
dw42CSCE Feb 17, 2025
8e9f77b
Still working
dw42CSCE Feb 17, 2025
8efc56b
Still working
dw42CSCE Feb 17, 2025
2c18f7d
Fixing
dw42CSCE Feb 17, 2025
17e32dd
Fixing
dw42CSCE Feb 17, 2025
cbd41b2
Fixing
dw42CSCE Feb 17, 2025
12caf22
adding docs
dw42CSCE Feb 17, 2025
9b5eac2
Commiting docs to main, then removing
dw42CSCE Feb 17, 2025
4ef2908
Commiting docs to main, then removing
dw42CSCE Feb 17, 2025
5eee9ae
Adding docs
dw42CSCE Feb 17, 2025
e002194
Remove docs folder from main branch
dw42CSCE Feb 17, 2025
b0cf48a
Fixed I think. Testing
dw42CSCE Feb 17, 2025
82171a1
Merge branch 'main' of https://github.com/dw42CSCE/contourusv
dw42CSCE Feb 17, 2025
2620474
Adding docs
dw42CSCE Feb 17, 2025
a0b08fb
Remove docs folder from main branch
dw42CSCE Feb 17, 2025
471f30e
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
1d537d8
Fixing main maybe?
dw42CSCE Feb 12, 2025
bd68bcc
t
dw42CSCE Feb 12, 2025
8820ac1
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
d410340
Fixing main
dw42CSCE Feb 12, 2025
9f880be
Fixing main
dw42CSCE Feb 12, 2025
4fd96d7
Done for the night
dw42CSCE Feb 12, 2025
835bc75
Done for the night
dw42CSCE Feb 12, 2025
db1d8cc
Fixed Main I think
dw42CSCE Feb 12, 2025
9121db1
Add generated Sphinx documentation
dw42CSCE Feb 12, 2025
7478f06
Changing to push to gh pages
dw42CSCE Feb 16, 2025
cb53903
Fixing branching error
dw42CSCE Feb 16, 2025
d476a10
Another attempted fix
dw42CSCE Feb 17, 2025
509d2a2
Changing git add
dw42CSCE Feb 17, 2025
32c7bcf
Fixing
dw42CSCE Feb 17, 2025
ec672b1
Fixing
dw42CSCE Feb 17, 2025
34155df
Still working
dw42CSCE Feb 17, 2025
c40fba7
Still working
dw42CSCE Feb 17, 2025
37a2beb
Still working
dw42CSCE Feb 17, 2025
ddf7551
Fixing
dw42CSCE Feb 17, 2025
94d1d86
Fixing
dw42CSCE Feb 17, 2025
2612ba9
Fixing
dw42CSCE Feb 17, 2025
50c162a
adding docs
dw42CSCE Feb 17, 2025
7a85535
Commiting docs to main, then removing
dw42CSCE Feb 17, 2025
3f8bad0
Commiting docs to main, then removing
dw42CSCE Feb 17, 2025
c3dec18
Fixed I think. Testing
dw42CSCE Feb 17, 2025
9d1d1ac
Adding docs
dw42CSCE Feb 17, 2025
31ceee7
Remove docs folder from main branch
dw42CSCE Feb 17, 2025
821e26e
rebase
christian-oreilly Feb 21, 2025
c70b92d
rebase
christian-oreilly Feb 21, 2025
1af54a9
readme update
Sabah98 Feb 3, 2025
1d7a9a6
removed example annotations
Sabah98 Feb 3, 2025
654fc57
updating pyproject.toml file
Sabah98 Feb 4, 2025
8850763
updating pyproject.toml
Sabah98 Feb 4, 2025
4ff2c2b
updating readme
Sabah98 Feb 4, 2025
ac8b03d
updated all scripts with docstrings
Sabah98 Feb 4, 2025
aead60d
updating annotation directory
Sabah98 Feb 4, 2025
602d11f
updating evaluation directory
Sabah98 Feb 4, 2025
25ef9d3
updating readme
Sabah98 Feb 4, 2025
ccf7586
Update src/detection.py
Sabah98 Feb 9, 2025
dc6b8b9
Update src/detection.py
Sabah98 Feb 9, 2025
8b3ff43
Update src/detection.py
Sabah98 Feb 9, 2025
70b627d
Update src/evaluation.py
Sabah98 Feb 9, 2025
a24c3ad
Update src/evaluation.py
Sabah98 Feb 9, 2025
9fbd9b1
Update src/generate_annotation.py
Sabah98 Feb 9, 2025
8b2fa35
Update src/main.py
Sabah98 Feb 9, 2025
c35e02f
fixing indentation issues
Sabah98 Feb 9, 2025
606b7ab
Update src/evaluation.py
christian-oreilly Feb 9, 2025
fb19be1
linting
christian-oreilly Feb 21, 2025
b50f2a5
merging
christian-oreilly Feb 21, 2025
e24af60
Add pre-commit.
christian-oreilly Feb 21, 2025
d54ca8e
Linting
christian-oreilly Feb 21, 2025
1f31706
linting
christian-oreilly Feb 21, 2025
5120a91
spell check
christian-oreilly Feb 21, 2025
a51f2b3
CI install dependencies
christian-oreilly Feb 21, 2025
7080636
install dependency pytest
christian-oreilly Feb 21, 2025
a0fdab7
Fixing
dw42CSCE Feb 26, 2025
036d18e
Merge branch 'main' of https://github.com/dw42CSCE/contourusv
dw42CSCE Feb 26, 2025
1614eae
updated detection pipeline and readme
Sabah98 Feb 3, 2025
8545810
updated all scripts with docstrings
Sabah98 Feb 4, 2025
39b2512
Adding docs
dw42CSCE Feb 26, 2025
b99ec49
Remove docs folder from main branch
dw42CSCE Feb 26, 2025
9d0565e
adding Sphinx Autodocing
dw42CSCE Mar 2, 2025
232277c
Adding Docs
dw42CSCE Mar 2, 2025
21cacbe
Adding docs
dw42CSCE Mar 2, 2025
6f2a63a
changing autodoccing
dw42CSCE Mar 2, 2025
34da7e4
Fixing autodoccing
dw42CSCE Mar 2, 2025
c3c567b
fixing autodoc
dw42CSCE Mar 2, 2025
2f687e0
Merge branch '2-add-continuous-integration'
dw42CSCE Mar 2, 2025
13d06bb
Update src/evaluation.py
Sabah98 Feb 9, 2025
9ece9d3
Update src/evaluation.py
christian-oreilly Feb 9, 2025
f481134
Adding Autodocing
dw42CSCE Feb 11, 2025
05a3525
testing build docs
dw42CSCE Feb 11, 2025
32bdbf7
testing build docs
dw42CSCE Feb 11, 2025
941248e
Merge branch '2-add-continuous-integration'
dw42CSCE Feb 11, 2025
8425470
Trying to figure out the function doc
dw42CSCE Feb 11, 2025
6346b68
Still testing autodocing
dw42CSCE Feb 12, 2025
98e047c
Fixed maybe?
dw42CSCE Feb 12, 2025
ec4ebdf
Fixing autodoccing
dw42CSCE Mar 2, 2025
cfe222d
Fixing
dw42CSCE Mar 2, 2025
0dc6fbf
Merge branch 'main' of https://github.com/dw42CSCE/contourusv
dw42CSCE Mar 2, 2025
f578ec3
Hopefully fixed this time
dw42CSCE Mar 2, 2025
e470a86
Hopefully fixed this time
dw42CSCE Mar 2, 2025
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
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"

# Maintain dependencies for Composer
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "monthly"
78 changes: 78 additions & 0 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Build Sphinx Documentation

on:
push:
branches:
- main
pull_request:
branches:
- 2-add-continuous-integration

jobs:
build:
runs-on: ubuntu-latest # You can also use `windows-latest` or `macos-latest` if needed

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10' # Set your preferred Python version

- name: Add src to PYTHONPATH
run: echo "PYTHONPATH=$PYTHONPATH:$(pwd)/contourusv" >> $GITHUB_ENV

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install sphinx
pip install sphinx_rtd_theme
# Install missing dependencies
pip install opencv-python numpy pandas
pip install tqdm scipy
pip install matplotlib
pip install codecarbon
- name: Build the documentation
run: |
# Generate reStructuredText files from the source code
sphinx-apidoc -o sphinx/ contourusv/ -f
rm -rf docs/

# Ensure the docs directory exists
mkdir -p docs
# Build the HTML documentation
sphinx-build -b html sphinx/ docs/
pwd
ls
# Add a .nojekyll file to bypass Jekyll processing on GitHub Pages
touch ./docs/.nojekyll
git config --global user.email "[email protected]"
git config --global user.name "Dallas Wade"
git add *
git commit -m "Adding docs"
git push origin main

- name: Commit and push generated docs
run: |
ls
git config --global user.email "[email protected]"
git config --global user.name "Dallas Wade"
git config --global pull.rebase false # Or true, or --ff-only based on your preference
# Ensure gh-pages branch exists and switch to it
git fetch origin gh-pages || git checkout --orphan gh-pages
git checkout gh-pages
git pull origin gh-pages --rebase # Or --no-rebase based on your configuration
git checkout main -- docs/
git clean -fdx
# Commit and push only docs to gh-pages
git add docs/
git commit -m "Update Sphinx documentation"
git push origin gh-pages
# Switch back to main and remove docs from the main branch
git checkout main
rm -rf docs/
git add -A
git commit -m "Remove docs folder from main branch"
git push origin main
25 changes: 25 additions & 0 deletions .github/workflows/check_linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Style, Spellcheck, & Docstring

on: pull_request

jobs:
style:
name: Style
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
python-version: "3.11"
- uses: pre-commit/[email protected]
- name: Install dependencies
run: pip install .
# Run Ruff
- name: Install Ruff
run: pip install ruff
- name: Run Ruff
run: ruff check contourusv
# Run Codespell
- name: Install Codespell
run: pip install codespell
- name: Run Codespell
run: codespell contourusv
39 changes: 39 additions & 0 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# release workflow
name: Release workflow
on:
release:
types:
- published

jobs:
pypi-publish:
name: Upload release to PyPI
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/contourusv
permissions:
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
steps:
# retrieve your distributions here
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install pypa/build
run: >-
python -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: >-
python -m
build
--sdist
--wheel
--outdir dist/
.
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
50 changes: 50 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Test

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
test:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os:
- ubuntu-latest
- macos-latest # arm64 (Apple Silicon)
- macos-13 # latest Intel release
- windows-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v5
with:
python-version: "3.9"
- name: Force numpy < 2 on MacOS Intel
if: matrix.os == 'macos-13'
run: pip install 'numpy<2'
- name: Install ContourUSV
run: pip install -e .
- name: Test import
run: |
python -c "import contourusv"
#- name: Install testing dependencies
# run: pip install -r requirements_testing.txt
#- name: Install QC depedencies
# run: pip install -r requirements_qc.txt
- name: Install coverage & pytest
run: pip install coverage pytest
- name: Test
run: |
coverage run -m pytest
- name: Upload coverage to codecov (Only do this for the ubuntu-latest job)
if: matrix.os == 'ubuntu-latest'
uses: codecov/codecov-action@v5
with:
token: ${{secrets.CODECOV_TOKEN}}
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
src/__pycache__
src/__pycache__
venv
src/output
src/tests
contourusv/__pycache__
contourusv/Experiments
contourusv/output
venv
.gitignore
18 changes: 18 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
repos:
# Ruff linter
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.286
hooks:
- id: ruff
name: ruff
files: ^contourusv/

# Codespell
- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
hooks:
- id: codespell
additional_dependencies:
- tomli
files: ^contourusv/|^docs/
types_or: [python, bib, rst, inc]
Empty file added contourusv/__init__.py
Empty file.
Loading
Loading