Skip to content

Commit e393511

Browse files
Release 2026-02-24: merge develop into main
2 parents 6718031 + 1f86945 commit e393511

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+840
-1237
lines changed

.github/workflows/check-license.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ jobs:
1414
name: Check License Header
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
18+
with:
19+
persist-credentials: false
1820

19-
- uses: apache/skywalking-eyes/header@55373684d1b70e5f8fd9fc8ec114a89ad11a56a3
21+
- uses: apache/skywalking-eyes/header@7a3b6cc34c5980cede4407ffa06fe553a999245d
2022
with:
2123
mode: check

.github/workflows/ci.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,31 @@ jobs:
2020

2121
steps:
2222
- name: Checkout Repository
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
24+
with:
25+
persist-credentials: false
2426

2527
- name: Set up JDK 17
26-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
28+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
2729
with:
2830
java-version: 17
2931
distribution: 'corretto'
3032

3133
- name: Setup Gradle
32-
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
34+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
3335

3436
- name: Install uv and set the Python version
35-
uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867
37+
uses: astral-sh/setup-uv@eac588ad8def6316056a12d4907a9d4d84ff7a3b
3638
with:
3739
python-version: ${{ matrix.python-version }}
3840
activate-environment: true
3941
enable-cache: true
4042

43+
- name: Install pandoc
44+
uses: pandoc/actions/setup@86321b6dd4675f5014c611e05088e10d4939e09e
45+
with:
46+
version: 3.8.2
47+
4148
- name: Setup workspace
4249
run: |
4350
make install

.github/workflows/update-gradle-wrapper.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ jobs:
1919
pull-requests: write
2020

2121
steps:
22-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
23+
with:
24+
persist-credentials: false
2325

2426
- name: Update Gradle Wrapper
2527
uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,13 @@ With both files your project directory should look like this:
112112

113113
The code generator libraries have not been published yet, so
114114
you'll need to build it yourself. To build and run the generator, you will need
115-
the following prerequisites:
115+
the following prerequisites installed in your environment:
116116

117117
* [uv](https://docs.astral.sh/uv/)
118118
* The [Smithy CLI](https://smithy.io/2.0/guides/smithy-cli/cli_installation.html)
119119
* JDK 17 or newer
120120
* make
121+
* [pandoc](https://pandoc.org/installing.html) CLI
121122

122123
This project uses [uv](https://docs.astral.sh/uv/) for managing all things python.
123124
Once you have it installed, run the following command to check that it's ready to use:
@@ -169,6 +170,16 @@ if __name__ == "__main__":
169170
asyncio.run(main())
170171
```
171172

173+
#### pandoc CLI
174+
175+
Smithy [documentation traits](https://smithy.io/2.0/spec/documentation-traits.html#documentation-trait) are modeled in one of two formats:
176+
177+
- **Raw HTML** for AWS services
178+
- **CommonMark** for all other Smithy-based services (may include embedded HTML)
179+
180+
The code generator uses [pandoc](https://pandoc.org/) to normalize and convert this
181+
content into Markdown suitable for Google-style Python docstrings.
182+
172183
#### Is Java really required?
173184

174185
Only for now. Once the generator has been published, the Smithy CLI will be able

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ private AwsPythonDependency() {}
2222
*/
2323
public static final PythonDependency SMITHY_AWS_CORE = new PythonDependency(
2424
"smithy_aws_core",
25-
"~=0.3.0",
25+
"~=0.4.0",
2626
PythonDependency.Type.DEPENDENCY,
2727
false);
2828
}

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

Lines changed: 0 additions & 200 deletions
This file was deleted.

codegen/aws/core/src/main/resources/META-INF/services/software.amazon.smithy.python.codegen.integrations.PythonIntegration

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ software.amazon.smithy.python.aws.codegen.AwsProtocolsIntegration
88
software.amazon.smithy.python.aws.codegen.AwsServiceIdIntegration
99
software.amazon.smithy.python.aws.codegen.AwsUserAgentIntegration
1010
software.amazon.smithy.python.aws.codegen.AwsStandardRegionalEndpointsIntegration
11-
software.amazon.smithy.python.aws.codegen.AwsRstDocFileGenerator

0 commit comments

Comments
 (0)