Skip to content

Commit 1a1eb27

Browse files
aws-sam-cli-botaws-sam-cli-bot
committed
Merge branch 'develop'
2 parents 49ec0ac + 95f3a4b commit 1a1eb27

File tree

18 files changed

+33
-146
lines changed

18 files changed

+33
-146
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ jobs:
122122
- "3.8"
123123
- "3.9"
124124
- "3.10"
125+
- "3.11"
125126
npm:
126127
- 8
127128
- 9
@@ -154,6 +155,7 @@ jobs:
154155
- "3.8"
155156
- "3.9"
156157
- "3.10"
158+
- "3.11"
157159
steps:
158160
- uses: actions/checkout@v3
159161
- uses: actions/setup-python@v4
@@ -180,6 +182,7 @@ jobs:
180182
- "3.8"
181183
- "3.9"
182184
- "3.10"
185+
- "3.11"
183186
steps:
184187
- uses: actions/checkout@v3
185188
- uses: actions/setup-python@v4
@@ -209,6 +212,7 @@ jobs:
209212
- "3.8"
210213
- "3.9"
211214
- "3.10"
215+
- "3.11"
212216
steps:
213217
- uses: actions/checkout@v3
214218
- uses: actions/setup-python@v4
@@ -236,6 +240,7 @@ jobs:
236240
- "3.8"
237241
- "3.9"
238242
- "3.10"
243+
- "3.11"
239244
steps:
240245
- uses: actions/checkout@v3
241246
- uses: actions/setup-python@v4
@@ -259,6 +264,7 @@ jobs:
259264
- "3.8"
260265
- "3.9"
261266
- "3.10"
267+
- "3.11"
262268
steps:
263269
- uses: actions/checkout@v3
264270
- uses: actions/setup-python@v4
@@ -282,6 +288,7 @@ jobs:
282288
- "3.8"
283289
- "3.9"
284290
- "3.10"
291+
- "3.11"
285292
steps:
286293
- uses: actions/checkout@v3
287294
- uses: actions/setup-python@v4
@@ -311,6 +318,7 @@ jobs:
311318
- "3.8"
312319
- "3.9"
313320
- "3.10"
321+
- "3.11"
314322
steps:
315323
- uses: actions/checkout@v3
316324
- uses: actions/setup-python@v4

‎aws_lambda_builders/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
# Changing version will trigger a new release!
66
# Please make the version change as the last step of your development.
7-
__version__ = "1.34.0"
7+
__version__ = "1.35.0"
88
RPC_PROTOCOL_VERSION = "0.3"

‎aws_lambda_builders/validator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"python3.8": [ARM64, X86_64],
1919
"python3.9": [ARM64, X86_64],
2020
"python3.10": [ARM64, X86_64],
21+
"python3.11": [ARM64, X86_64],
2122
"ruby2.7": [ARM64, X86_64],
2223
"ruby3.2": [ARM64, X86_64],
2324
"java8": [ARM64, X86_64],
2425
"java11": [ARM64, X86_64],
2526
"java17": [ARM64, X86_64],
2627
"go1.x": [ARM64, X86_64],
27-
"dotnetcore3.1": [ARM64, X86_64],
2828
"dotnet6": [ARM64, X86_64],
2929
"provided": [ARM64, X86_64],
3030
}

‎aws_lambda_builders/workflows/dotnet_clipackage/DESIGN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ package:
4141
<ZIP-FILE> The name of the zip file to package the project into
4242
Options:
4343
-c | --configuration Configuration to build with, for example Release or Debug.
44-
-f | --framework Target framework to compile, for example netcoreapp2.1.
44+
-f | --framework Target framework to compile, for example net6.0.
4545
--msbuild-parameters Additional msbuild parameters passed to the 'dotnet publish' command. Add quotes around the value if the value contains spaces.
4646
-pl | --project-location The location of the project, if not set the current directory will be assumed.
4747
-cfg | --config-file Configuration file storing default values for command line arguments.

‎aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def run(self, args, cwd=None):
5050
LOG.debug("executing dotnet: %s", invoke_dotnet)
5151

5252
# DotNet output is in system locale dependent encoding
53-
# https://docs.microsoft.com/en-us/dotnet/api/system.console.outputencoding?view=netcore-3.1#remarks
53+
# https://learn.microsoft.com/en-us/dotnet/api/system.console.outputencoding?view=net-6.0#remarks
5454
# "The default code page that the console uses is determined by the system locale."
5555
encoding = locale.getpreferredencoding()
5656
p = self.os_utils.popen(invoke_dotnet, stdout=self.os_utils.pipe, stderr=self.os_utils.pipe, cwd=cwd)

‎aws_lambda_builders/workflows/python_pip/DESIGN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
4949
5050
:type runtime: str
5151
:param runtime: Python version to build dependencies for. This can
52-
either be python3.7, python3.8, python3.9 or python3.10. These are
52+
either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are
5353
currently the only supported values.
5454
5555
:type ui: :class:`lambda_builders.actions.python_pip.utils.UI`

‎aws_lambda_builders/workflows/python_pip/packager.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def get_lambda_abi(runtime):
8585
"python3.8": "cp38",
8686
"python3.9": "cp39",
8787
"python3.10": "cp310",
88+
"python3.11": "cp311",
8889
}
8990

