Code

Alphapeptdeep Integration#3123

Code

Open

xgwang-uw wants to merge 99 commits intomasterProteoWizard/pwiz:masterfrom Skyline/work/20240816_pythoninstaller_with_virtual_env_supportProteoWizard/pwiz:Skyline/work/20240816_pythoninstaller_with_virtual_env_supportCopy head branch name to clipboard

+11,175-2,445

Commits

Commits on Aug 26, 2024

• Rename PythonInstaller to PythonInstallerLegacyDlg

  xgwang-uw

  committed
  c4e7c59

  Copy full SHA for c4e7c59

• Add PythonInstaller that supports virtual environment

  xgwang-uw

  committed
  dc612f9

  Copy full SHA for dc612f9

• Update to add OneOf dependency with PackageReference

  xgwang-uw

  committed
  d77d35e

  Copy full SHA for d77d35e

• Add RuntimeIdentifier win to Skyline.csproj to fix nuget restore error

  xgwang-uw

  committed
  9d6cab0

  Copy full SHA for 9d6cab0

• Fix scaling issue and enable locatable for PythonInstallerDlg form

  xgwang-uw

  committed
  888627c

  Copy full SHA for 888627c

• Fix AutoScaleDimensions value in PythonInstallerDlg.resx

  xgwang-uw

  committed
  d06c394

  Copy full SHA for d06c394

• Add more verbose logging if "CheckForMissingResources" fails.

  

  Nicholas Shulman

  authored and

  xgwang-uw

  committed
  3b12574

  Copy full SHA for 3b12574

• Fix CodeInspection test by moving PythonInstaller strings from ToolsUIResources into ToolsResources

  

  Nicholas Shulman

  authored and

  xgwang-uw

  committed
  1e5eb21

  Copy full SHA for 1e5eb21

• Added OneOf.dll to Product-template.wxs

  

  chambm

  authored and

  xgwang-uw

  committed
  f2d97e9

  Copy full SHA for f2d97e9

• Fix PythonInstallerTest by consuming strings from ToolsResources

  xgwang-uw

  committed
  7812cb5

  Copy full SHA for 7812cb5

• Setup python virtual environment and implement building library with alphapeptdeep

  xgwang-uw

  committed
  5c487ab

  Copy full SHA for 5c487ab

Commits on Aug 27, 2024

• Remove unused exception vars

  xgwang-uw

  committed
  eade5f9

  Copy full SHA for eade5f9

• Revert "Setup python virtual environment and implement building library with alphapeptdeep"

  Show description for e0a85e1
  xgwang-uw

  committed
  e0a85e1

  Copy full SHA for e0a85e1

Commits on Aug 28, 2024

• Setup python virtual environment and add empty AlphapeptdeepLibraryBuilder class

  xgwang-uw

  committed
  15930d7

  Copy full SHA for 15930d7

• Add top level logic for BuildLibrary in AlphapeptdeepLibrarybuilder

  xgwang-uw

  committed
  dab7240

  Copy full SHA for dab7240

Commits on Sep 3, 2024

• AlphapeptdeepLibraryBuilder - prepare input file for alphapeptdeep from skyline document

  xgwang-uw

  committed
  494b457

  Copy full SHA for 494b457

Commits on Sep 4, 2024

• AlphapeptdeepLibraryBuilder - prepare settings.yaml file and execute alphapeptdeep cli to build library

  xgwang-uw

  committed
  622c47a

  Copy full SHA for 622c47a

Commits on Sep 5, 2024

• AlphapeptdeepLibraryBuilder - transform alphapeptdeep output spectral library file to be skyline compatible

  xgwang-uw

  committed
  668f811

  Copy full SHA for 668f811

• AlphapeptdeepLibraryBuilder - build transformed alphapeptdeep output to .blib and import into skyline

  xgwang-uw

  committed
  2043f45

  Copy full SHA for 2043f45

Commits on Sep 9, 2024

• Setup python and java environments for Carafe

  xgwang-uw

  committed
  88f3295

  Copy full SHA for 88f3295

Commits on Sep 10, 2024

• Update carafe UI to match existing functionalities

  xgwang-uw

  committed
  1aec5af

  Copy full SHA for 1aec5af

Commits on Sep 12, 2024

