Skip to content

Commit 3a6fe0e

Browse files
nateprewittnateprewitt
authored
Move files to src directory (#479)
1 parent 4b90aec commit 3a6fe0e

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ build-java: ## Builds the Java code generation packages.
1616

1717
test-protocols: ## Generates and runs the restJson1 protocol tests.
1818
cd codegen && ./gradlew :protocol-test:build
19+
uv pip install codegen/protocol-test/build/smithyprojections/protocol-test/rest-json-1/python-client-codegen
1920
uv run pytest codegen/protocol-test/build/smithyprojections/protocol-test/rest-json-1/python-client-codegen
2021

2122

‎codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsUserAgentIntegration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
6060
moduleName,
6161
user_agent_plugin_file.replace('/', '.')), ".")
6262
.definitionFile(String
63-
.format("./%s/%s.py", moduleName, user_agent_plugin_file))
63+
.format("./src/%s/%s.py", moduleName, user_agent_plugin_file))
6464
.name("aws_user_agent_plugin")
6565
.build())
6666
.build();
@@ -90,7 +90,7 @@ public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
9090
.addConfigProperty(uaAppId)
9191
.pythonPlugin(userAgentPlugin)
9292
.writeAdditionalFiles((c) -> {
93-
String filename = "%s/%s.py".formatted(moduleName, user_agent_plugin_file);
93+
String filename = "src/%s/%s.py".formatted(moduleName, user_agent_plugin_file);
9494
c.writerDelegator()
9595
.useFileWriter(
9696
filename,

‎codegen/core/src/main/java/software/amazon/smithy/python/codegen/CodegenUtils.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static Symbol getConfigSymbol(PythonSettings settings) {
7070
return Symbol.builder()
7171
.name("Config")
7272
.namespace(String.format("%s.config", settings.moduleName()), ".")
73-
.definitionFile(String.format("./%s/config.py", settings.moduleName()))
73+
.definitionFile(String.format("./src/%s/config.py", settings.moduleName()))
7474
.build();
7575
}
7676

@@ -82,7 +82,7 @@ public static Symbol getPluginSymbol(PythonSettings settings) {
8282
return Symbol.builder()
8383
.name("Plugin")
8484
.namespace(String.format("%s.config", settings.moduleName()), ".")
85-
.definitionFile(String.format("./%s/config.py", settings.moduleName()))
85+
.definitionFile(String.format("./src/%s/config.py", settings.moduleName()))
8686
.build();
8787
}
8888

@@ -101,7 +101,7 @@ public static Symbol getServiceError(PythonSettings settings) {
101101
return Symbol.builder()
102102
.name("ServiceError")
103103
.namespace(String.format("%s.models", settings.moduleName()), ".")
104-
.definitionFile(String.format("./%s/models.py", settings.moduleName()))
104+
.definitionFile(String.format("./src/%s/models.py", settings.moduleName()))
105105
.build();
106106
}
107107

@@ -118,7 +118,7 @@ public static Symbol getApiError(PythonSettings settings) {
118118
return Symbol.builder()
119119
.name("ApiError")
120120
.namespace(String.format("%s.models", settings.moduleName()), ".")
121-
.definitionFile(String.format("./%s/models.py", settings.moduleName()))
121+
.definitionFile(String.format("./src/%s/models.py", settings.moduleName()))
122122
.build();
123123
}
124124

@@ -135,7 +135,7 @@ public static Symbol getUnknownApiError(PythonSettings settings) {
135135
return Symbol.builder()
136136
.name("UnknownApiError")
137137
.namespace(String.format("%s.models", settings.moduleName()), ".")
138-
.definitionFile(String.format("./%s/models.py", settings.moduleName()))
138+
.definitionFile(String.format("./src/%s/models.py", settings.moduleName()))
139139
.build();
140140
}
141141

@@ -149,7 +149,7 @@ public static Symbol getHttpAuthParamsSymbol(PythonSettings settings) {
149149
return Symbol.builder()
150150
.name("HTTPAuthParams")
151151
.namespace(String.format("%s.auth", settings.moduleName()), ".")
152-
.definitionFile(String.format("./%s/auth.py", settings.moduleName()))
152+
.definitionFile(String.format("./src/%s/auth.py", settings.moduleName()))
153153
.build();
154154
}
155155

@@ -163,7 +163,7 @@ public static Symbol getHttpAuthSchemeResolverSymbol(PythonSettings settings) {
163163
return Symbol.builder()
164164
.name("HTTPAuthSchemeResolver")
165165
.namespace(String.format("%s.auth", settings.moduleName()), ".")
166-
.definitionFile(String.format("./%s/auth.py", settings.moduleName()))
166+
.definitionFile(String.format("./src/%s/auth.py", settings.moduleName()))
167167
.build();
168168
}
169169

‎codegen/core/src/main/java/software/amazon/smithy/python/codegen/PythonSymbolProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ private SymbolReference createSchemaSymbol(Shape shape) {
408408
} else {
409409
schemaSymbolBuilder
410410
.namespace(String.format("%s.%s", settings.moduleName(), SCHEMAS_FILE.replace('/', '.')), ".")
411-
.definitionFile(String.format("./%s/%s.py", settings.moduleName(), SCHEMAS_FILE));
411+
.definitionFile(String.format("./src/%s/%s.py", settings.moduleName(), SCHEMAS_FILE));
412412
}
413413
var schemaSymbol = schemaSymbolBuilder.build();
414414
return SymbolReference.builder()
@@ -428,7 +428,7 @@ private Symbol.Builder createGeneratedSymbolBuilder(
428428
boolean includeSchema
429429
) {
430430
var namespace = String.format("%s.%s", settings.moduleName(), file.replace('/', '.'));
431-
var filename = String.format("./%s/%s.py", settings.moduleName(), file);
431+
var filename = String.format("./src/%s/%s.py", settings.moduleName(), file);
432432
return createSymbolBuilder(shape, typeName, includeSchema)
433433
.namespace(namespace, ".")
434434
.definitionFile(filename);

‎codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/InitGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void run() {
4242
}
4343
context.writerDelegator()
4444
.useFileWriter(
45-
"%s/__init__.py".formatted(context.settings().moduleName()),
45+
"src/%s/__init__.py".formatted(context.settings().moduleName()),
4646
w -> w.write("__version__: str = $S", context.settings().moduleVersion()));
4747
}
4848
}

‎codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/ProtocolGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ default Symbol getSerializationFunction(GenerationContext context, ToShapeId sha
6969
return Symbol.builder()
7070
.name(getSerializationFunctionName(context, shapeId))
7171
.namespace(format("%s.serialize", context.settings().moduleName()), "")
72-
.definitionFile(format("./%s/serialize.py", context.settings().moduleName()))
72+
.definitionFile(format("./src/%s/serialize.py", context.settings().moduleName()))
7373
.build();
7474
}
7575

@@ -96,7 +96,7 @@ default Symbol getDeserializationFunction(GenerationContext context, ToShapeId s
9696
return Symbol.builder()
9797
.name(getDeserializationFunctionName(context, shapeId))
9898
.namespace(format("%s.deserialize", context.settings().moduleName()), "")
99-
.definitionFile(format("./%s/deserialize.py", context.settings().moduleName()))
99+
.definitionFile(format("./src/%s/deserialize.py", context.settings().moduleName()))
100100
.build();
101101
}
102102

@@ -113,7 +113,7 @@ default Symbol getErrorDeserializationFunction(GenerationContext context, ToShap
113113
return Symbol.builder()
114114
.name("_deserialize_error_" + CaseUtils.toSnakeCase(name))
115115
.namespace(format("%s.deserialize", context.settings().moduleName()), "")
116-
.definitionFile(format("./%s/deserialize.py", context.settings().moduleName()))
116+
.definitionFile(format("./src/%s/deserialize.py", context.settings().moduleName()))
117117
.build();
118118
}
119119

‎codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/SchemaGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private void writeSchemaMembers(PythonWriter writer, Shape shape) {
207207
// references, but when generating schemas we need to instead defer creating those
208208
// members until all schemas exist.
209209
public void finalizeRecursiveShapes() {
210-
var filename = String.format("%s/_private/schemas.py", context.settings().moduleName());
210+
var filename = String.format("src/%s/_private/schemas.py", context.settings().moduleName());
211211
var namespace = String.format("%s._private.schemas", context.settings().moduleName());
212212
context.writerDelegator().useFileWriter(filename, namespace, this::finalizeRecursiveShapes);
213213
}

0 commit comments

Comments
 (0)