-
Notifications
You must be signed in to change notification settings - Fork 100
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
Alphapeptdeep Integration #3123
base: master
Are you sure you want to change the base?
Alphapeptdeep Integration #3123
Conversation
Something went wrong with the merge here. It shouldn't show changes from other PRs. Maybe try fetching latest master and rebasing your branch on it. Do you need help doing that?. |
My guess is that pushing "Update branch" will fix everything. |
868fde7
to
416c9d2
Compare
Yeah. Thanks for asking. I did a rebase which treated the updated changes and anything in between as new commits. I rolled back those changes and added the updates as a new commit. That fixed this branch. I will do a merge from master later on. |
3db9cca
to
b007485
Compare
On TeamCity the TestData test runs from an installed directory (installed with the WIX-based installer). Any non-vendor DLLs have to be added into |
…IResources into ToolsResources
a4971e8
to
7812cb5
Compare
…ry with alphapeptdeep" This reverts commit 5c487ab. Tempororily remove this commit to make TeamCity build succeeds
…om skyline document
…alphapeptdeep cli to build library
… library file to be skyline compatible
…support' of github.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support
…rk/20240816_pythoninstaller_with_virtual_env_support
…ng tests locally with TestRunner. Clarify function name that detects elevation level of the running process (as opposed to the user being admin.) Add functionality that undoes changes to the registry done by python installation as part of a test.
… AWS test node in the act of failing to install/configure python.
…k/20240403_PeakTotalIonCurrentArea
…rk/20240816_pythoninstaller_with_virtual_env_support
…rk/20240816_pythoninstaller_with_virtual_env_support
…k/20240403_PeakTotalIonCurrentArea
…b.com:ProteoWizard/pwiz into Skyline/work/20240816_pythoninstaller_with_virtual_env_support
…so expanded paths don't collapse after each click on Apply.
…line/work/20240112_pythoninstaller_and_applybutton
…plains how to set EnableLongPaths. Also set this for testing purposes in SkylineNightly after buddy review suggestion.
…rk/20240816_pythoninstaller_with_virtual_env_support
…lify user directed messages and options. Clean up directories used for virtual environments and python installs upon failure. Do not continue further tasks for python installation on Cancel.
… up of python installation functions to PythonInstaller. Prevent crash if trying to build library from an empty document.
…rk/20240816_pythoninstaller_with_virtual_env_support
…support' of github.com:ProteoWizard/pwiz into 20250113_Carafe_CUDA_Apply
PythonInstaller
toPythonInstallerLegacyDlg
PythonInstaller
implementation to support Python virtual environmentPythonInstaller
implementation