• Implement CarafeLibraryBuilder to make carafe work end to end in Skyline

  xgwang-uw

  committed
  9a5b1d4

  Copy full SHA for 9a5b1d4

Commits on Dec 4, 2024

• Merge branch 'master' into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  

  David Shteynberg

  authored and

  David Shteynberg

  committed
  07863b8

  Copy full SHA for 07863b8

Commits on Dec 5, 2024

• Changed filename from DocumentHash to base64 string encoding to avoid

  Show description for 9a7f641
  

  David Shteynberg

  authored and

  David Shteynberg

  committed
  9a7f641

  Copy full SHA for 9a7f641

• Switch to a FolderBrowserDialog since user selects the Library Filename and a

  Show description for 89e9cc8
  

  David Shteynberg

  committed
  89e9cc8

  Copy full SHA for 89e9cc8

• Adjust warning for skipped peptides, don't show modification name since it is unknown/blank

  

  David Shteynberg

  committed
  00e0d4b

  Copy full SHA for 00e0d4b

Commits on Dec 6, 2024

• (1) Backout FolderBrowserDialog and place back SaveFileDialog (2) When the user selects a file using Browse and then gives the library a name, honor the user's chosen save file name and don't rewri…

  Show description for b16dadc
  

  David Shteynberg

  committed
  b16dadc

  Copy full SHA for b16dadc

• Alphapeptdeep integration test to verify no duplicate accessions exist in the list of modifications

  

  David Shteynberg

  committed
  039fd70

  Copy full SHA for 039fd70

• AlphaPeptDeep potential Warnings with modifications, these are localizable.

  

  David Shteynberg

  committed
  53dd101

  Copy full SHA for 53dd101

• AlphaPeptDeep interface corrections

  

  David Shteynberg

  committed
  23f3ff1

  Copy full SHA for 23f3ff1

• Updated resx with localizable strings

  

  David Shteynberg

  committed
  2682501

  Copy full SHA for 2682501

• Adding a new function to combine the Unimod accession (aka ID) with amino acids that it applies to, because UnimodId alone is not unique in the UniModData class

  

  David Shteynberg

  committed
  72176c6

  Copy full SHA for 72176c6

• Test to verify unique accessions in the unimod modification list used by AlphapeptdeepLibraryBuilder

  

  David Shteynberg

  committed
  e04ce1a

  Copy full SHA for e04ce1a

• Clarify message

  

  David Shteynberg

  committed
  eeb6b82

  Copy full SHA for eeb6b82

• Clarify message

  

  David Shteynberg

  committed
  d3764ec

  Copy full SHA for d3764ec

Commits on Dec 7, 2024

• Address PR comment on extraneous code

  

  David Shteynberg

  committed
  6b438ea

  Copy full SHA for 6b438ea

• Implement AlphaPeptDeepLibraryBuilder ability to read all Unimod modifications defined by UniModData class

  

  David Shteynberg

  committed
  845978d

  Copy full SHA for 845978d

• Address PR comment on extraneous code

  

  David Shteynberg

  committed
  cb312c6

  Copy full SHA for cb312c6

• Localizable strings for Python installation message for AlphaPeptDeep

  dshteyn

  committed
  d39f34f

  Copy full SHA for d39f34f

• Switch to MultiButtonMsgDlg to alert need to install python.

  dshteyn

  committed
  c88d824

  Copy full SHA for c88d824

Commits on Dec 10, 2024

• Address TC code inspection warnings in code I added and merge master into branch.

  dshteyn

  committed
  2d6388d

  Copy full SHA for 2d6388d

• Addressing more TC code inspection concerns

  dshteyn

  committed
  0688888

  Copy full SHA for 0688888

• Another TC Code Inspection warning addressed.

  dshteyn

  committed
  afca6cf

  Copy full SHA for afca6cf

• Switch Unimod accession setting to use {unimod_accession}:{name} to avoid collisions of accessions identified by failing test on TC

  dshteyn

  committed
  cb061bd

  Copy full SHA for cb061bd

Commits on Dec 11, 2024

• Merge branch 'master' into 'Skyline/work/20240909_carafe_integration'

  dshteyn

  committed
  2e809c8

  Copy full SHA for 2e809c8

• Use default Directory.CreateDirectory and quiet down ReSharper

  dshteyn

  committed
  6178f74

  Copy full SHA for 6178f74

