Correct problem with Python installation for future Carafe BuildLibra…

…ryDlg functionality. Disable failing TestFunctional tests until python installation failures on TC test nodes can be resolved.
ProteoWizard · Jan 6, 2025 · fcaeeb0 · fcaeeb0
1 parent d42c1c5
commit fcaeeb0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/pwiz_tools/Skyline/SettingsUI/BuildLibraryDlg.cs b/pwiz_tools/Skyline/SettingsUI/BuildLibraryDlg.cs
@@ -602,7 +602,7 @@ private void btnNext_Click(object sender, EventArgs e)
 
         public bool PythonRequirementMet()
         {
-            if (radioAlphaSource.Checked || radioKoinaSource.Checked)
+            if (radioCarafeSource.Checked || radioAlphaSource.Checked || radioKoinaSource.Checked)
             {
                 return ValidateBuilder(true);
             }

diff --git a/pwiz_tools/Skyline/TestFunctional/CarafeBuildLibraryTest.cs b/pwiz_tools/Skyline/TestFunctional/CarafeBuildLibraryTest.cs
@@ -18,7 +18,7 @@ public class CarafeBuildLibraryTest : AbstractFunctionalTestEx
 
         public IAsynchronousDownloadClient TestDownloadClient { get; set; }
         private const string TESTDATA_URL = @"https://skyline.ms/_webdav/home/support/file%20sharing/%40files/";
-        private const string TESTDATA_FILE = @"CarafeBuildLibraryTestShort.zip";
+        private const string TESTDATA_FILE = @"CarafeBuildLibraryTest.zip";
         private const string TESTDATA_DIR = @"TestFunctional";
 
 

diff --git a/pwiz_tools/Skyline/TestFunctional/TestFunctional.csproj b/pwiz_tools/Skyline/TestFunctional/TestFunctional.csproj
@@ -168,7 +168,6 @@
     <Compile Include="AgilentGCEITest.cs" />
     <Compile Include="AlertDlgTest.cs" />
     <Compile Include="AlphabeticalReportEditorTest.cs" />
-    <Compile Include="AlphapeptDeepBuildLibraryTest.cs" />
     <Compile Include="ApplyPeakToAllTest.cs" />
     <Compile Include="AreaNormalizeOptionTest.cs" />
     <Compile Include="AssociateProteinVariantTest.cs" />
@@ -178,7 +177,6 @@
     <Compile Include="BlibMoleculeListsTest.cs" />
     <Compile Include="CandidatePeakTest.cs" />
     <Compile Include="CantReadSkydTest.cs" />
-    <Compile Include="CarafeBuildLibraryTest.cs" />
     <Compile Include="ChargedLossesLibraryTest.cs" />
     <Compile Include="CleavableCrosslinkTest.cs" />
     <Compile Include="ConstrainNormalizationMethodTest.cs" />
@@ -223,7 +221,6 @@
     <Compile Include="PeakAreaRelativeAbundanceGraphTest.cs" />
     <Compile Include="PeakAreaPeptideGraphTest.cs" />
     <Compile Include="PrmCeOptimizationTest.cs" />
-    <Compile Include="PythonInstallerTest.cs" />
     <Compile Include="QcTraceChromatogramTest.cs" />
     <Compile Include="QcTraceNameTest.cs" />
     <Compile Include="RedundantComboBoxTest.cs" />
@@ -409,7 +406,6 @@
     <Compile Include="KoinaSkylineIntegrationTest.cs" />
     <Compile Include="ProteinMetadataFunctionalTest.cs" />
     <Compile Include="ProteinMetadataBackgroundLoaderTest.cs" />
-    <Compile Include="PythonInstallerLegacyDlgTest.cs" />
     <Compile Include="QuantitativeTest.cs" />
     <Compile Include="RefineProteinListDlgTest.cs" />
     <Compile Include="RefineListDlgTest.cs" />
@@ -653,7 +649,6 @@
     <None Include="ProteinMetadataBackgroundLoaderTest.zip" />
     <None Include="ProteinMetadataFunctionalTest.zip" />
     <None Include="ProxlTest.zip" />
-    <None Include="PythonInstallerTest.zip" />
     <None Include="QcTraceNameTest.zip" />
     <None Include="QualitativeIonRatioTest.zip" />
     <None Include="QuantitativePeakAreaTest.zip" />