Skip to content

Commit a0f977c

Browse files
GatlenCulpGatlenCulp
authored
Merge branch 'master' into git-support
2 parents 6fbd4ed + 67a5509 commit a0f977c

File tree

270 files changed

+27381
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+27381
-1081
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/python
3+
{
4+
"name": "gotem",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bullseye",
7+
"features": {
8+
"ghcr.io/dhoeric/features/act:1": {},
9+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
10+
},
11+
"remoteEnv": {
12+
// "UV_FROZEN": "true",
13+
"UV_PYTHON_PREFERENCE": "only-managed",
14+
"UV_PROJECT_ENVIRONMENT": "${containerWorkspaceFolder}/.devcontainer/.venv",
15+
"VIRTUAL_ENV": "${containerWorkspaceFolder}/.devcontainer/.venv",
16+
"PATH": "${containerWorkspaceFolder}/.devcontainer/.venv/bin:${env:PATH}"
17+
},
18+
// Use 'postCreateCommand' to run commands after the container is created.
19+
"postCreateCommand": "${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh",
20+
// Configure tool-specific properties.
21+
"customizations": {
22+
"vscode": {
23+
"extensions": [
24+
"ms-python.python",
25+
"ms-python.vscode-pylance",
26+
"ms-python.debugpy",
27+
"charliermarsh.ruff",
28+
"njpwerner.autodocstring",
29+
"rodolphebarbanneau.python-docstring-highlighter",
30+
"kevinrose.vsc-python-indent",
31+
"ms-toolsai.jupyter",
32+
"ms-toolsai.jupyter-renderers",
33+
"mechatroner.rainbow-csv",
34+
"sbsnippets.pytorch-snippets",
35+
"mads-hartmann.bash-ide-vscode",
36+
"timonwong.shellcheck",
37+
"foxundermoon.shell-format",
38+
"ms-vscode-remote.remote-containers",
39+
"ms-vscode-remote.remote-ssh",
40+
"ms-vscode-remote.remote-ssh-edit",
41+
"mathematic.vscode-pdf",
42+
"vitaliymaz.vscode-svg-previewer",
43+
"ctcuff.font-preview",
44+
"james-yu.latex-workshop",
45+
"shd101wyy.markdown-preview-enhanced",
46+
"esbenp.prettier-vscode",
47+
"mrmlnc.vscode-attrs-sorter",
48+
"richie5um2.vscode-sort-json",
49+
"2gua.rainbow-brackets",
50+
"aaron-bond.better-comments",
51+
"alefragnani.project-manager",
52+
"peterschmalfeldt.explorer-exclude",
53+
"christian-kohler.path-intellisense",
54+
"kisstkondoros.vscode-gutter-preview",
55+
"eamodio.gitlens",
56+
"humao.rest-client",
57+
"ms-vscode.makefile-tools",
58+
"task.vscode-task",
59+
"tamasfe.even-better-toml",
60+
"dotenv.dotenv-vscode",
61+
"redhat.vscode-yaml",
62+
"redhat.vscode-xml",
63+
"ibm.output-colorizer",
64+
"usernamehw.errorlens",
65+
"spmeesseman.vscode-taskexplorer",
66+
"exiasr.hadolint",
67+
"ms-azuretools.vscode-docker"
68+
],
69+
"settings": {
70+
// "dotfiles.repository": "https://github.com/GatlenCulp/dotfiles.git",
71+
"python.testing.pytestArgs": [
72+
"tests"
73+
],
74+
"python.testing.unittestEnabled": false,
75+
"python.testing.pytestEnabled": true,
76+
"python.defaultInterpreterPath": "${containerWorkspaceFolder}/.devcontainer/.venv/bin/python",
77+
"python.testing.pytestPath": "${containerWorkspaceFolder}/.devcontainer/.venv/bin/pytest",
78+
"python.terminal.activateEnvironment": true
79+
}
80+
}
81+
}
82+
}

‎.devcontainer/postCreateCommand.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#! /usr/bin/env bash
2+
3+
# Install Dependencies
4+
# uv sync --no-cache
5+
6+
# Install pre-commit hooks
7+
# uv run pre-commit install --install-hooks

