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

Release 1.8.0 #344

Merged
merged 328 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
328 commits
Select commit Hold shift + click to select a range
157c14a
update unit tests
odespard Aug 2, 2024
8c61993
change feature for AutomaticMS1Optimizer
odespard Aug 2, 2024
7240857
fixed unit test
odespard Aug 2, 2024
84899f8
change e2e test for automatic calibration
odespard Aug 5, 2024
a5d01f2
adjust min_steps and optimization_lock_min_steps in default.yaml
odespard Aug 5, 2024
4f9b094
formatting
odespard Aug 5, 2024
bd55b6c
update unit test
odespard Aug 5, 2024
fe5e0ea
fits lock only
odespard Aug 6, 2024
b5ea3bb
modify_e2e_test_for_automatic_calibration
odespard Aug 7, 2024
a8e196a
#296: make saving of libraries optional
mschwoer Aug 7, 2024
d84f757
#296: set tqdm log minimum to 5 seconds
mschwoer Aug 7, 2024
bd6485e
#296: add debugging instructions
mschwoer Aug 7, 2024
5f0c3c8
#296: fix bug when error occurs before reporter is instantiated
mschwoer Aug 7, 2024
98a4b48
#296: fix bug when two levels of parent path do not exist
mschwoer Aug 7, 2024
430b772
#296: declare variables in __init__
mschwoer Aug 7, 2024
17acc73
#296: remove tqdm settings from code, set in e2e test
mschwoer Aug 7, 2024
7fffdb7
#296: mov config keys to correct place
mschwoer Aug 7, 2024
03fc914
#296: allow to skip neptune upload
mschwoer Aug 7, 2024
e4d9a14
refactor optimization lock
odespard Aug 7, 2024
3e6e811
#296: tweak install instructions
mschwoer Aug 7, 2024
37ef065
Merge pull request #293 from MannLabs/add_automatic_calibration
odespard Aug 7, 2024
26cb82e
fix test case data
mschwoer Aug 8, 2024
6231211
#299: add slurm e2e script
mschwoer Aug 8, 2024
de0fd84
refactor fragment index adjustment
odespard Aug 12, 2024
cec8163
add parameters to stat.tsv and refactor optimization manager
odespard Aug 13, 2024
5449f1f
modify workflow unit tests
odespard Aug 13, 2024
e78252e
update workflow unit test
odespard Aug 13, 2024
da2d9cf
Merge branch 'add_parameters_to_stat_file' into refactor_batch_df
odespard Aug 13, 2024
4d2a974
extend transfer-learning to include mobility
mo-sameh Aug 13, 2024
70b27d0
renamed_config_in_test
odespard Aug 13, 2024
a1a4160
update outputtransform test
odespard Aug 13, 2024
d359876
Merge pull request #302 from MannLabs/add_parameters_to_stat_file
odespard Aug 13, 2024
0bfb56f
#299: review comments
mschwoer Aug 14, 2024
c03c68a
#299: add code review action
mschwoer Aug 14, 2024
10fc44e
Merge pull request #294 from MannLabs/fix-slurm-install-instructions
mschwoer Aug 14, 2024
6fe674a
#299: fix action versions
mschwoer Aug 14, 2024
4c0f576
#299: add link to script to Readme.
mschwoer Aug 14, 2024
d32fa79
Merge branch 'development' into 296-reduce-alphadia-output
mschwoer Aug 14, 2024
e7f4aca
Merge pull request #298 from MannLabs/fix-test-case-data
mschwoer Aug 14, 2024
1f1e768
#296: limit code review action
mschwoer Aug 14, 2024
26fbe4f
Merge remote-tracking branch 'origin/296-reduce-alphadia-output' into…
mschwoer Aug 14, 2024
720d3da
#296: move debug instructions to docs
mschwoer Aug 14, 2024
eeb3d60
#296: simplify calc_metrics script
mschwoer Aug 14, 2024
577cfd8
Merge pull request #300 from MannLabs/299-enable-running-e2e-tests-on…
mschwoer Aug 14, 2024
6f52f55
#296: allow code review action to fail
mschwoer Aug 14, 2024
011c84d
Merge pull request #297 from MannLabs/296-reduce-alphadia-output
mschwoer Aug 14, 2024
231ebd9
add timing manager and unit test
odespard Aug 14, 2024
fc1182c
remove erroneous call to test
odespard Aug 14, 2024
29c1c99
handling for absent managers
odespard Aug 14, 2024
c26e409
Merge branch 'timing_manager' into refactor_batch_df
odespard Aug 14, 2024
b26c9c8
fix #305 segfault
GeorgWa Aug 15, 2024
f66ac5c
Merge branch 'development' into timstof-transpose
GeorgWa Aug 15, 2024
d3425ea
Merge pull request #307 from MannLabs/timstof-transpose
GeorgWa Aug 15, 2024
a5f67bf
debugging information and path changed in outputtransform
odespard Aug 15, 2024
38f747d
batch_df to batch_precursor_df
odespard Aug 15, 2024
93ba1aa
Merge pull request #301 from MannLabs/refactor_batch_df
odespard Aug 15, 2024
7df531b
Merge pull request #303 from MannLabs/add-mobility-to-transfer-learning
GeorgWa Aug 15, 2024
ca2aafc
introduced OptimizationLock class
odespard Aug 16, 2024
2f840a6
adjusted update rules
odespard Aug 16, 2024
aa40d6b
update unit test
odespard Aug 16, 2024
d6b7e2b
improved logging and removed optimization_lock_min_steps
odespard Aug 16, 2024
7fefb25
fix test functions
mo-sameh Aug 16, 2024
07577cf
fixed feature tracking in optimizer
odespard Aug 16, 2024
1a799ca
max lr bugfix
GeorgWa Aug 19, 2024
fd8e675
remove local settings use
GeorgWa Aug 19, 2024
de8441c
enable selection of alternative peptdeep models
GeorgWa Aug 19, 2024
5dd2c4c
code review and unit test
odespard Aug 19, 2024
b6cf736
implement fixes
GeorgWa Aug 19, 2024
3120b2c
Merge pull request #292 from MannLabs/multiplex-library
GeorgWa Aug 19, 2024
56f4ee3
fix missing column multiplexing
GeorgWa Aug 19, 2024
b7fbf48
update managers
odespard Aug 20, 2024
16aa10f
fix unit test
odespard Aug 20, 2024
bf03296
permit rt proportion
odespard Aug 20, 2024
e488eda
take proportion of gradient length if initial value < 1
odespard Aug 20, 2024
6899d03
refactor train.py
mo-sameh Aug 20, 2024
109c000
only calibrate relevant subset
odespard Aug 20, 2024
e76f9a3
fix finetune manager initialization
mo-sameh Aug 20, 2024
842e2b8
format
mo-sameh Aug 20, 2024
302d2dd
remove unit test call
odespard Aug 20, 2024
2c4d85d
fix unit test
odespard Aug 20, 2024
f3fbecf
Merge branch 'new_dynamic_lock_rt_proportion' into new_dynamic_lock_w…
odespard Aug 20, 2024
d267313
Merge branch 'new_dynamic_lock_with_subset_calibrated' of github.com:…
odespard Aug 20, 2024
49d9a01
formatting
odespard Aug 20, 2024
c6b6a0a
bug fix
odespard Aug 20, 2024
190de04
Merge pull request #314 from MannLabs/multiplex-bug
GeorgWa Aug 20, 2024
cfd91cc
fix unit test
odespard Aug 20, 2024
5a090c6
fix typographical error
odespard Aug 20, 2024
8cf8e25
reverse change to update rule
odespard Aug 21, 2024
ebde211
fix unit test
odespard Aug 21, 2024
7a580db
review comments
odespard Aug 21, 2024
1483a79
remove additional changes to config
odespard Aug 21, 2024
0a70756
add unit test and improve optimization manager init
odespard Aug 21, 2024
4f4379d
fix unit test
odespard Aug 21, 2024
801de9d
fix unit test
odespard Aug 21, 2024
798a161
Merge pull request #316 from MannLabs/new_dynamic_lock_rt_proportion
odespard Aug 21, 2024
dad6ed5
Merge pull request #311 from MannLabs/max-lr-bug
GeorgWa Aug 21, 2024
88afa50
merge rt proportion
odespard Aug 21, 2024
953333d
review comments
odespard Aug 21, 2024
a931b1c
use alphabase functions
odespard Aug 21, 2024
696e5bf
only save timing manager after all timings are complete
odespard Aug 21, 2024
c8db225
review comments
odespard Aug 21, 2024
0275130
merge new_dynamic_optimization_lock
odespard Aug 21, 2024
c853ac2
make update rule and order of optimization configurable
odespard Aug 21, 2024
d086de3
rewrite and unit test
odespard Aug 21, 2024
1f93052
change defaults to normal targeted values
odespard Aug 21, 2024
175655f
fix unit test
odespard Aug 21, 2024
5dc9ac9
Merge pull request #309 from MannLabs/new_dynamic_optimization_lock
odespard Aug 21, 2024
a44711f
bug fix
odespard Aug 22, 2024
df410eb
update YAML with comments
odespard Aug 22, 2024
74ef6e4
fixes
GeorgWa Aug 22, 2024
9ac0bc0
Merge pull request #312 from MannLabs/alternative-peptdeep
GeorgWa Aug 22, 2024
7a63adc
use elution groups
odespard Aug 22, 2024
f5c105d
fix unit test
odespard Aug 22, 2024
b53173e
Merge pull request #317 from MannLabs/new_dynamic_lock_with_subset_ca…
odespard Aug 22, 2024
978731a
separate target and automatic update configuration
odespard Aug 22, 2024
cbda5f8
move parameter proposal to base class
odespard Aug 22, 2024
b99ce6b
Merge branch 'development' into make_configurable
odespard Aug 22, 2024
56e459d
formatting
odespard Aug 22, 2024
c1df81a
change convergence so RT can decrease beyond max
odespard Aug 22, 2024
90b2f1f
bug fix
odespard Aug 22, 2024
6f68c9f
take minimum not most recent
odespard Aug 22, 2024
631a985
merge development
odespard Aug 22, 2024
9cea574
merge development
odespard Aug 22, 2024
843436a
make rt convergence criteria configurable
odespard Aug 22, 2024
a330dec
Merge branch 'refactor_parameter_proposal' into new_rt_convergence_cr…
odespard Aug 22, 2024
944006f
Merge branch 'make_configurable' into refactor_parameter_proposal
odespard Aug 22, 2024
dad3490
reformat and remove duplicated test from merge
odespard Aug 22, 2024
25c9446
Merge branch 'refactor_parameter_proposal' into new_rt_convergence_cr…
odespard Aug 22, 2024
70635fc
fix unit test
odespard Aug 22, 2024
09149db
update YAML comments
odespard Aug 23, 2024
2098ba4
Merge pull request #318 from MannLabs/make_configurable
odespard Aug 23, 2024
f63de4f
rename update_interval to update_percentile_range
odespard Aug 23, 2024
3214bfa
Merge pull request #319 from MannLabs/refactor_parameter_proposal
odespard Aug 23, 2024
0d6eb01
improve timing manager to cope with failed searches and update unit t…
odespard Aug 23, 2024
3443eef
review comments
odespard Aug 23, 2024
f23e57a
Merge pull request #321 from MannLabs/fix_timing_manager
odespard Aug 23, 2024
a9958d0
make convergence configurable for all parameters
odespard Aug 23, 2024
de30f89
merge review comments from new_rt_convergence_criteria
odespard Aug 23, 2024
9496cf8
fix typographical error
odespard Aug 23, 2024
01aec2f
fix unit test and only assign relevant attributes
odespard Aug 23, 2024
bf6ccd4
merge development
odespard Aug 23, 2024
f416679
Merge branch 'development' into new_rt_convergence_criteria
odespard Aug 23, 2024
0a9c141
Merge branch 'new_rt_convergence_criteria' into make_convergence_conf…
odespard Aug 23, 2024
f5ae652
formatting
odespard Aug 23, 2024
949b276
make fragment calibration configurable
odespard Aug 23, 2024
96a1aeb
refactor search parameter optimization
odespard Aug 26, 2024
604409b
review comments
odespard Aug 26, 2024
57db61f
review comments
odespard Aug 26, 2024
13c2058
add TODO
odespard Aug 26, 2024
470dac7
Merge pull request #322 from MannLabs/make_convergence_configurable
odespard Aug 26, 2024
ca14460
Merge pull request #323 from MannLabs/configure_ms2_fragment_number
odespard Aug 26, 2024
cb12f81
Merge pull request #320 from MannLabs/new_rt_convergence_criteria
odespard Aug 26, 2024
bb1534a
updated documentation
odespard Aug 27, 2024
43bf799
take index of optimum, not maximum
odespard Aug 27, 2024
6109809
Merge pull request #325 from MannLabs/fix_optimizer_plotting
odespard Aug 27, 2024
6ca1a0f
add new pypi workflow
mschwoer Aug 27, 2024
9169189
add new release workflow
mschwoer Aug 27, 2024
c51761c
remove unused build_zip_macos.sh
mschwoer Aug 27, 2024
9301363
update Readme instructions
mschwoer Aug 27, 2024
53a616b
add previously deleted file
mschwoer Aug 27, 2024
d5e6b47
add bumpversion to ruff exclusions
mschwoer Aug 27, 2024
b93d27e
fix error where config field was used in the wrong place
odespard Aug 28, 2024
763a7b0
update default.yaml for consistency
odespard Aug 28, 2024
1567b3f
less permissions for new release workflow
mschwoer Aug 28, 2024
e566529
adapt permissions for new release workflow
mschwoer Aug 28, 2024
a5f74dc
remove permissions for new release workflow
mschwoer Aug 28, 2024
65b7e7c
reduce permissions for new release workflow
mschwoer Aug 28, 2024
584b76c
review comments
odespard Aug 28, 2024
9e8829b
fix import
odespard Aug 28, 2024
9ffdc3d
fix import
odespard Aug 28, 2024
7f7d243
Merge pull request #324 from MannLabs/refactor_search_parameter_optim…
odespard Aug 28, 2024
cb3e42c
allow definition of target RT as fraction
odespard Aug 28, 2024
60d336c
improve documentation of contract
odespard Aug 28, 2024
00d843d
take the least batch index from optimization to start the next round
odespard Aug 28, 2024
c33be42
use optimum not minimum
odespard Aug 28, 2024
5e9130c
fix unit test
odespard Aug 28, 2024
2f21b0c
update docstring
odespard Aug 29, 2024
d144c9b
update optimizers to allow skipping
odespard Aug 29, 2024
76bcc84
Merge branch 'development' of github.com:MannLabs/alphadia into addit…
odespard Aug 29, 2024
2f8403b
Merge pull request #328 from MannLabs/define_rt_target_as_fraction
odespard Aug 29, 2024
4fb4b08
consider automatic optimizers to have converged if they are skipped s…
odespard Aug 29, 2024
1f93faf
Merge branch 'development' into backtrack_batch_id
odespard Aug 29, 2024
7cb6b64
review comments
odespard Aug 29, 2024
fd08419
use property and use strict inequality
odespard Aug 29, 2024
e3a0721
Merge branch 'backtrack_batch_id' into additional_convergence_criterion
odespard Aug 29, 2024
1ebfdea
improve logging
odespard Aug 29, 2024
0f938f5
Merge pull request #327 from MannLabs/fix_incorrect_config
odespard Aug 29, 2024
e75f5b2
Merge pull request #329 from MannLabs/backtrack_batch_id
odespard Aug 29, 2024
94e71ad
Merge branch 'development' into refactor_convergence_rules
odespard Aug 29, 2024
63421b5
refactoring
odespard Aug 29, 2024
8f3c6d3
update unit test
odespard Aug 29, 2024
8c4d3c8
split favour_narrower_parameter effects in two
odespard Aug 29, 2024
a1538a5
Merge branch 'development' into additional_convergence_criterion
odespard Aug 29, 2024
5aee959
Merge branch 'additional_convergence_criterion' into refactor_converg…
odespard Aug 29, 2024
693617f
fix unit test
odespard Aug 29, 2024
c9fda5a
review comments and reset after convergence
odespard Aug 29, 2024
b344346
proceed if insufficient precursors for optimization
odespard Aug 29, 2024
33b07ce
perform calibration if more than 6 precursors
odespard Aug 30, 2024
6e9b5c2
Merge pull request #330 from MannLabs/additional_convergence_criterion
odespard Aug 30, 2024
009144f
add simulation notebook
odespard Aug 30, 2024
3201478
review comments
odespard Aug 30, 2024
885d8d3
Merge branch 'development' into refactor_convergence_rules
odespard Aug 30, 2024
a501226
review comments
odespard Aug 30, 2024
1332c70
Merge pull request #331 from MannLabs/refactor_convergence_rules
odespard Aug 30, 2024
4bbc022
make automatic default
odespard Aug 30, 2024
45eb17b
use try_narrower_parameters for ms2 by default with maximal_decrease=0.5
odespard Aug 30, 2024
e90126b
change config attributes to private
mo-sameh Aug 31, 2024
de3ae18
feat: save stats of transfer learning to disk
mo-sameh Sep 1, 2024
f775179
fix: incorrect rt and mobility columns
mo-sameh Sep 1, 2024
3827452
fix installers
mschwoer Sep 2, 2024
3e5b0b9
fix installers
mschwoer Sep 2, 2024
4272ae6
get rid of most pip installs in installer building
mschwoer Sep 4, 2024
fb653fc
adapt to new release workflow
mschwoer Sep 6, 2024
5735bf2
Merge pull request #336 from MannLabs/make_automatic_default_for_rt_a…
GeorgWa Sep 9, 2024
0a0db59
Merge pull request #334 from MannLabs/update_optimization_documentation
GeorgWa Sep 9, 2024
300f4cc
Merge pull request #333 from MannLabs/proceed_if_insufficient_precursors
GeorgWa Sep 9, 2024
8a62937
Merge pull request #338 from MannLabs/save-transferlearning-stats
GeorgWa Sep 9, 2024
3d55bd1
add linux installer
mschwoer Sep 10, 2024
5b4c4b6
add gui to linux package
mschwoer Sep 10, 2024
06bf4f2
fix linux installer
mschwoer Sep 10, 2024
a99e650
rename alphaDIA -> alphadia
mschwoer Sep 10, 2024
9aed286
rename alphaDIA -> alphadia
mschwoer Sep 10, 2024
ce1d0f1
rename bundle_name AlphaDIA -> alphadia
mschwoer Sep 10, 2024
224bf07
fix linux installer building
mschwoer Sep 10, 2024
b3d8197
limit linux installer building to cpu
mschwoer Sep 10, 2024
0a02848
adapt bumpversion
mschwoer Sep 10, 2024
a8597e4
test: add noise to test data.
mo-sameh Sep 10, 2024
2ac12c7
trying to fix linux GUI
mschwoer Sep 11, 2024
1829373
trying to fix linux GUI
mschwoer Sep 11, 2024
704a27d
trying to fix linux GUI
mschwoer Sep 11, 2024
67daff6
trying to fix linux GUI
mschwoer Sep 11, 2024
3867112
Merge pull request #337 from MannLabs/fix-incorrect-mobility-outputac…
GeorgWa Sep 11, 2024
8473998
trying to fix linux GUI
mschwoer Sep 11, 2024
703aba0
trying to fix linux GUI
mschwoer Sep 11, 2024
5a6a45f
make windows script bash scripts
mschwoer Sep 11, 2024
631104c
Merge branch 'development' into test-interval-bug-fix
mo-sameh Sep 11, 2024
5fa8871
Merge pull request #310 from MannLabs/test-interval-bug-fix
mo-sameh Sep 11, 2024
e1056f2
remove windows bash scripts
mschwoer Sep 11, 2024
a728094
revert some old changes
mschwoer Sep 11, 2024
5f92b78
fix linux installer
mschwoer Sep 11, 2024
efe62f9
update bumpversion.cfg
mschwoer Sep 11, 2024
3999fa4
update bumpversion.cfg
mschwoer Sep 11, 2024
c9cf591
add missing file
mschwoer Sep 11, 2024
90912b9
Bump version: 1.7.2 → 1.8.0
mschwoer Sep 11, 2024
de49b33
Merge pull request #326 from MannLabs/adapt-to-new-release-workflow
GeorgWa Sep 11, 2024
e4c6a33
Merge pull request #342 from MannLabs/bump_to_1.8.0
GeorgWa Sep 11, 2024
3e0b742
Update GUI for release
GeorgWa Sep 10, 2024
e934654
fix #234
GeorgWa Sep 10, 2024
25dfebb
fix bug
GeorgWa Sep 10, 2024
c2873da
Merge pull request #343 from MannLabs/gui-fix
GeorgWa Sep 11, 2024
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
15 changes: 13 additions & 2 deletions .github/workflows/branch-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ jobs:
name: Run all pre-commit hooks
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: pre-commit/action@v3.0.1

