Skip to content

Commit

Permalink
pr review
Browse files Browse the repository at this point in the history
  • Loading branch information
meliz19 committed Feb 5, 2025
1 parent 5262016 commit ac53410
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public class PyenvAndPoetrySetup {
*/
final String pythonDefaultVersionRequirement;

private final ThreadLocal<ValidationTrackingStatus> validationStatusContainer;
public final String validatedInPriorBuildPhase;

/**
Expand Down Expand Up @@ -80,7 +79,6 @@ public class PyenvAndPoetrySetup {
*
* @param pythonDefaultVersionRequirement Specifies the semver compliant requirement for the default version of Python that
* must be installed and available for Habushu to use.
* @param validationStatusContainer container for validation status tracking
* @param validatedInPriorBuildPhase string value indicating validation in prior build phase
* @param pythonVersion version of python to leverage
* @param usePyenv whether we are using pyenv to instance and activate python versions
Expand All @@ -89,11 +87,9 @@ public class PyenvAndPoetrySetup {
* @param log the logger to use for output
*/
public PyenvAndPoetrySetup(String pythonDefaultVersionRequirement,
ThreadLocal<ValidationTrackingStatus> validationStatusContainer,
String validatedInPriorBuildPhase, String pythonVersion, boolean usePyenv,
File baseDir, boolean rewriteLocalPathDepsInArchives, Log log) {
this.pythonDefaultVersionRequirement = pythonDefaultVersionRequirement;
this.validationStatusContainer = validationStatusContainer;
this.validatedInPriorBuildPhase = validatedInPriorBuildPhase;
this.pythonVersion = pythonVersion;
this.usePyenv = usePyenv;
Expand All @@ -102,18 +98,6 @@ public PyenvAndPoetrySetup(String pythonDefaultVersionRequirement,
this.log = log;
}

public String getPythonDefaultVersionRequirement() {
return pythonDefaultVersionRequirement;
}

public ThreadLocal<ValidationTrackingStatus> getValidationStatusContainer() {
return validationStatusContainer;
}

public String getValidatedInPriorBuildPhase() {
return validatedInPriorBuildPhase;
}

public String configurePyenvOrStraightPython(boolean usePyenv, List<String> missingRequiredToolMsgs, File patchInstallScript) throws MojoExecutionException {
String currentPythonVersion = "";
if (usePyenv) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public PythonPackageAndDependencyManagerSetup(String pythonVersion, String pytho
this.rewriteLocalPathDepsInArchives = rewriteLocalPathDepsInArchives;
this.log = log;
this.poetryConfigureTools = new PyenvAndPoetrySetup(PYTHON_DEFAULT_VERSION_REQUIREMENT,
validationStatusContainer, VALIDATED_IN_PRIOR_BUILD_PHASE, pythonVersion, usePyenv,
VALIDATED_IN_PRIOR_BUILD_PHASE, pythonVersion, usePyenv,
baseDir, rewriteLocalPathDepsInArchives, log);
}

Expand Down

0 comments on commit ac53410

Please sign in to comment.