‎.github/workflows/test-specific.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: test-specific
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
expression:
7+
description: 'Test expression to filter for'
8+
required: true
9+
type: choice
10+
options:
11+
- 'uv-none-mkdocs'
12+
- 'uv-none-none'
13+
- 'uv-requirements.txt-mkdocs'
14+
- 'uv-requirements.txt-none'
15+
- 'virtualenv-requirements.txt-mkdocs'
16+
- 'virtualenv-requirements.txt-none'
17+
- 'conda-requirements.txt-mkdocs'
18+
- 'conda-requirements.txt-none'
19+
- 'conda-environment.yml-mkdocs'
20+
- 'conda-environment.yml-none'
21+
- 'pipenv-Pipfile-mkdocs'
22+
- 'pipenv-Pipfile-none'
23+
- 'none-requirements.txt-mkdocs'
24+
- 'none-requirements.txt-none'
25+
os:
26+
description: 'Operating system to run on'
27+
required: true
28+
type: choice
29+
default: 'ubuntu-latest'
30+
options:
31+
- ubuntu-latest
32+
- macos-latest
33+
- windows-latest
34+
35+
jobs:
36+
tests-specific:
37+
name: Tests (${{ inputs.os }})
38+
runs-on: ${{ inputs.os }}
39+
defaults:
40+
run:
41+
shell: bash
42+
43+
steps:
44+
- uses: actions/checkout@v4
45+
46+
- name: Set up Python
47+
uses: actions/setup-python@v5
48+
with:
49+
python-version: "3.10"
50+
allow-prereleases: true
51+
cache: "pip"
52+
cache-dependency-path: |
53+
pyproject.toml
54+
dev-requirements.txt
55+
56+
- name: Set up Miniconda
57+
uses: conda-incubator/setup-miniconda@v3
58+
with:
59+
auto-activate-base: true
60+
activate-environment: ""
61+
62+
- name: Cache conda packages
63+
uses: actions/cache@v4
64+
env:
65+
# Increase this value to reset cache explicitly
66+
CACHE_NUMBER: 0
67+
with:
68+
path: ~/conda_pkgs_dir
69+
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
70+
hashFiles('ccds/hook_utils/dependencies.py') }}
71+
72+
- name: Setup for Windows
73+
if: ${{ inputs.os == 'windows-latest' }}
74+
run: |
75+
# Install GNU make
76+
choco install --verbose make
77+
# Add conda binaries directory to PATH so that conda is accessible
78+
echo "${CONDA}\Scripts" >> $GITHUB_PATH
79+
# Set bash executable explicitly since Make may pick wrong shell
80+
echo "BASH_EXECUTABLE=$(which bash)" >> "$GITHUB_ENV"
81+
82+
- name: Install dependencies
83+
run: |
84+
python -m pip install --upgrade pip
85+
make requirements
86+
87+
- name: Check dependencies
88+
run: |
89+
if [[ -z "${BASH_EXECUTABLE}" ]]; then
90+
bash --version
91+
else
92+
echo $BASH_EXECUTABLE
93+
$BASH_EXECUTABLE --version
94+
fi
95+
which make
96+
make --version
97+
which conda
98+
conda --version
99+
which pipenv
100+
pipenv --version
101+
which virtualenv
102+
virtualenv --version
103+
104+
- name: Run tests
105+
run: |
106+
make test ARGS="-k ${{ inputs.expression }}"

‎.github/workflows/tests.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: tests
32

43
on:
@@ -49,7 +48,8 @@ jobs:
4948
strategy:
5049
matrix:
5150
os: [ubuntu-latest, macos-latest, windows-latest]
52-
python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
51+
# python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
52+
python-version: ["3.10"]
5353
defaults:
5454
run:
5555
shell: bash
@@ -72,6 +72,8 @@ jobs:
7272
with:
7373
auto-activate-base: true
7474
activate-environment: ""
75+
channels: conda-forge,defaults
76+
channel-priority: strict
7577

