Skip to content

Commit 52f9f66

Browse files
authored
Merge branch 'zwei' into v2-compability-tests
2 parents fa86f39 + 75198c3 commit 52f9f66

File tree

206 files changed

+8405
-9106
lines changed

Some content is hidden

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

206 files changed

+8405
-9106
lines changed

.coveragerc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[run]
2-
omit = sagemaker/tests/*, sagemaker/tensorflow/tensorflow_serving/*
2+
concurrency = threading
3+
omit = sagemaker/tests/*
4+
timid = True

.github/ISSUE_TEMPLATE/feature_request.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
name: Feature request
3-
about: Suggest an improvement for this library
3+
about: Suggest new functionality for this library
44
title: ''
55
labels: ''
66
assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
10+
**Describe the feature you'd like**
11+
A clear and concise description of the functionality you want.
1212

13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
13+
**How would this feature be used? Please describe.**
14+
A clear and concise description of the use case for this feature. Please provide an example, if possible.
1515

1616
**Describe alternatives you've considered**
1717
A clear and concise description of any alternative solutions or features you've considered.

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _Put an `x` in the boxes that apply. You can also fill these out after creating
1212

1313
- [ ] I have read the [CONTRIBUTING](https://github.com/aws/sagemaker-python-sdk/blob/master/CONTRIBUTING.md) doc
1414
- [ ] I used the commit message format described in [CONTRIBUTING](https://github.com/aws/sagemaker-python-sdk/blob/master/CONTRIBUTING.md#committing-your-change)
15-
- [ ] I have passed the region in to any/all clients that I've initialized as part of this change.
15+
- [ ] I have passed the region in to all S3 and STS clients that I've initialized as part of this change.
1616
- [ ] I have updated any necessary documentation, including [READMEs](https://github.com/aws/sagemaker-python-sdk/blob/master/README.rst) and [API docs](https://github.com/aws/sagemaker-python-sdk/tree/master/doc) (if appropriate)
1717

1818
#### Tests

.pylintrc

+10-9
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,22 @@ confidence=
7676
# --disable=W"
7777
disable=
7878
C0330, # Black disagrees with and explicitly violates this: https://github.com/python/black/issues/48
79-
too-many-locals,
79+
abstract-method, # TODO: Fix abstract methods
8080
arguments-differ,
81-
too-many-lines,
81+
cyclic-import, # TODO: Resolve cyclic imports
8282
fixme,
83-
too-many-arguments,
8483
invalid-name,
85-
too-many-instance-attributes,
86-
len-as-condition, # TODO: Enable this check once pylint 2.4.0 is released and consumed due to the fix in https://github.com/PyCQA/pylint/issues/2684
8784
import-error, # Since we run Pylint before any of our builds in tox, this will always fail
88-
protected-access, # TODO: Fix access
89-
abstract-method, # TODO: Fix abstract methods
90-
useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
91-
cyclic-import, # TODO: Resolve cyclic imports
85+
import-outside-toplevel,
9286
no-self-use, # TODO: Convert methods to functions where appropriate
87+
protected-access, # TODO: Fix access
88+
signature-differs, # TODO: fix kwargs
89+
too-many-arguments,
9390
too-many-branches, # TODO: Simplify or ignore as appropriate
91+
too-many-instance-attributes,
92+
too-many-lines,
93+
too-many-locals,
94+
useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
9495

9596
[REPORTS]
9697
# Set the output format. Available formats are text, parseable, colorized, msvs

CHANGELOG.md

+129
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,134 @@
11
# Changelog
22

3+
## v1.66.0 (2020-06-25)
4+
5+
### Features
6+
7+
* add 3.8 as supported python version
8+
9+
### Testing and Release Infrastructure
10+
11+
* upgrade airflow to latest stable version
12+
* update feature request issue template
13+
14+
## v1.65.1.post1 (2020-06-24)
15+
16+
### Testing and Release Infrastructure
17+
18+
* add py38 to buildspecs
19+
20+
## v1.65.1.post0 (2020-06-22)
21+
22+
### Documentation Changes
23+
24+
* document that Local Mode + local code doesn't support dependencies arg
25+
26+
### Testing and Release Infrastructure
27+
28+
* upgrade Sphinx to 3.1.1
29+
30+
## v1.65.1 (2020-06-18)
31+
32+
### Bug Fixes and Other Changes
33+
34+
* remove include_package_data=True from setup.py
35+
36+
### Documentation Changes
37+
38+
* add some clarification to Processing docs
39+
40+
### Testing and Release Infrastructure
41+
42+
* specify what kinds of clients in PR template
43+
44+
## v1.65.0 (2020-06-17)
45+
46+
### Features
47+
48+
* support for describing hyperparameter tuning job
49+
50+
### Bug Fixes and Other Changes
51+
52+
* update distributed GPU utilization warning message
53+
* set logs to False if wait is False in AutoML
54+
* workflow passing spot training param to training job
55+
56+
## v2.0.0.rc0 (2020-06-17)
57+
58+
### Breaking Changes
59+
60+
* remove estimator parameters for TF legacy mode
61+
* remove legacy `TensorFlowModel` and `TensorFlowPredictor` classes
62+
* force image URI to be passed for legacy TF images
63+
* rename `sagemaker.tensorflow.serving` to `sagemaker.tensorflow.model`
64+
* require `framework_version` and `py_version` for framework estimator and model classes
65+
* change `Model` parameter order to make `model_data` optional
66+
67+
### Bug Fixes and Other Changes
68+
69+
* add v2 migration tool
70+
71+
### Documentation Changes
72+
73+
* update TF documentation to reflect breaking changes and how to upgrade
74+
* start v2 usage and migration documentation
75+
76+
### Testing and Release Infrastructure
77+
78+
* remove scipy from dependencies
79+
* remove TF from optional dependencies
80+
81+
## v1.64.1 (2020-06-16)
82+
83+
### Bug Fixes and Other Changes
84+
85+
* include py38 tox env and some dependency upgrades
86+
87+
## v1.64.0 (2020-06-15)
88+
89+
### Features
90+
91+
* add support for SKLearn 0.23
92+
93+
## v1.63.0 (2020-06-12)
94+
95+
### Features
96+
97+
* Allow selecting inference response content for automl generated models
98+
* Support for multi variant endpoint invocation with target variant param
99+
100+
### Documentation Changes
101+
102+
* improve docstring and remove unavailable links
103+
104+
## v1.62.0 (2020-06-11)
105+
106+
### Features
107+
108+
* Support for multi variant endpoint invocation with target variant param
109+
110+
### Bug Fixes and Other Changes
111+
112+
* Revert "feature: Support for multi variant endpoint invocation with target variant param (#1571)"
113+
* make instance_type optional for prepare_container_def
114+
* docs: workflows navigation
115+
116+
### Documentation Changes
117+
118+
* fix typo in MXNet documentation
119+
120+
## v1.61.0 (2020-06-09)
121+
122+
### Features
123+
124+
* Use boto3 DEFAULT_SESSION when no boto3 session specified.
125+
126+
### Bug Fixes and Other Changes
127+
128+
* remove v2 Session warnings
129+
* upgrade smdebug-rulesconfig to 0.1.4
130+
* explicitly handle arguments in create_model for sklearn and xgboost
131+
3132
## v1.60.2 (2020-05-29)
4133

5134
### Bug Fixes and Other Changes

README.rst

+13-11
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ Supported Python Versions
9393

9494
SageMaker Python SDK is tested on:
9595

96-
- Python 2.7
9796
- Python 3.6
9897
- Python 3.7
98+
- Python 3.8
9999

100100
AWS Permissions
101101
~~~~~~~~~~~~~~~
@@ -121,10 +121,9 @@ You can install the libraries needed to run the tests by running :code:`pip inst
121121

122122
**Unit tests**
123123

124-
125124
We run unit tests with tox, which is a program that lets you run unit tests for multiple Python versions, and also make sure the
126-
code fits our style guidelines. We run tox with Python 2.7, 3.6 and 3.7, so to run unit tests
127-
with the same configuration we do, you'll need to have interpreters for Python 2.7, Python 3.6 and Python 3.7 installed.
125+
code fits our style guidelines. We run tox with `all of our supported Python versions <#supported-python-versions>`_, so to run unit tests
126+
with the same configuration we do, you need to have interpreters for those Python versions installed.
128127

129128
To run the unit tests with tox, run:
130129

@@ -164,23 +163,26 @@ You can also run them in parallel:
164163
Building Sphinx docs
165164
~~~~~~~~~~~~~~~~~~~~
166165

167-
Setup a Python environment with ``sphinx`` and ``sagemaker``:
166+
Setup a Python environment, and install the dependencies listed in ``doc/requirements.txt``:
168167

169168
::
170169

170+
# conda
171171
conda create -n sagemaker python=3.7
172172
conda activate sagemaker
173-
conda install sphinx==2.2.2
174-
pip install sagemaker --user
173+
conda install --file doc/requirements.txt
175174

176-
Install the Read The Docs theme:
175+
# pip
176+
pip install -r doc/requirements.txt
177177

178-
::
179178

180-
pip install sphinx_rtd_theme --user
179+
Clone/fork the repo, and install your local version:
180+
181+
::
181182

183+
pip install --upgrade .
182184

183-
Clone/fork the repo, ``cd`` into the ``sagemaker-python-sdk/doc`` directory and run:
185+
Then ``cd`` into the ``sagemaker-python-sdk/doc`` directory and run:
184186

185187
::
186188

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.60.3.dev0
1+
2.0.0.rc0

buildspec-localmodetests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ phases:
1111

1212
# local mode tests
1313
- start_time=`date +%s`
14-
- 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"
15-
- ./ci-scripts/displaytime.sh 'py27,py37 local mode' $start_time
14+
- execute-command-if-has-matching-changes "tox -e 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"
15+
- ./ci-scripts/displaytime.sh 'py38 local mode' $start_time

buildspec-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ phases:
1818
# run unit tests
1919
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
2020
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=
21-
tox -e py27,py36,py37 -- tests/unit
21+
tox -e py36,py37,py38 -- tests/unit
2222

2323
# run a subset of the integration tests
2424
- IGNORE_COVERAGE=- tox -e py36 -- tests/integ -m canary_quick -n 64 --boxed --reruns 2

buildspec-unittests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ phases:
1818
- start_time=`date +%s`
1919
- AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN=
2020
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI= AWS_DEFAULT_REGION=
21-
tox -e py27,py36,py37 --parallel all -- tests/unit
22-
- ./ci-scripts/displaytime.sh 'py27,py36,py37 unit' $start_time
21+
tox -e py36,py37,py38 --parallel all -- tests/unit
22+
- ./ci-scripts/displaytime.sh 'py36,py37,py38 unit' $start_time

buildspec.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ phases:
1111

1212
# run integration tests
1313
- start_time=`date +%s`
14-
- 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"
14+
- 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"
1515
- ./ci-scripts/displaytime.sh 'build queue' $start_time
1616

1717
- start_time=`date +%s`
1818
- |
19-
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"
20-
- ./ci-scripts/displaytime.sh 'py37 tests/integ' $start_time
19+
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"
20+
- ./ci-scripts/displaytime.sh 'py38 tests/integ' $start_time
2121

2222
post_build:
2323
finally:

doc/amazon_sagemaker_model_monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Using ``DefaultMonitor.create_monitoring_schedule()``, you can create a model mo
125125
126126
my_monitor.create_monitoring_schedule(
127127
monitor_schedule_name='my-monitoring-schedule',
128-
endpoint_input=predictor.endpoint,
128+
endpoint_input=predictor.endpoint_name,
129129
statistics=my_monitor.baseline_statistics(),
130130
constraints=my_monitor.suggested_constraints(),
131131
schedule_cron_expression=CronExpressionGenerator.hourly(),

0 commit comments

Comments
 (0)