# For feature branches, we don't test the full matrix (os x [stable, loose]) in order to save time & resources.
run-tests-stable:
name: Test stable pip installation on ubuntu-latest
Expand All @@ -25,3 +26,13 @@ jobs:
os: ${{ matrix.os }}
install-script: ./pip_install.sh stable,test
test-script: ./run_unit_tests.sh

get-code-review-input:
runs-on: ubuntu-latest
steps:
- uses: MannLabs/alphashared/actions/get-code-review-input@v1
continue-on-error: true
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_NUMBER: ${{ github.event.number }}
EXCLUDED_EXTENSIONS: ipynb;js
212 changes: 17 additions & 195 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
@@ -1,200 +1,22 @@
# Create a draft release and build and upload all installers to it.
name: Create Release

on:
workflow_dispatch:
inputs:
commit_to_release:
description: 'Enter commit hash to release (example: ef4037cb571f99cb4919b520fde7174972aae473)'
required: true
tag_to_release:
description: 'Enter tag to release (example: v1.5.5)'
required: true


name: Create Draft Release
commitish_to_release:
type: string
description: 'Enter commit hash or branch to release (default: main).'
default: "main"

jobs:
Get_New_Version:
runs-on: ubuntu-latest
outputs:
new_version: ${{ steps.check_release_tag.outputs.new_version }}
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.commit_to_release }}