• Quiet ReSharper Warnings by removing unnecessary using statements

  dshteyn

  committed
  ecf8116

  Copy full SHA for ecf8116

• Address ReSharper inspection issues

  dshteyn

  committed
  8c104a8

  Copy full SHA for 8c104a8

Commits on Dec 12, 2024

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  Show description for 58df59a
  dshteyn

  committed
  58df59a

  Copy full SHA for 58df59a

• Merge branch 'Skyline/work/20240816_pythoninstaller_with_virtual_env_support' of github.com:ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  Show description for e562344
  dshteyn

  committed
  e562344

  Copy full SHA for e562344

• Python installation for Carafe, dialog

  dshteyn

  committed
  ae3f388

  Copy full SHA for ae3f388

Commits on Dec 13, 2024

• Moving towards getting carafe to function in skyline

  dshteyn

  committed
  5eee0bf

  Copy full SHA for 5eee0bf

• Got installation of python and modules working so Carafe can be used in Skyline

  dshteyn

  committed
  15ce719

  Copy full SHA for 15ce719

Commits on Dec 17, 2024

• Changes for installing python for ALPHAPEPTDEEP and CARAFE. Modifications for ALPHAPEPTDEEP updated to match the program's expectation. Testing of python installation for ALPHAPEPTDEEP revealed the…

  Show description for ddea79b
  dshteyn

  committed
  ddea79b

  Copy full SHA for ddea79b

Commits on Dec 18, 2024

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  dshteyn

  committed
  e91b009

  Copy full SHA for e91b009

• Merge [master] into [20240909_carafe_integration] and changes related to running AlphapeptDeep and Carafe via Skyline

  dshteyn

  committed
  63c1519

  Copy full SHA for 63c1519

• - skip peptides containing unsupported modifications in Carafe and AlphapeptDeep

  Show description for 5c7e1a3
  dshteyn

  committed
  5c7e1a3

  Copy full SHA for 5c7e1a3

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  dshteyn

  committed
  9affaca

  Copy full SHA for 9affaca

• - address ReSharper warnings

  dshteyn

  committed
  85201e1

  Copy full SHA for 85201e1

• Merge branch 'Skyline/work/20240909_carafe_integration' of https://github.com/ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  dshteyn

  committed
  ebe3448

  Copy full SHA for ebe3448

Commits on Dec 19, 2024

• Correct typo calling wrong function

  dshteyn

  committed
  41fab43

  Copy full SHA for 41fab43

• Address ReSharper concerns

  dshteyn

  committed
  f847e65

  Copy full SHA for f847e65

• Merge branch 'master' of https://github.com/ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  dshteyn

  committed
  b2c1517

  Copy full SHA for b2c1517

Commits on Dec 20, 2024

• - Create a modification index to track supported modifications by Carafe

  Show description for d20d558
  dshteyn

  committed
  d20d558

  Copy full SHA for d20d558

Commits on Dec 21, 2024

• - Report the name of the tool in the Immediate Window when encountering unsupported modifications by AlphapeptDeep or Carafe

  dshteyn

  committed
  d05b4e0

  Copy full SHA for d05b4e0

• Merge branch 'master' of https://github.com/ProteoWizard/pwiz into Skyline/work/20240909_carafe_integration

  dshteyn

  committed
  5579a2b

  Copy full SHA for 5579a2b

Commits on Dec 22, 2024

• Merge 20240909_carafe_integration branch changes into 20240816_pythoninstaller_with_virtual_env_support branch

  dshteyn

  committed
  d8de121

  Copy full SHA for d8de121

Commits on Dec 27, 2024

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  e6a8f29

  Copy full SHA for e6a8f29

Commits on Dec 28, 2024

• Code refactoring for Python environment set up and optional setting of Windows LongPathsEnabled registry key using SkylineProcessRunner with elevated privilege. Gives the user notice about LongPath…

  Show description for 1fc1702
  dshteyn

  committed
  1fc1702

  Copy full SHA for 1fc1702

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  f858c8a

  Copy full SHA for f858c8a

• Code inspection correction.

  dshteyn

  committed
  4333566

  Copy full SHA for 4333566

• Refactor move InstallPythonVirtualEnvironment function from PythonInstaller to BuildLibraryDlg to address failing test due to: "(Skyline model code must not depend on UI code)"

  dshteyn

  committed
  59cbeec

  Copy full SHA for 59cbeec

