Skip to content

infra: add py38 to buildspecs #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 23, 2020
Merged

infra: add py38 to buildspecs #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84db74d
prepare release v1.65.1
Jun 18, 2020
b0024ce
update development version to v1.65.2.dev0
Jun 18, 2020
71f43c5
doc: document that Local Mode + local code doesn't support dependenci…
laurenyu Jun 18, 2020
1c3e74b
infra: upgrade Sphinx to 3.1.1 (#1605)
laurenyu Jun 18, 2020
7f8baaf
Merge remote-tracking branch 'aws/master' into include-py38-buildspecs
metrizable Jun 19, 2020
d1e8951
feature: add py38 to buildspecs
metrizable Jun 19, 2020
64c7363
Merge branch 'master' into include-py38-buildspecs
metrizable Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildspec-localmodetests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ phases:

# local mode tests
- start_time=`date +%s`
- execute-command-if-has-matching-changes "tox -e py27,py37 -- tests/integ -m local_mode --durations 50" "tests/integ" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec-localmodetests.yml"
- ./ci-scripts/displaytime.sh 'py27,py37 local mode' $start_time
- execute-command-if-has-matching-changes "tox -e py27,py38 -- tests/integ -m local_mode --durations 50" "tests/integ" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec-localmodetests.yml"
- ./ci-scripts/displaytime.sh 'py27,py38 local mode' $start_time
2 changes: 1 addition & 1 deletion buildspec-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ phases:
# run unit tests
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=
tox -e py27,py36,py37 -- tests/unit
tox -e py27,py36,py37,py38 -- tests/unit

# run a subset of the integration tests
- IGNORE_COVERAGE=- tox -e py36 -- tests/integ -m canary_quick -n 64 --boxed --reruns 2
Expand Down
4 changes: 2 additions & 2 deletions buildspec-unittests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ phases:
- start_time=`date +%s`
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=
tox -e py27,py36,py37 --parallel all -- tests/unit
- ./ci-scripts/displaytime.sh 'py27,py36,py37 unit' $start_time
tox -e py27,py36,py37,py38 --parallel all -- tests/unit
- ./ci-scripts/displaytime.sh 'py27,py36,py37,py38 unit' $start_time
6 changes: 3 additions & 3 deletions buildspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ phases:

# run integration tests
- start_time=`date +%s`
- execute-command-if-has-matching-changes "python3.7 -u ci-scripts/queue_build.py" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
- execute-command-if-has-matching-changes "python3.8 -u ci-scripts/queue_build.py" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
- ./ci-scripts/displaytime.sh 'build queue' $start_time

- start_time=`date +%s`
- |
execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py37 -- tests/integ -m \"not local_mode\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
- ./ci-scripts/displaytime.sh 'py37 tests/integ' $start_time
execute-command-if-has-matching-changes "env -u AWS_DEFAULT_REGION tox -e py38 -- tests/integ -m \"not local_mode\" -n 512 --reruns 3 --reruns-delay 5 --durations 50 --boto-config '{\"region_name\": \"us-east-2\"}'" "tests/integ" "tests/scripts" "tests/data" "tests/conftest.py" "tests/__init__.py" "src/*.py" "setup.py" "setup.cfg" "buildspec.yml"
- ./ci-scripts/displaytime.sh 'py38 tests/integ' $start_time

post_build:
finally:
Expand Down
6 changes: 3 additions & 3 deletions tests/integ/test_model_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

INTEG_TEST_MONITORING_OUTPUT_BUCKET = "integ-test-monitoring-output-bucket"

FIVE_MINUTE_CRON_EXPRESSION = "cron(0/5 * ? * * *)"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

5 min is unsupported: https://docs.aws.amazon.com/sagemaker/latest/APIReference/API_ScheduleConfig.html

TWO_HOUR_CRON_EXPRESSION = "cron(0 0/2 ? * * *)"


@pytest.fixture(scope="module")
Expand Down Expand Up @@ -150,7 +150,7 @@ def default_monitoring_schedule_name(sagemaker_session, output_kms_key, volume_k
output_s3_uri=output_s3_uri,
statistics=statistics,
constraints=constraints,
schedule_cron_expression=FIVE_MINUTE_CRON_EXPRESSION,
schedule_cron_expression=TWO_HOUR_CRON_EXPRESSION,
enable_cloudwatch_metrics=ENABLE_CLOUDWATCH_METRICS,
)

Expand Down Expand Up @@ -210,7 +210,7 @@ def byoc_monitoring_schedule_name(sagemaker_session, output_kms_key, volume_kms_
output=MonitoringOutput(source="/opt/ml/processing/output", destination=output_s3_uri),
statistics=statistics,
constraints=constraints,
schedule_cron_expression=FIVE_MINUTE_CRON_EXPRESSION,
schedule_cron_expression=TWO_HOUR_CRON_EXPRESSION,
)

_wait_for_schedule_changes_to_apply(monitor=my_byoc_monitor)
Expand Down