- name: Check release tag
id: check_release_tag
shell: bash -le {0}
run: |
CURRENT_VERSION=$(./misc/get_current_version.sh)
if [ "v${CURRENT_VERSION}" != "${{ inputs.tag_to_release }}" ]; then
echo Code version "v${CURRENT_VERSION}" does not match the tag to release ${{ inputs.tag_to_release }}
exit 1
fi
echo "new_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT

- uses: mukunku/tag-exists-action@v1.6.0
id: check-tag
with:
tag: ${{ inputs.tag_to_release }}

- name: Check if tag already exists
run: |
echo "Tag already exists!"
exit 1
if: steps.check-tag.outputs.exists == 'true'


Create_Draft_Release:
runs-on: ubuntu-latest
needs: Get_New_Version
outputs:
upload_url: ${{ steps.draft_release.outputs.upload_url }}
steps:
- name: Draft Release
id: draft_release
# TODO this action is deprecated, replace with https://github.com/ncipollo/release-action
# cf. https://github.com/actions/create-release/issues/119#issuecomment-783010321
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ inputs.tag_to_release }}
release_name: ${{ inputs.tag_to_release }}
draft: true
prerelease: false

Create_MacOS_Installer:
needs: [Create_Draft_Release, Get_New_Version]
env:
ARCH: x64
EAGER_IMPORT: true
runs-on: macos-latest-xlarge
steps:
- name : Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.commit_to_release }}

