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.

Sign up for GitHub

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

Graduate pipreport #1199

Merged
merged 2 commits into from
Jul 10, 2024
Merged

Graduate pipreport #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc6c436
graduate pipreport
pauld-msft Jul 9, 2024
be91f86
bump versions
pauld-msft Jul 10, 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
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Detectors/pip/PipComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Microsoft.ComponentDetection.Detectors.Pip;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Extensions.Logging;

public class PipComponentDetector : FileComponentDetector
public class PipComponentDetector : FileComponentDetector, IDefaultOffComponentDetector
{
private readonly IPythonCommandService pythonCommandService;
private readonly IPythonResolver pythonResolver;
Expand All @@ -38,7 +38,7 @@ public PipComponentDetector(

public override IEnumerable<ComponentType> SupportedComponentTypes { get; } = new[] { ComponentType.Pip };

public override int Version { get; } = 10;
public override int Version { get; } = 11;

protected override async Task<IObservable<ProcessRequest>> OnPrepareDetectionAsync(IObservable<ProcessRequest> processRequests, IDictionary<string, string> detectorArgs)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.ComponentDetection.Detectors/pip/PipReportComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.ComponentDetection.Detectors.Pip;
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Extensions.Logging;

public class PipReportComponentDetector : FileComponentDetector, IExperimentalDetector
public class PipReportComponentDetector : FileComponentDetector
{
private const string PipReportOverrideBehaviorEnvVar = "PipReportOverrideBehavior";
private const string PipReportSkipFallbackOnFailureEnvVar = "PipReportSkipFallbackOnFailure";
Expand Down Expand Up @@ -67,7 +67,7 @@ private enum PipReportOverrideBehavior

public override IEnumerable<ComponentType> SupportedComponentTypes { get; } = new[] { ComponentType.Pip };

public override int Version { get; } = 3;
public override int Version { get; } = 4;

protected override bool EnableParallelism { get; set; } = true;

Expand Down
18 changes: 0 additions & 18 deletions src/Microsoft.ComponentDetection.Orchestrator/Experiments/Configs/PipReportExperiment.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.ComponentDetection.Orchestrator/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public static IServiceCollection AddComponentDetection(this IServiceCollection s
services.AddSingleton<IExperimentConfiguration, SimplePipExperiment>();
services.AddSingleton<IExperimentConfiguration, RustCliDetectorExperiment>();
services.AddSingleton<IExperimentConfiguration, VcpkgExperiment>();
services.AddSingleton<IExperimentConfiguration, PipReportExperiment>();

// Detectors
// CocoaPods
Expand Down
Loading