9091
if runtime not in supported:
@@ -99,7 +100,7 @@ def __init__(self, runtime, osutils=None, dependency_builder=None, architecture=
99100
100101
:type runtime: str
101102
:param runtime: Python version to build dependencies for. This can
102-
either be python3.7, python3.8, python3.9 or python3.10. These are currently the
103+
either be python3.7, python3.8, python3.9, python3.10 or python3.11. These are currently the
103104
only supported values.
104105
105106
:type osutils: :class:`lambda_builders.utils.OSUtils`

‎requirements/dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ pyelftools~=0.29 # Used to verify the generated Go binary architecture in integr
1212

1313
# formatter
1414
black==23.3.0
15-
ruff==0.0.270
15+
ruff==0.0.277

‎setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def read_version():
6262
"Programming Language :: Python :: 3.8",
6363
"Programming Language :: Python :: 3.9",
6464
"Programming Language :: Python :: 3.10",
65+
"Programming Language :: Python :: 3.11",
6566
"Topic :: Internet",
6667
"Topic :: Software Development :: Build Tools",
6768
"Topic :: Utilities",

‎tests/integration/workflows/dotnet_clipackage/test_dotnet.py‎

Lines changed: 2 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class TestDotnetBase(TestCase):
1818
"""
19-
Base class for dotnetcore tests
19+
Base class for dotnet tests
2020
"""
2121

2222
TEST_DATA_FOLDER = os.path.join(os.path.dirname(__file__), "testdata")
@@ -25,7 +25,7 @@ def setUp(self):
2525
self.artifacts_dir = tempfile.mkdtemp()
2626
self.scratch_dir = tempfile.mkdtemp()
2727
self.builder = LambdaBuilder(language="dotnet", dependency_manager="cli-package", application_framework=None)
28-
self.runtime = "dotnetcore3.1"
28+
self.runtime = "dotnet6"
2929

3030
def tearDown(self):
3131
shutil.rmtree(self.artifacts_dir)
@@ -50,80 +50,6 @@ def verify_execute_permissions(self, entrypoint_file_name):
5050
self.assertTrue(os.access(entrypoint_file_path, os.X_OK))
5151

5252

53-
class TestDotnet31(TestDotnetBase):
54-
"""
55-
Tests for dotnetcore 3.1
56-
"""
57-
58-
def setUp(self):
59-
super(TestDotnet31, self).setUp()
60-
self.runtime = "dotnetcore3.1"
61-
62-
def test_with_defaults_file(self):
63-
source_dir = os.path.join(self.TEST_DATA_FOLDER, "WithDefaultsFile3.1")
64-
65-
self.builder.build(source_dir, self.artifacts_dir, self.scratch_dir, source_dir, runtime=self.runtime)
66-
67-
expected_files = {
68-
"Amazon.Lambda.Core.dll",
69-
"Amazon.Lambda.Serialization.Json.dll",
70-
"Newtonsoft.Json.dll",
71-
"WithDefaultsFile.deps.json",
72-
"WithDefaultsFile.dll",
73-
"WithDefaultsFile.pdb",
74-
"WithDefaultsFile.runtimeconfig.json",
75-
}
76-
77-
output_files = set(os.listdir(self.artifacts_dir))
78-
79-
self.assertEqual(expected_files, output_files)
80-
self.verify_architecture("WithDefaultsFile.deps.json", "linux-x64")
81-
82-
def test_with_defaults_file_x86(self):
83-
source_dir = os.path.join(self.TEST_DATA_FOLDER, "WithDefaultsFile3.1")
84-
85-
self.builder.build(
86-
source_dir, self.artifacts_dir, self.scratch_dir, source_dir, runtime=self.runtime, architecture=X86_64
87-
)
88-
89-
expected_files = {
90-
"Amazon.Lambda.Core.dll",
91-
"Amazon.Lambda.Serialization.Json.dll",
92-
"Newtonsoft.Json.dll",
93-
"WithDefaultsFile.deps.json",
94-
"WithDefaultsFile.dll",
95-
"WithDefaultsFile.pdb",
96-
"WithDefaultsFile.runtimeconfig.json",
97-
}
98-
99-
output_files = set(os.listdir(self.artifacts_dir))
100-
101-
self.assertEqual(expected_files, output_files)
102-
self.verify_architecture("WithDefaultsFile.deps.json", "linux-x64")
103-
104-
def test_with_defaults_file_arm64(self):
105-
source_dir = os.path.join(self.TEST_DATA_FOLDER, "WithDefaultsFile3.1")
106-
107-
self.builder.build(
108-
source_dir, self.artifacts_dir, self.scratch_dir, source_dir, runtime=self.runtime, architecture=ARM64
109-
)
110-
111-
expected_files = {
112-
"Amazon.Lambda.Core.dll",
113-
"Amazon.Lambda.Serialization.Json.dll",
114-
"Newtonsoft.Json.dll",
115-
"WithDefaultsFile.deps.json",
116-
"WithDefaultsFile.dll",
117-
"WithDefaultsFile.pdb",
118-
"WithDefaultsFile.runtimeconfig.json",
119-
}
120-
121-
output_files = set(os.listdir(self.artifacts_dir))
122-
123-
self.assertEqual(expected_files, output_files)
124-
self.verify_architecture("WithDefaultsFile.deps.json", "linux-arm64")
125-
126-
12753
class TestDotnet6(TestDotnetBase):
12854
"""
12955
Tests for dotnet 6

0 commit comments

Comments
 (0)