Skip to content

Commit 338a20e

Browse files
committed
Merge branch 'main_sync_current' into main_sync
2 parents 8ee74da + 02a6f17 commit 338a20e

File tree

7 files changed

+34
-13
lines changed

7 files changed

+34
-13
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,22 @@ env:
2929
CI_DEVICE_ADVISOR: ${{ secrets.AWS_CI_DEVICE_ADVISOR_ROLE }}
3030

3131
jobs:
32+
all-python-versions:
33+
runs-on: ubuntu-latest
34+
permissions:
35+
id-token: write # This is required for requesting the JWT
36+
steps:
37+
- name: configure AWS credentials (containers)
38+
uses: aws-actions/configure-aws-credentials@v1
39+
with:
40+
role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
41+
aws-region: ${{ env.AWS_DEFAULT_REGION }}
42+
- name: Build ${{ env.PACKAGE_NAME }}
43+
# There's hackery in builder.json so that when we run on manylinux
44+
# we build and test using every version of python that we support.
45+
run: |
46+
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
47+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-manylinux2014-x64 build -p ${{ env.PACKAGE_NAME }}
3248
3349
al2:
3450
runs-on: ubuntu-latest
@@ -69,7 +85,7 @@ jobs:
6985
run: |
7086
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
7187
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
72-
88+
7389
7490
windows:
7591
runs-on: windows-latest

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ to Python by the `awscrt` package ([PyPI](https://pypi.org/project/awscrt/)) ([G
3131
## Installation
3232

3333
### Minimum Requirements
34-
* Python 3.6+
34+
* Python 3.7+
3535

3636
[Step-by-step instructions](./documents/PREREQUISITES.md)
3737

builder.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
},
2424
"manylinux": {
2525
"post_build_steps": [
26+
["echo", "------ Python 3.11 ------"],
27+
["/opt/python/cp311-cp311/bin/python", "-m", "pip", "install", "--upgrade", "pip", "setuptools"],
28+
["/opt/python/cp311-cp311/bin/python", "-m", "pip", "install", ".", "--verbose"],
29+
["/opt/python/cp311-cp311/bin/python", "-m", "pip", "install", "boto3", "autopep8"],
30+
["/opt/python/cp311-cp311/bin/python", "-m", "unittest", "discover", "--verbose"],
31+
["echo", "------ Python 3.10 ------"],
32+
["/opt/python/cp310-cp310/bin/python", "-m", "pip", "install", "--upgrade", "pip", "setuptools"],
33+
["/opt/python/cp310-cp310/bin/python", "-m", "pip", "install", ".", "--verbose"],
34+
["/opt/python/cp310-cp310/bin/python", "-m", "pip", "install", "boto3", "autopep8"],
35+
["/opt/python/cp310-cp310/bin/python", "-m", "unittest", "discover", "--verbose"],
2636
["echo", "------ Python 3.9 ------"],
2737
["/opt/python/cp39-cp39/bin/python", "-m", "pip", "install", "--upgrade", "pip", "setuptools"],
2838
["/opt/python/cp39-cp39/bin/python", "-m", "pip", "install", ".", "--verbose"],
@@ -37,12 +47,7 @@
3747
["/opt/python/cp37-cp37m/bin/python", "-m", "pip", "install", "--upgrade", "pip", "setuptools"],
3848
["/opt/python/cp37-cp37m/bin/python", "-m", "pip", "install", ".", "--verbose"],
3949
["/opt/python/cp37-cp37m/bin/python", "-m", "pip", "install", "boto3", "autopep8"],
40-
["/opt/python/cp37-cp37m/bin/python", "-m", "unittest", "discover", "--verbose"],
41-
["echo", "------ Python 3.6 ------"],
42-
["/opt/python/cp36-cp36m/bin/python", "-m", "pip", "install", "--upgrade", "pip", "setuptools"],
43-
["/opt/python/cp36-cp36m/bin/python", "-m", "pip", "install", ".", "--verbose"],
44-
["/opt/python/cp36-cp36m/bin/python", "-m", "pip", "install", "boto3", "autopep8"],
45-
["/opt/python/cp36-cp36m/bin/python", "-m", "unittest", "discover", "--verbose"]
50+
["/opt/python/cp37-cp37m/bin/python", "-m", "unittest", "discover", "--verbose"]
4651
],
4752
"run_tests": false,
4853
"_comment": "manylinux has all its own build steps, turn off 'tests' which is where normal build steps are declared. using data to program sucks"

continuous-delivery/publish_to_prod_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: 0.2
2-
# this image assumes Ubuntu 14.04 base image
2+
# this image assumes Ubuntu base image
33
phases:
44
install:
55
commands:

continuous-delivery/publish_to_test_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: 0.2
2-
# this image assumes Ubuntu 14.04 base image
2+
# this image assumes Ubuntu base image
33
phases:
44
install:
55
commands:

documents/PREREQUISITES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PREREQUISITES
22

3-
## Python 3.6 of higher
3+
## Python 3.7 of higher
44

55
How you install Python varies from platform to platform. Below are the instructions for Windows, MacOS, and Linux:
66

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _load_version():
4040
"Operating System :: OS Independent",
4141
],
4242
install_requires=[
43-
'awscrt==0.14.7',
43+
'awscrt==0.15.2',
4444
],
45-
python_requires='>=3.6',
45+
python_requires='>=3.7',
4646
)

0 commit comments

Comments
 (0)