Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public List<PythonFile> generate(ConjureDefinition conjureDefinition) {
.map(f -> {
if (f.build().packageName().indexOf('.') < 0) {
f.addContents(versionAttribute(f.build().packageName()));
f.addContents(generatorVersionAttribute(f.build().packageName()));
}
return f;
})
Expand Down Expand Up @@ -144,6 +145,13 @@ private PythonClass versionAttribute(String packageName) {
.build();
}

private PythonClass generatorVersionAttribute(String packageName) {
return PythonLine.builder()
.text(String.format("__conjure_generator_version__ = \"%s\"", config.generatorVersion()))
.packageName(packageName)
.build();
}

private PythonFile buildPythonSetupFile() {
PythonSetup.Builder builder = PythonSetup.builder()
.putOptions("name", config.packageName())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public interface GeneratorConfiguration {

Optional<String> packageAuthor();

String generatorVersion();

String minConjureClientVersion();

boolean shouldWriteCondaRecipe();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public final class ConjurePythonGeneratorTest {
.packageVersion("0.0.0")
.packageDescription("project description")
.minConjureClientVersion("1.0.0")
.generatorVersion("0.0.0")
.shouldWriteCondaRecipe(true)
.build());
private final InMemoryPythonFileWriter pythonFileWriter = new InMemoryPythonFileWriter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@

__version__ = "0.0.0"

__conjure_generator_version__ = "0.0.0"

Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@

__version__ = "0.0.0"

__conjure_generator_version__ = "0.0.0"

3 changes: 2 additions & 1 deletion conjure-python/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ task generateBuildConfiguration() {
def minConjureClientVersion = dependencyRecommendations.getRecommendedVersion('com.palantir.conjure.python', 'conjure-python-client')
def props = new File("$projectDir/src/main/resources/buildConfiguration.yml")
props.getParentFile().mkdirs()
props.text = "minConjureClientVersion: $minConjureClientVersion"
props.text = "generatorVersion: ${project.version}\n"
props.text += "minConjureClientVersion: $minConjureClientVersion\n"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public abstract class BuildConfiguration {

private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(new YAMLFactory());

abstract String generatorVersion();

abstract String minConjureClientVersion();

static BuildConfiguration load() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ static CliConfiguration resolveCliConfiguration(String[] args) {
static GeneratorConfiguration resolveGeneratorConfiguration(CliConfiguration cliConfig,
BuildConfiguration buildConfig) {
return GeneratorConfiguration.builder()
.generatorVersion(buildConfig.generatorVersion())
.minConjureClientVersion(buildConfig.minConjureClientVersion())
.packageAuthor(cliConfig.packageAuthor())
.packageDescription(cliConfig.packageDescription())
Expand Down