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

[Do not merge] PR for diff of DANDI vs. LINC #275

Draft
wants to merge 622 commits into
base: dandi-oct-diff
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
622 commits
Select commit Hold shift + click to select a range
fd0e581
more progress on linting and testing
Jul 2, 2024
d7c91cf
resolve unit tests
Jul 2, 2024
61b2a33
resolve linting too
Jul 2, 2024
bb8b6f1
revise CI for linting
Jul 4, 2024
396d5fc
one more bump
Jul 4, 2024
f555543
resolve mypy
Jul 7, 2024
d0dc96c
resolve frontend CI
Jul 7, 2024
3fb268a
Merge pull request #189 from lincbrain/ak-pytest
aaronkanzer Jul 7, 2024
ff55b07
Include field for webknossos creds
Jul 7, 2024
a04f6d1
sanitize logs from celery for password
Jul 9, 2024
dd29e5c
update logic for when webknossos account should be created
Jul 10, 2024
11e7303
revise registration logic
Jul 10, 2024
53ee2b3
linting
Jul 10, 2024
8ff56e3
cleanup
Jul 10, 2024
b13487e
Resolve linting
Jul 10, 2024
8a58a43
mute linting and type checking
Jul 10, 2024
523a2fc
mute playwright for auth reasons
Jul 10, 2024
72b4190
Merge pull request #188 from lincbrain/ak-wb
aaronkanzer Jul 10, 2024
6113f6b
Merge pull request #193 from lincbrain/master
aaronkanzer Jul 10, 2024
b42274e
Resolve correct logic for WebKNOSSOS registration save call
Jul 10, 2024
9331d14
Merge pull request #194 from lincbrain/ak-wb-1
aaronkanzer Jul 10, 2024
883f02a
Merge pull request #195 from lincbrain/master
aaronkanzer Jul 10, 2024
854c31a
Update order of operations for WebKNOSSOS registration
Jul 10, 2024
3718f65
Merge pull request #196 from lincbrain/ak-wb-2
aaronkanzer Jul 10, 2024
d023282
Merge pull request #197 from lincbrain/master
aaronkanzer Jul 10, 2024
e2bd204
Remove unnecessary query for WebKNOSSOS
Jul 10, 2024
01cdf17
Merge pull request #198 from lincbrain/ak-wb-3
aaronkanzer Jul 10, 2024
a7f6de8
Merge pull request #199 from lincbrain/master
aaronkanzer Jul 10, 2024
48f1d89
Refactor viewset to handle abstracted login to external service like …
Jul 11, 2024
3d65582
a bit more pprogress
Jul 11, 2024
bbfb976
endpoint working
Jul 11, 2024
2c50109
include test to see if frontend can chat with webknossos
Jul 13, 2024
f1a0bc6
Merge pull request #200 from lincbrain/ak-wk-login
aaronkanzer Jul 13, 2024
a0eaf17
Merge pull request #201 from lincbrain/master
aaronkanzer Jul 13, 2024
196c16c
Resolve webknossos client configuration
Jul 13, 2024
0625877
Merge pull request #202 from lincbrain/ak-wk-client
aaronkanzer Jul 13, 2024
353c373
Remove trailing slash on webknossos call
Jul 13, 2024
322cab2
Merge pull request #203 from lincbrain/ak-slash
aaronkanzer Jul 13, 2024
1f8bd3a
Revise client setup for axios webknossos client
Jul 13, 2024
f9974ff
bump client
Jul 13, 2024
2715ffa
Merge pull request #204 from lincbrain/ak-cookie
aaronkanzer Jul 13, 2024
8d7556b
Merge pull request #206 from lincbrain/staging
aaronkanzer Jul 15, 2024
4d7e159
Trivial change to invoke deploy
Jul 15, 2024
6edef70
Merge pull request #207 from lincbrain/ak-bump-staging
aaronkanzer Jul 15, 2024
82a0c62
Remove sending of cookie for now
Jul 16, 2024
e8306e0
Merge pull request #208 from lincbrain/ak-simple
aaronkanzer Jul 16, 2024
b1b45f4
Merge pull request #209 from lincbrain/master
aaronkanzer Jul 16, 2024
ed57af8
Include staging.lincbrain.org in cors list
Jul 16, 2024
2c390f0
Merge pull request #210 from lincbrain/ak-cors-list
aaronkanzer Jul 16, 2024
b1624fe
Merge pull request #211 from lincbrain/master
aaronkanzer Jul 16, 2024
eb23721
Resolve creation of createsuperuser
Jul 16, 2024
753c551
Merge pull request #212 from lincbrain/ak-cors-2
aaronkanzer Jul 16, 2024
7a6091e
Merge pull request #213 from lincbrain/master
aaronkanzer Jul 16, 2024
70ce995
Bump save call again for createsuperuser
Jul 17, 2024
484a445
Merge pull request #214 from lincbrain/ak-cors-2
aaronkanzer Jul 17, 2024
18cfa11
Resolve cli-integration CI tests to github actions
Jul 19, 2024
f652272
Merge pull request #216 from lincbrain/ak-cli-ci
aaronkanzer Jul 19, 2024
cc5acb5
reference correct docker repo in cli-integration workflow
Jul 19, 2024
bfd3025
Merge pull request #217 from lincbrain/ak-docker
aaronkanzer Jul 19, 2024
d0a5616
Replace netlify staging url with staging.lincbrain.org url in archive
Jul 22, 2024
3db4531
Merge pull request #218 from lincbrain/ak-link
aaronkanzer Jul 22, 2024
ec78853
Merge unembargoed work upstream from DANDI Archive into LINC Data Pla…
Jul 23, 2024
3208614
Merge pull request #219 from lincbrain/ak-july23-merge
aaronkanzer Jul 23, 2024
07132e3
move signup to r5 for netlify webknossos
Aug 27, 2024
8417308
Merge pull request #223 from lincbrain/ak-wk-connect
aaronkanzer Aug 28, 2024
ac8afd1
Merge pull request #224 from lincbrain/master
aaronkanzer Aug 28, 2024
41d8f99
Include a bit more logging for staging upon 403 from webknossos
Aug 28, 2024
be36ebc
Merge pull request #225 from lincbrain/ak-log
aaronkanzer Aug 28, 2024
5675252
Include default params for webknossos endpoint
Aug 29, 2024
7627970
Merge pull request #226 from lincbrain/ak-log-1
aaronkanzer Aug 29, 2024
f3fde0f
Clean args for webknossos call
Aug 30, 2024
2888e5b
Draft: Build out functionality to handle webknossos dataset mapping t…
Aug 30, 2024
175c7fc
more progress on webknossos rendering
Sep 1, 2024
bd5676b
more progress
Sep 1, 2024
e56d1e7
more progress on endpoints
Sep 2, 2024
df886a8
more progress on endpoint
Sep 3, 2024
efb2604
Include more progress
Sep 3, 2024
1340687
Merge pull request #227 from lincbrain/ak-wk-data
aaronkanzer Sep 3, 2024
238d717
Merge pull request #228 from lincbrain/master
aaronkanzer Sep 3, 2024
c61d1ac
Merge pull request #205 from lincbrain/staging
aaronkanzer Sep 3, 2024
7ee02a7
Stream json and refine queries to resolve webknossos datasets endpoint
Sep 4, 2024
f2bc24c
Merge pull request #229 from lincbrain/ak-stream
aaronkanzer Sep 4, 2024
8e64df4
Merge pull request #230 from lincbrain/master
aaronkanzer Sep 4, 2024
333bb34
Resolve failing validation of incoming user from JupyterHub request
Sep 11, 2024
d641aa3
make email optional
Sep 11, 2024
b022fb4
Remove r5 appended value from WebKNOSSOS API calls
Sep 11, 2024
143ab29
bump netlify value for webknossos url
Sep 13, 2024
5ac71ca
Merge pull request #232 from lincbrain/ak-r5
aaronkanzer Sep 16, 2024
dbe6e8d
Merge pull request #233 from lincbrain/master
aaronkanzer Sep 16, 2024
6909b31
Merge pull request #231 from lincbrain/ak-jh-fix
aaronkanzer Sep 16, 2024
a2cf539
Merge pull request #234 from lincbrain/master
aaronkanzer Sep 16, 2024
c31c5d6
Include logic to render webknossos annotations in LINC Archive
Sep 17, 2024
443fdb1
More progress
Sep 17, 2024
8c48c41
more progress
Sep 17, 2024
c4d1da9
Bump to include author name
Sep 17, 2024
7142669
Merge pull request #235 from lincbrain/ak-annotate
aaronkanzer Sep 17, 2024
6bfe139
Merge pull request #236 from lincbrain/master
aaronkanzer Sep 17, 2024
3d27f61
Make endpoints and population of data more efficient
Sep 18, 2024
7460401
Bump naming in interfaces to handle serializer
Sep 18, 2024
7e1c74d
Merge pull request #237 from lincbrain/ak-annotate-2
aaronkanzer Sep 18, 2024
f9f9ef9
Merge pull request #238 from lincbrain/master
aaronkanzer Sep 18, 2024
3ffc9c7
Revise naming convention for webknossos_info in UI
Sep 18, 2024
4d0d976
Merge pull request #239 from lincbrain/ak-webknossos-info
aaronkanzer Sep 18, 2024
105f716
Bump untitled annotation name
Sep 18, 2024
2bf5534
Merge pull request #240 from lincbrain/ak-naming
aaronkanzer Sep 18, 2024
23f8bc3
Merge pull request #241 from lincbrain/release
aaronkanzer Sep 18, 2024
31329fc
Simply render annotations without datasets included for WebKNOSSOS
Sep 20, 2024
ce390da
Merge pull request #242 from lincbrain/ak-update-annotate
aaronkanzer Sep 20, 2024
64a6304
Merge pull request #243 from lincbrain/master
aaronkanzer Sep 20, 2024
8ba28fd
Update fixtures script for annotations, update spacing in FileBrowser…
Sep 23, 2024
4c09054
Merge pull request #244 from lincbrain/ak-spacing
aaronkanzer Sep 23, 2024
4a1c7a0
Merge pull request #245 from lincbrain/master
aaronkanzer Sep 23, 2024
af91866
Resolve logic on rendering
Sep 23, 2024
37b6175
Merge pull request #246 from lincbrain/ak-logic
aaronkanzer Sep 23, 2024
826a0fd
Merge pull request #247 from lincbrain/master
aaronkanzer Sep 23, 2024
b55caa3
Move logic for populating LINC<>Webknossos mapping to scheduled celer…
Sep 23, 2024
4818ae5
Merge pull request #248 from lincbrain/ak-celery
aaronkanzer Sep 23, 2024
2a7eecd
Revise endpoint for webknossos object population
Sep 26, 2024
101c88a
Include link to WebKNOSSOS in nav bar
Oct 2, 2024
43f1fcd
Merge pull request #250 from lincbrain/ak-wk-app
aaronkanzer Oct 2, 2024
cf4b655
Open webknossos window in new tab
Oct 2, 2024
68d6540
Merge pull request #251 from lincbrain/ak-new
aaronkanzer Oct 2, 2024
1bc2b1e
Pass withCredentials for cookies
Oct 2, 2024
634c9ba
Merge pull request #252 from lincbrain/ak-headers-1
aaronkanzer Oct 2, 2024
1dbe44f
Resolve UI AppBar fix for WebKNOSSOS, logout of WebKNOSSOS during logout
Oct 2, 2024
4df1feb
Merge pull request #253 from lincbrain/ak-ui-wk
aaronkanzer Oct 2, 2024
4f594e4
revise login for webknossos UI button
Oct 2, 2024
9ccc1a1
Merge pull request #254 from lincbrain/ak-revert
aaronkanzer Oct 2, 2024
bccafbe
Make webknossos login call async
Oct 2, 2024
382000b
Merge pull request #255 from lincbrain/ak-async
aaronkanzer Oct 2, 2024
7e7c931
Include webknossos login check for each click of WebKnossos dataset a…
Oct 2, 2024
73b70af
Include annotation
Oct 2, 2024
7786f04
Merge pull request #256 from lincbrain/ak-list-wk
aaronkanzer Oct 2, 2024
6640f16
Merge pull request #249 from lincbrain/ak-response
aaronkanzer Oct 7, 2024
66f867b
Merge pull request #257 from lincbrain/release
aaronkanzer Oct 8, 2024
afde57e
Include minor sleep call to handle WebKnossos cookie being set
Oct 10, 2024
06ed7e6
Merge pull request #258 from lincbrain/ak-try
aaronkanzer Oct 10, 2024
46f0779
Merge pull request #259 from lincbrain/master
aaronkanzer Oct 10, 2024
ea67e08
Poll for cookie before opening url
Oct 10, 2024
a67f9f1
Merge pull request #260 from lincbrain/ak-delahy
aaronkanzer Oct 10, 2024
c9f6047
Merge pull request #261 from lincbrain/master
aaronkanzer Oct 10, 2024
c99f41e
Longer delay with console log for webknossos login
Oct 10, 2024
b0bd899
Merge pull request #262 from lincbrain/ak-more-2
aaronkanzer Oct 10, 2024
dde7c39
Merge pull request #263 from lincbrain/master
aaronkanzer Oct 10, 2024
b009bb8
Even longer wait poll for webknossos
Oct 10, 2024
857fac7
Merge pull request #264 from lincbrain/ak-longer
aaronkanzer Oct 10, 2024
ade8fb0
Add 2 second delay until window is opened
Oct 10, 2024
f3240f8
Merge pull request #265 from lincbrain/ak-2-sec
aaronkanzer Oct 10, 2024
2d9830d
Use fetch instead of axios call for cookies
Oct 11, 2024
274bf60
remove unncessary import
Oct 11, 2024
d5a87ff
Merge pull request #266 from lincbrain/ak-try-fetch
aaronkanzer Oct 11, 2024
76a7253
Make nav bar only have one window.open call for WebKnossos
Oct 11, 2024
9f255e1
Merge pull request #267 from lincbrain/ak-href
aaronkanzer Oct 11, 2024
d3df52f
Resolve window.open for WebKNOSSOS in Nav Bar
Oct 11, 2024
63d3a04
Merge pull request #268 from lincbrain/ak-bind
aaronkanzer Oct 11, 2024
544ff6e
Make webknossos own button outside of nav bar elements for opening ne…
Oct 11, 2024
893056c
Merge pull request #270 from lincbrain/ak-remove-list
aaronkanzer Oct 11, 2024
9319754
neurosift external service for dandisets
magland Oct 14, 2024
2886a93
Apply suggestions from code review
magland Oct 14, 2024
58155cf
add staging=1 to ns service url when appropriate
magland Oct 14, 2024
ba89273
Update web/src/views/DandisetLandingView/ExternalDandisetServicesDial…
magland Oct 15, 2024
5199c2a
Merge pull request #272 from lincbrain/release
aaronkanzer Oct 16, 2024
1b1826c
Resolve logout button when webknossos is offline, fix GHA pg backup s…
Oct 16, 2024
8e9ea00
remove extra details from console error
Oct 16, 2024
65fd7fa
include update flag in AWS CLI step
Oct 16, 2024
682d7fc
fix broken indentation on tests
Oct 16, 2024
c2e80c1
clear rows before create dev dandiset test
Oct 16, 2024
6dda58c
reverT
Oct 16, 2024
0756029
Merge pull request #273 from lincbrain/ak-logout-wk
aaronkanzer Oct 16, 2024
bf6ec53
removed changelog entry
magland Oct 24, 2024
bcc4e12
open neurosift in separate tab
magland Oct 25, 2024
e61da30
Hoist type narrowing checks to top
waxlamp Oct 31, 2024
3ea8f70
Use metadata values directly
waxlamp Oct 31, 2024
b5e8f3b
Refactor to simplify the code
waxlamp Oct 31, 2024
ae0c487
Simplify staging URL handling
waxlamp Oct 31, 2024
c2a0131
Rename function
waxlamp Oct 31, 2024
f243cd1
Use a computed value instead of a raw function
waxlamp Oct 31, 2024
2872342
Fix typechecking error
waxlamp Oct 31, 2024
430c4fe
Retrieve identifier value directly from dandiset object
waxlamp Oct 31, 2024
7bb1654
Merge pull request #2041 from magland/neurosift-dandiset-external-ser…
waxlamp Oct 31, 2024
0d4f603
auto shipit - CHANGELOG.md etc
dandibot Oct 31, 2024
1161297
remove incorrrect linc-cli assumption
Nov 7, 2024
1713036
Update doc/design/linc_permissions.md
aaronkanzer Nov 7, 2024
f19fb99
Update doc/design/linc_permissions.md
aaronkanzer Nov 7, 2024
60a0ac9
Update doc/design/linc_permissions.md
aaronkanzer Nov 7, 2024
1493104
Update doc/design/linc_permissions.md
aaronkanzer Nov 7, 2024
a317f91
Catch 401/403 responses in more robust way
jjnesbitt Nov 11, 2024
328f248
Merge EmbargoedZarrArchive and ZarrArchive
jjnesbitt Aug 21, 2024
0c6a6b2
Update asset models, services and views
jjnesbitt Nov 4, 2024
508b9c9
Update zarr views
jjnesbitt Nov 4, 2024
ad0340e
Include zarrs in unembargo_dandiset
jjnesbitt Nov 4, 2024
4277b10
Add/update tests
jjnesbitt Nov 4, 2024
c6b0e67
Upgrade dandischema to 0.10.4
Nov 12, 2024
27ed965
update reference to lincbrain cli to dandi cli
Nov 12, 2024
cc15eb1
Update doc/design/linc_permissions.md
aaronkanzer Nov 13, 2024
cb7ef45
Update doc/design/linc_permissions.md
aaronkanzer Nov 13, 2024
389364b
Merge pull request #2073 from dandi/fix-embargoed-gui-message
jjnesbitt Nov 13, 2024
d8fe661
auto shipit - CHANGELOG.md etc
dandibot Nov 13, 2024
522a2cf
Merge pull request #111 from lincbrain/ak-presigned
kabilar Nov 13, 2024
8665adc
Merge pull request #2069 from dandi/zarrbargo
jjnesbitt Nov 13, 2024
21bf2a6
updates per Kabi's comments
Nov 18, 2024
f6fd4af
remove latest radio button
Nov 18, 2024
d847519
Merge pull request #276 from lincbrain/ak-upgrade-ds
aaronkanzer Nov 18, 2024
0716371
Updates to replace `lincbrain-cli` with `dandi`
kabilar Nov 18, 2024
6fdd696
Merge pull request #279 from kabilar/client
aaronkanzer Nov 19, 2024
4afd687
Add API endpoints for listing/clearing active uploads
jjnesbitt Nov 19, 2024
a509ab1
fix: use a dedicated logger. not top level logging.
yarikoptic Nov 20, 2024
0a4bf70
Merge pull request #2077 from dandi/enh-logging
yarikoptic Nov 20, 2024
e2f5237
Add dialog to manage uploads for embargoed dandisets
jjnesbitt Nov 20, 2024
7ee26c8
Include robots.txt in UI and API for handling of web crawlers (#2084)
aaronkanzer Nov 25, 2024
f1078bb
Paginate dandiset upload response
jjnesbitt Nov 26, 2024
f5311f1
Empty commit to trigger release
jjnesbitt Dec 2, 2024
334e601
Merge pull request #2086 from dandi/empty-pr-for-manual-release
jjnesbitt Dec 2, 2024
4558c5f
auto shipit - CHANGELOG.md etc
dandibot Dec 2, 2024
621a53c
Merge pull request #2082 from dandi/upload-lifecycle-management
jjnesbitt Dec 2, 2024
8e09a37
auto shipit - CHANGELOG.md etc
dandibot Dec 2, 2024
d603a3f
Include zarr asset sizes when validating version metadata
jjnesbitt Dec 4, 2024
1829fe6
Set `--max-warnings` to zero for `eslint`
mvandenburgh Dec 4, 2024
6129f57
Fix linting error
mvandenburgh Dec 4, 2024
c2a737c
Merge pull request #2062 from dandi/ak-validation
jjnesbitt Dec 4, 2024
31f6d32
auto shipit - CHANGELOG.md etc
dandibot Dec 4, 2024
dc454f4
Merge pull request #2088 from dandi/fix-lint-warnings-passing-ci
mvandenburgh Dec 4, 2024
cca35b5
Pin `django-allauth` to 0.61.1
mvandenburgh Dec 6, 2024
bff01c8
Merge pull request #2098 from dandi/test-staging-allauth-breakage
jjnesbitt Dec 9, 2024
b31a6c6
auto shipit - CHANGELOG.md etc
dandibot Dec 9, 2024
7f3dca5
Pin django-all-auth to mitigate GitHub sign-in flow error
Dec 9, 2024
0ff0b53
Merge pull request #282 from lincbrain/ak-django-auth
aaronkanzer Dec 9, 2024
f2ff924
Bump Django to 4.2
mvandenburgh Dec 9, 2024
89c04c7
Pin `django-allauth` to `>=65.3.0`
mvandenburgh Dec 9, 2024
ffeffa8
Bump `django-composed-configuration` to latest version
mvandenburgh Dec 9, 2024
fc50f67
Merge pull request #2099 from dandi/upgrade-allauth
mvandenburgh Dec 9, 2024
7953001
auto shipit - CHANGELOG.md etc
dandibot Dec 9, 2024
6bb7a7d
Merge upstream changes from DANDI Archive: audit, zarrbargo, auth bug
Dec 10, 2024
c2121f2
Replace DANDI Google Analytics tag with LINC tag
kabilar Dec 11, 2024
a60796e
Fix download url
kabilar Dec 11, 2024
b022bb2
Merge pull request #284 from kabilar/google-analytics
aaronkanzer Dec 12, 2024
5cb46ae
Update layer type
kabilar Dec 12, 2024
932f8ed
Merge branch 'master' into ak-django
aaronkanzer Dec 13, 2024
987295a
Merge pull request #283 from lincbrain/ak-django
aaronkanzer Dec 13, 2024
4bc92a2
Merge pull request #287 from lincbrain/master
aaronkanzer Dec 13, 2024
d5dc0ce
update migrations that contain explicit RunPython calls
Dec 13, 2024
adbd153
Merge pull request #288 from lincbrain/ak-migrations
aaronkanzer Dec 13, 2024
77ea38e
remove call that doesnt exist for emabrgoed blob in migrations
Dec 14, 2024
52b035c
Merge pull request #289 from lincbrain/ak-blob
aaronkanzer Dec 14, 2024
04b4a66
Merge pull request #290 from lincbrain/staging
aaronkanzer Dec 15, 2024
92353dd
Use correct import for OAuth client
Jan 2, 2025
dd2d930
Merge pull request #292 from lincbrain/ak-resontant
aaronkanzer Jan 2, 2025
c590a17
Merge pull request #286 from kabilar/neuroglancer-url
aaronkanzer Jan 2, 2025
097aaae
Merge branch 'master' into download-command
aaronkanzer Jan 2, 2025
a491b92
Merge pull request #285 from kabilar/download-command
aaronkanzer Jan 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
17 changes: 0 additions & 17 deletions .github/workflows/auto-add-issues.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/backend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
- master
paths-ignore:
- "web/**"
schedule:
- cron: "0 0 * * *"
# schedule:
# - cron: "0 0 * * *"
jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
tox-env: [lint, type, test, check-migrations]
tox-env: [test, check-migrations] # [lint, type, test, check-migrations]
services:
postgres:
image: postgres:latest
Expand Down
42 changes: 16 additions & 26 deletions .github/workflows/backend-production-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
name: Deploy backend to production

# This is a temporary workflow used by the LINC project that differs from the "release" strategy in the DANDI Archive ecosystem
#
# The reason for the difference is that the LINC project is still a work-in-progress, thus we want updates to be not tied to version updates

on:
release:
types: [released]
workflow_dispatch:
branches:
- release

concurrency:
# If this workflow is already running, cancel it to avoid a scenario
Expand All @@ -12,35 +17,20 @@ concurrency:
cancel-in-progress: true

jobs:
reset-release-branch:
name: Update release branch
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch history for all branches and tags
token: ${{ secrets.GH_TOKEN }} # use PAT with permissions to push to master
ref: release

- name: Perform reset
run: |
git reset --hard ${{ github.ref }}
git push --force origin release

production-deploy:
deploy:
name: Deploy to Heroku
runs-on: ubuntu-22.04
needs: reset-release-branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch history for all branches and tags
ref: release

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Check allowed users for deploying to production
run: |
if [[ ! "aaronkanzer kabilar" =~ "${{ github.actor }}" ]]; then
echo "Error: User ${{ github.actor }} is not allowed to deploy."
exit 1
fi

- name: Install Heroku CLI
run: curl https://cli-assets.heroku.com/install.sh | sh
Expand All @@ -54,7 +44,7 @@ jobs:
python -m build --sdist

- name: Create Heroku Build
run: heroku builds:create -a dandi-api --source-tar dist/*.tar.gz
run: heroku builds:create -a ${{ secrets.HEROKU_PRODUCTION_APP_NAME }} --source-tar dist/*.tar.gz
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
11 changes: 3 additions & 8 deletions .github/workflows/backend-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy backend to staging
on:
push:
branches:
- master
- staging
paths-ignore:
- "web/**"
- "CHANGELOG.md"
Expand All @@ -18,17 +18,12 @@ concurrency:
jobs:
deploy:
name: Deploy to Heroku
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch history for all branches and tags

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.11"

- name: Install Heroku CLI
run: curl https://cli-assets.heroku.com/install.sh | sh

Expand All @@ -41,7 +36,7 @@ jobs:
python -m build --sdist

- name: Create Heroku Build
run: heroku builds:create -a dandi-api-staging --source-tar dist/*.tar.gz
run: heroku builds:create -a linc-brain-staging --source-tar dist/*.tar.gz
env:
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
34 changes: 17 additions & 17 deletions .github/workflows/cli-integration.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test Integration with dandi-cli
name: Test Integration with lincbrain-cli

on:
push:
Expand All @@ -12,25 +12,21 @@ on:

jobs:
build-image:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Check out this repository
uses: actions/checkout@v4

- name: Build Docker image
run: |
docker login -u "$DOCKER_LOGIN" --password-stdin <<<"$DOCKER_TOKEN"
docker build \
-t dandiarchive/dandiarchive-api \
-t lincbrain/dandiarchive-api \
-f dev/django-public.Dockerfile \
.
env:
DOCKER_LOGIN: ${{ secrets.DOCKER_LOGIN }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}

- name: Export Docker image
run: |
docker image save -o dandiarchive-api.tgz dandiarchive/dandiarchive-api
docker image save -o dandiarchive-api.tgz lincbrain/dandiarchive-api

- name: Upload Docker image tarball
uses: actions/upload-artifact@v4
Expand All @@ -39,7 +35,7 @@ jobs:
path: dandiarchive-api.tgz

test:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
needs: build-image
strategy:
fail-fast: false
Expand Down Expand Up @@ -72,28 +68,32 @@ jobs:

- name: Install released dandi
if: matrix.dandi-version == 'release'
run: pip install "dandi[test]"
run: pip install "lincbrain-cli[test]"

- name: Install dev dandi
if: matrix.dandi-version == 'master'
run: pip install "lincbrain-cli[test] @ git+https://github.com/lincbrain/linc-cli"

- name: Install dev dandi
if: matrix.dandi-version == 'master'
run: pip install "dandi[test] @ git+https://github.com/dandi/dandi-cli"
run: pip install "lincbrain-cli[test] @ git+https://github.com/lincbrain/linc-cli"

- name: Run dandi-api tests in dandi-cli
- name: Run dandi-api tests in linc-cli
run: |
python -m pytest --dandi-api \
"$pythonLocation/lib/python${{ matrix.python }}/site-packages/dandi"
"$pythonLocation/lib/python${{ matrix.python }}/site-packages/lincbrain"
env:
DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"

- name: Dump Docker Compose logs
if: failure()
run: |
docker compose \
-f "$pythonLocation/lib/python${{ matrix.python }}/site-packages/dandi/tests/data/dandiarchive-docker/docker-compose.yml" \
docker-compose \
-f "$pythonLocation/lib/python${{ matrix.python }}/site-packages/lincbrain/tests/data/dandiarchive-docker/docker-compose.yml" \
logs --timestamps

- name: Shut down Docker Compose
run: |
docker compose \
-f "$pythonLocation/lib/python${{ matrix.python }}/site-packages/dandi/tests/data/dandiarchive-docker/docker-compose.yml" \
docker-compose \
-f "$pythonLocation/lib/python${{ matrix.python }}/site-packages/lincbrain/tests/data/dandiarchive-docker/docker-compose.yml" \
down -v
Loading
Loading