Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 23 additions & 23 deletions .github/workflows/clabe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- dev*
- release*
release:
types: [published]
types: [ published ]

jobs:
# ╔──────────────────────────╗
Expand All @@ -37,13 +37,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
python-version: [3.11, 3.12, 3.13]
os: [ windows-latest, ubuntu-latest ]
python-version: [ 3.11, 3.12, 3.13 ]
fail-fast: false
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
enable-cache: true

Expand Down Expand Up @@ -78,19 +78,19 @@ jobs:
# ╚───────────────────────────────────────────────────────────╝
github-rc-release:
needs: tests
runs-on: windows-latest
runs-on: ubuntu-latest
if: >
github.ref == 'refs/heads/main' &&
github.event_name == 'push' &&
github.event.head_commit.author.email != 'github-actions[bot]@users.noreply.github.com'
github.ref == 'refs/heads/main' && github.event_name == 'push' &&
github.event.head_commit.author.email !=
'github-actions[bot]@users.noreply.github.com'
name: Create GitHub pre-release
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
ref: main

- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
enable-cache: true

Expand Down Expand Up @@ -142,20 +142,20 @@ jobs:
# ╚─────────────────────────────────────────────────────────────────╝

prepare-public-release:
runs-on: windows-latest
runs-on: ubuntu-latest
name: Prepare files for public release
needs: tests
if: github.event_name == 'workflow_dispatch'
outputs:
version: ${{ steps.get_version.outputs.version }}
is_prerelease: ${{ steps.check_prerelease.outputs.prerelease }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
ref: main

- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
enable-cache: true

Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
fi

- name: Create GitHub Release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand All @@ -226,22 +226,22 @@ jobs:
This release was manually triggered.

publish-to-pypi:
runs-on: windows-latest
runs-on: ubuntu-latest
name: Publish to PyPI
needs: [tests, prepare-public-release]
needs: [ tests, prepare-public-release ]
if: |
(github.event_name == 'workflow_dispatch') ||
(github.event_name == 'release' &&
github.event.action == 'published' &&
!github.event.release.prerelease &&
startsWith(github.ref, 'refs/tags/v'))
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
ref: ${{ github.event_name == 'workflow_dispatch' && 'main' || github.ref_name }}
ref: ${{ github.event_name == 'workflow_dispatch' && 'main' || github.ref_name}}

- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
with:
enable-cache: true

Expand Down Expand Up @@ -280,15 +280,15 @@ jobs:
# ╚─────────────────────────╝
build-docs:
name: Build and deploy documentation to GitHub Pages
runs-on: windows-latest
runs-on: ubuntu-latest
needs: publish-to-pypi
if: github.event_name == 'release' && !github.event.release.prerelease
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Install uv
uses: astral-sh/setup-uv@v6
uses: astral-sh/setup-uv@v7
with:
enable-cache: true

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Operating System :: Microsoft :: Windows",
"Operating System :: POSIX :: Linux",
]

dependencies = [
Expand All @@ -41,8 +42,6 @@ aind-services = [
"requests",
"pyyaml",
"pykeepass",
"cryptography",
"msal; sys_platform == 'win32'",
"aind-data-schema>=2",
"aind-data-transfer-service >= 1.22.0",
"aind-watchdog-service >= 0.1.6",
Expand Down
2 changes: 1 addition & 1 deletion tests/apps/test_curriculum.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def curriculum_app() -> CurriculumApp:
settings=CurriculumSettings(
script=["curriculum", "run"],
input_trainer_state=Path("MockPath"),
data_directory="Demo",
data_directory="demo",
project_directory=TESTS_ASSETS / "Aind.Behavior.VrForaging.Curricula",
curriculum="template",
)
Expand Down
Loading
Loading