7678
- name: Cache conda packages
7779
uses: actions/cache@v4

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ docs/docs/_partials/*/*.html
55

66
# test cache
77
manual_test/
8+
.history
89

910
# other local dev info
1011
.vscode/
1112
.history/
13+
# .vscode/
1214

1315
# Mac OS-specific storage files
1416
.DS_Store
@@ -76,6 +78,7 @@ coverage.xml
7678
*.py,cover
7779
.hypothesis/
7880
.pytest_cache/
81+
.ruff_cache/
7982
cover/
8083

8184
# Translations
@@ -143,7 +146,7 @@ celerybeat.pid
143146
# SageMath parsed files
144147
*.sage.py
145148

146-
# Environments
149+
# Environments and Secrets
147150
.env
148151
.venv
149152
env/

‎.pre-commit-config.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.2.0
4+
hooks:
5+
- id: check-symlinks
6+
- id: check-yaml
7+
args: ["--allow-multiple-documents"]
8+
# - id: double-quote-string-fixer
9+
- id: forbid-new-submodules
10+
- repo: https://github.com/gitleaks/gitleaks
11+
rev: v8.22.0
12+
hooks:
13+
- id: gitleaks

‎.vscode/extensions.json‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
3+
"recommendations": [
4+
// Python Development
5+
"ms-python.python", // Python Environments, Language, and More
6+
"ms-python.vscode-pylance", // Python Language Server w/ Typing
7+
"ms-python.debugpy", // VSCode Python Debugger
8+
"charliermarsh.ruff", // Fast Python Linter & Formatter
9+
"njpwerner.autodocstring", // Automatically generate Python docstrings
10+
"rodolphebarbanneau.python-docstring-highlighter", // Highlight Python docstring syntax
11+
"kevinrose.vsc-python-indent", // Correct indents for python
12+
13+
// Data Science & Notebooks
14+
"ms-toolsai.jupyter", // Jupyter Notebooks in VSCode
15+
"ms-toolsai.jupyter-renderers", // Jupyter Cell Output Renderer
16+
"mechatroner.rainbow-csv", // Color-coded CSV Columns
17+
"sbsnippets.pytorch-snippets", // Snippits for PyTorch
18+
19+
// Shell & Command Line
20+
"mads-hartmann.bash-ide-vscode", // .*sh script language support
21+
"timonwong.shellcheck", // .*sh script linting
22+
"foxundermoon.shell-format", // .*sh script formatting
23+
24+
// Remote Development
25+
"ms-vscode-remote.remote-containers", // Remote Connect to Docker
26+
"ms-vscode-remote.remote-ssh", // Remote Connect via SSH
27+
"ms-vscode-remote.remote-ssh-edit", // SSH Config File Editing
28+
"exiasr.hadolint", // Dockerfile linter
29+
30+
// Document Formats & Preview
31+
"mathematic.vscode-pdf", // PDF Preview
32+
"vitaliymaz.vscode-svg-previewer", // SVG Preview
33+
"ctcuff.font-preview", // Font PReview
34+
"james-yu.latex-workshop", // LaTeX File Renderer for Documents
35+
"shd101wyy.markdown-preview-enhanced", // Improved Markdown Preview
36+
37+
// Code Formatting & Style
38+
"esbenp.prettier-vscode", // Prettier general formatting tool
39+
"mrmlnc.vscode-attrs-sorter", // HTML Attribute Sorter
40+
"richie5um2.vscode-sort-json", // JSON Sorter
41+
"2gua.rainbow-brackets", // Multi-colored brackets for readability
42+
"aaron-bond.better-comments", // Comments w/ Styling
43+
44+
// Project Management & Navigation
45+
"alefragnani.project-manager", // Manage VSCode Workspaces
46+
/* Add the below to your projects.json file to add this project
47+
'~/Library/Application Support/Cursor/User/globalStorage/alefragnani.project-manager/projects.json'
48+
{
49+
"name": "🍪 {{ cookiecutter.repo_name }}",
50+
"rootPath": "/Path/to/your/project/{{ cookiecutter.repo_name }}/.vscode/{{ cookiecutter.repo_name }}.code-workspace",
51+
"tags": [
52+
"🪿 gotem"
53+
],
54+
"enabled": true
55+
},
56+
*/
57+
"peterschmalfeldt.explorer-exclude", // Keep Explorer Clean by Hiding Files
58+
"christian-kohler.path-intellisense", // Path Intellisense
59+
"kisstkondoros.vscode-gutter-preview", // Image Preview
60+
61+
// Git & Version Control
62+
"eamodio.gitlens", // View git diffs, edits, branches and more
63+
64+
// TODO: Add cookiecutter template types, include if web only
65+
// API Development
66+
"humao.rest-client", // Easily make HTTP queries for API testing
67+
68+
// Build Tools
69+
"ms-vscode.makefile-tools", // Tools for Makefiles
70+
"task.vscode-task", // Tools for Taskfiles
71+
72+
// Configuration Files
73+
"tamasfe.even-better-toml", // .toml language support
74+
"dotenv.dotenv-vscode", // .env language support
75+
"redhat.vscode-yaml", // .yaml language support
76+
"redhat.vscode-xml", // .xml language support
77+
78+
// Output & Debugging
79+
"ibm.output-colorizer", // Automatically color-code VSCode Output logs
80+
"usernamehw.errorlens",
81+
"spmeesseman.vscode-taskexplorer",
82+
"ms-azuretools.vscode-docker" // Highlight errors in-line
83+
],
84+
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
85+
"unwantedRecommendations": [
86+
// Superceded by ruff
87+
"ms-python.black-formatter",
88+
"ms-python.isort",
89+
"ms-python.pylint",
90+
91+
// Superceded by Pylance
92+
"ms-pyright.pyright"
93+
]
94+
}

0 commit comments

Comments
 (0)