• Changes to address TeamCity testing concerns

  dshteyn

  committed
  8ad214d

  Copy full SHA for 8ad214d

• Move function InstallPythonVirtualEnvironment from BuildLibraryDlg to ToolInstallUI

  dshteyn

  committed
  4af80b2

  Copy full SHA for 4af80b2

• Removed extraneous using statements identified by ReSharper

  dshteyn

  committed
  0f53ca9

  Copy full SHA for 0f53ca9

• Move InstallPythonVirtualEnvironment function to its own class in ToolsUI/PythonInstallerUI.cs

  dshteyn

  committed
  2b62301

  Copy full SHA for 2b62301

• Attempt to address System.NullReferenceException reported by TeamCity on this line

  dshteyn

  committed
  142b8a9

  Copy full SHA for 142b8a9

Commits on Jan 5, 2025

• + Improve PythonInstaller

  Show description for 645528d
  dshteyn

  committed
  645528d

  Copy full SHA for 645528d

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  47d0d3b

  Copy full SHA for 47d0d3b

• Address TC code inspection issue:

  Show description for 52b7405
  dshteyn

  committed
  52b7405

  Copy full SHA for 52b7405

Commits on Jan 6, 2025

• Attempt to run PythonInstallerUI in TestFunctional without enabling Windows LongPathsEnabled setting, which requires elevation and unlikely to work in an automated test where this is not available.

  dshteyn

  committed
  d42c1c5

  Copy full SHA for d42c1c5

• Correct problem with Python installation for future Carafe BuildLibraryDlg functionality. Disable failing TestFunctional tests until python installation failures on TC test nodes can be resolved.

  dshteyn

  committed
  fcaeeb0

  Copy full SHA for fcaeeb0

• Undo last change to TestFunctional.csproj

  dshteyn

  committed
  b6fb2a5

  Copy full SHA for b6fb2a5

• Disable failing TestFunctional tests for now.

  dshteyn

  committed
  257dd1b

  Copy full SHA for 257dd1b

• Merge branch 'master' into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  nickshulman

  authored
  8464baa

  Copy full SHA for 8464baa

Commits on Jan 7, 2025

• Improve Error messages.

  Show description for d098e06
  dshteyn

  committed
  d098e06

  Copy full SHA for d098e06

Commits on Jan 8, 2025

• Remove unnecessary using statements found by ReSharper

  dshteyn

  committed
  6327653

  Copy full SHA for 6327653

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  a0a1393

  Copy full SHA for a0a1393

• Merge branch 'Skyline/work/20240816_pythoninstaller_with_virtual_env_support' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  268db8e

  Copy full SHA for 268db8e

• Additional messages to help to the log

  dshteyn

  committed
  fc2219c

  Copy full SHA for fc2219c

Commits on Jan 9, 2025

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  51c18e8

  Copy full SHA for 51c18e8

• Changes to address issue with spaces in filenames discovered by running tests locally with TestRunner. Clarify function name that detects elevation level of the running process (as opposed to the u…

  Show description for 8ac1ad5
  dshteyn

  committed
  8ac1ad5

  Copy full SHA for 8ac1ad5

• TEST CODE: this is to be reverted after the test!!! Code to catch the AWS test node in the act of failing to install/configure python.

  dshteyn

  committed
  5d6f4be

  Copy full SHA for 5d6f4be

Commits on Jan 10, 2025

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  b083747

  Copy full SHA for b083747

• Remove unnecessary code in the test

  dshteyn

  committed
  98da8b9

  Copy full SHA for 98da8b9

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  9935a83

  Copy full SHA for 9935a83

Commits on Jan 14, 2025

• Clarify error message and direct user/developer to wiki page which explains how to set EnableLongPaths. Also set this for testing purposes in SkylineNightly after buddy review suggestion.

  dshteyn

  committed
  b0c1761

  Copy full SHA for b0c1761

• Merge branch 'master' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support

  dshteyn

  committed
  1f4a042

  Copy full SHA for 1f4a042

Commits on Jan 15, 2025

• Improve comments for developers and messages displayed to users. Simplify user directed messages and options. Clean up directories used for virtual environments and python installs upon failure. Do…

  Show description for 433dc30
  dshteyn

  committed
  433dc30

  Copy full SHA for 433dc30