# Build backend
- name: Install conda
uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
auto-update-conda: true
activate-environment: alpha
python-version: "3.11"

- name: Check arm64
shell: bash -el {0}
run: |
python -c "import platform; print(platform.machine())"

- name: Build backend
shell: bash -el {0}
run: |
release/macos/build_backend_macos.sh

- name: Test backend
shell: bash -el {0}
run: |
dist/alphadia/alphadia --version

# Build GUI
- name: Setup Node.js
uses: actions/setup-node@v4

- name: Build GUI
run: |
release/macos/build_gui_macos.sh

# combine backend and GUI
- name: Build package
shell: bash -el {0}
run: |
release/macos/build_pkg_macos.sh

- name: List output files
run: |
ls dist

# Upload the package
- name: Upload a Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.Create_Draft_Release.outputs.upload_url }}
asset_path: dist/alphadia-${{ needs.Get_New_Version.outputs.new_version }}-darwin-${{ env.ARCH }}.pkg
asset_name: alphadia-${{ needs.Get_New_Version.outputs.new_version }}-darwin-${{ env.ARCH }}.pkg
asset_content_type: application/zip

Create_Windows_Installer:
needs: [Create_Draft_Release, Get_New_Version]
env:
ARCH: x64
runs-on: windows-latest
steps:
- name : Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.commit_to_release }}

