Skip to content

Commit 0758347

Browse files
Merge branch 'release-1.18.43'
* release-1.18.43: Bumping version to 1.18.43 Add changelog entries from botocore Rework test runners to centralized workflow (#2996)
2 parents ad5fda6 + e36ac34 commit 0758347

8 files changed

Lines changed: 127 additions & 14 deletions

File tree

‎.changes/1.18.43.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[
2+
{
3+
"category": "``kafkaconnect``",
4+
"description": "[``botocore``] This is the initial SDK release for Amazon Managed Streaming for Apache Kafka Connect (MSK Connect).",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``macie2``",
9+
"description": "[``botocore``] This release adds support for specifying which managed data identifiers are used by a classification job, and retrieving a list of managed data identifiers that are available.",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``robomaker``",
14+
"description": "[``botocore``] Adding support to create container based Robot and Simulation applications by introducing an environment field",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``s3``",
19+
"description": "[``botocore``] Add support for access point arn filtering in S3 CW Request Metrics",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``transcribe``",
24+
"description": "[``botocore``] This release adds support for subtitling with Amazon Transcribe batch jobs.",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``sagemaker``",
29+
"description": "[``botocore``] Add API for users to retry a failed pipeline execution or resume a stopped one.",
30+
"type": "api-change"
31+
},
32+
{
33+
"category": "``pinpoint``",
34+
"description": "[``botocore``] This SDK release adds a new feature for Pinpoint campaigns, in-app messaging.",
35+
"type": "api-change"
36+
}
37+
]

‎CHANGELOG.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
CHANGELOG
33
=========
44

5+
1.18.43
6+
=======
7+
8+
* api-change:``kafkaconnect``: [``botocore``] This is the initial SDK release for Amazon Managed Streaming for Apache Kafka Connect (MSK Connect).
9+
* api-change:``macie2``: [``botocore``] This release adds support for specifying which managed data identifiers are used by a classification job, and retrieving a list of managed data identifiers that are available.
10+
* api-change:``robomaker``: [``botocore``] Adding support to create container based Robot and Simulation applications by introducing an environment field
11+
* api-change:``s3``: [``botocore``] Add support for access point arn filtering in S3 CW Request Metrics
12+
* api-change:``transcribe``: [``botocore``] This release adds support for subtitling with Amazon Transcribe batch jobs.
13+
* api-change:``sagemaker``: [``botocore``] Add API for users to retry a failed pipeline execution or resume a stopped one.
14+
* api-change:``pinpoint``: [``botocore``] This SDK release adds a new feature for Pinpoint campaigns, in-app messaging.
15+
16+
517
1.18.42
618
=======
719

‎boto3/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919

2020
__author__ = 'Amazon Web Services'
21-
__version__ = '1.18.42'
21+
__version__ = '1.18.43'
2222

2323

2424
# The default Boto3 session; autoloaded when needed.

‎scripts/ci/run-crt-tests‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env python
2+
# Don't run tests from the root repo dir.
3+
# We want to ensure we're importing from the installed
4+
# binary package not from the CWD.
5+
6+
import os
7+
import sys
8+
from subprocess import check_call
9+
10+
_dname = os.path.dirname
11+
12+
REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
13+
os.chdir(os.path.join(REPO_ROOT, "tests"))
14+
15+
16+
def run(command):
17+
return check_call(command, shell=True)
18+
19+
20+
try:
21+
import awscrt
22+
except ImportError:
23+
print("MISSING DEPENDENCY: awscrt must be installed to run the crt tests.")
24+
sys.exit(1)
25+
26+
run(f'{REPO_ROOT}/scripts/ci/run-tests unit/ functional/')

‎scripts/ci/run-integ-tests‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ from subprocess import check_call
99
_dname = os.path.dirname
1010

1111
REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
12-
os.chdir(os.path.join(REPO_ROOT, 'tests'))
12+
os.chdir(os.path.join(REPO_ROOT, "tests"))
1313

1414

1515
def run(command):
1616
return check_call(command, shell=True)
1717

1818

19-
run('nosetests --with-xunit --cover-erase --with-coverage '
20-
'--cover-package boto3 --cover-xml -v integration')
19+
run(f"{REPO_ROOT}/scripts/ci/run-tests --with-cov integration")

‎scripts/ci/run-tests‎

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,58 @@
33
# We want to ensure we're importing from the installed
44
# binary package not from the CWD.
55

6+
import argparse
67
import os
7-
import sys
88
from subprocess import check_call
99

1010
_dname = os.path.dirname
1111

1212
REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__))))
13-
os.chdir(os.path.join(REPO_ROOT, 'tests'))
13+
PACKAGE = "boto3"
14+
os.chdir(os.path.join(REPO_ROOT, "tests"))
1415

15-
args = sys.argv[1:]
16-
if not args:
17-
args = ['unit/', 'functional/']
1816

19-
check_call(['nosetests', '--with-coverage', '--cover-erase',
20-
'--cover-package', 'boto3', '--with-xunit', '--cover-xml',
21-
'-v'] + args)
17+
def run(command):
18+
return check_call(command, shell=True)
19+
20+
21+
def process_args(args):
22+
runner = args.test_runner
23+
test_args = ''
24+
if args.with_cov:
25+
test_args += (
26+
f"--with-xunit --cover-erase --with-coverage "
27+
f"--cover-package {PACKAGE} --cover-xml -v "
28+
)
29+
dirs = " ".join(args.test_dirs)
30+
31+
return runner, test_args, dirs
32+
33+
34+
if __name__ == "__main__":
35+
parser = argparse.ArgumentParser()
36+
parser.add_argument(
37+
"test_dirs",
38+
default=["unit/", "functional/"],
39+
nargs="*",
40+
help="One or more directories containing tests.",
41+
)
42+
parser.add_argument(
43+
"-r",
44+
"--test-runner",
45+
default="nosetests",
46+
help="Test runner to execute tests. Defaults to nose.",
47+
)
48+
parser.add_argument(
49+
"-c",
50+
"--with-cov",
51+
default=False,
52+
action="store_true",
53+
help="Run default test-runner with code coverage enabled.",
54+
)
55+
raw_args = parser.parse_args()
56+
test_runner, test_args, test_dirs = process_args(raw_args)
57+
58+
cmd = f"{test_runner} {test_args}{test_dirs}"
59+
print(f"Running {cmd}...")
60+
run(cmd)

‎setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ universal = 0
33

44
[metadata]
55
requires_dist =
6-
botocore>=1.21.42,<1.22.0
6+
botocore>=1.21.43,<1.22.0
77
jmespath>=0.7.1,<1.0.0
88
s3transfer>=0.5.0,<0.6.0
99

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
requires = [
17-
'botocore>=1.21.42,<1.22.0',
17+
'botocore>=1.21.43,<1.22.0',
1818
'jmespath>=0.7.1,<1.0.0',
1919
's3transfer>=0.5.0,<0.6.0'
2020
]

0 commit comments

Comments
 (0)