# Build backend
- name: Install conda
uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
auto-update-conda: true
activate-environment: alpha
python-version: "3.11"

- name: Build Backend
shell: powershell
run: |
release/windows/build_backend.ps1

- name: Test Backend
shell: powershell
run: |
dist\alphadia\alphadia.exe --version

# Build GUI
- name: Setup Node.js
uses: actions/setup-node@v4

- name: Build GUI
shell: powershell
run: |
release/windows/build_gui.ps1

# combine backend and GUI
- name: Check if Innosetup is installed
shell: powershell
run: |
if (-not (Test-Path "C:\Program Files (x86)\Inno Setup 6\ISCC.exe")) {
Write-Host "Inno Setup is not installed"
exit 1
}
else {
Write-Host "Inno Setup is installed"
}

- name: Build Installer
shell: powershell
run: |
release/windows/build_installer.ps1

- name: List output files
run: |
ls dist

- name: Upload a Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.Create_Draft_Release.outputs.upload_url }}
asset_path: dist/alphadia-${{ needs.Get_New_Version.outputs.new_version }}-win-${{ env.ARCH }}.exe
asset_name: alphadia-${{ needs.Get_New_Version.outputs.new_version }}-win-${{ env.ARCH }}.exe
asset_content_type: application/zip
create-release:
uses: MannLabs/alphashared/.github/workflows/create_release.yml@v1
secrets: inherit
permissions:
contents: write
with:
package_name: alphadia
commitish_to_release: ${{ inputs.commitish_to_release }}
build_nodejs_ui: true
test_app: false
5 changes: 3 additions & 2 deletions .github/workflows/e2e_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
# test case name as defined in e2e_test_cases.yaml
test_case: [ "basic", "synchropasef", "astral", ]
test_case: [ "basic", "synchropasef", "astral", "astral_automatic_calibration", ]
env:
RUN_NAME: alphadia-${{github.sha}}-${{github.run_id}}-${{github.run_attempt}}
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
Expand All @@ -24,6 +24,7 @@ jobs:
NUMBA_BOUNDSCHECK: 1
NUMBA_DEVELOPER_MODE: 1
NUMBA_FULL_TRACEBACKS: 1
TQDM_MININTERVAL: 10 # avoid lots of tqdm outputs
steps:
- uses: actions/checkout@v4
- name: Conda info
Expand All @@ -39,7 +40,7 @@ jobs:
shell: bash -el {0}
run: |
cd tests
. ./run_e2e_tests.sh ${{ matrix.test_case }} $RUN_NAME ${GITHUB_SHA::7} $BRANCH_NAME
. ./run_e2e_tests.sh ${{ matrix.test_case }} $RUN_NAME True ${GITHUB_SHA::7} $BRANCH_NAME
- name: Cleanup
if: always()
shell: bash -el {0}
Expand Down
Loading
Loading