Skip to content

Commit 1c514fa

Browse files
authored
Merge branch 'master' into use-custom-exception-subclass
2 parents d2fa420 + d3892fb commit 1c514fa

File tree

115 files changed

+11062
-6620
lines changed

Some content is hidden

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

115 files changed

+11062
-6620
lines changed

.pylintrc

+9-22
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ profile=no
1919
# paths.
2020
ignore=CVS,tensorflow_serving
2121

22-
# Add files or directories matching the regex patterns to the blacklist. The
23-
# regex matches against base names, not paths.
22+
# Add files or directories matching the regex patterns to the blacklist.
23+
# The regex matches against base names, not paths.
24+
# Regex patterns can be comma(and newline)-separated
2425
ignore-patterns=
26+
.*_pb2.py, # Ignore all files generated by the protocol buffer compiler
2527

2628
# Pickle collected data for later comparisons.
2729
persistent=yes
@@ -81,30 +83,14 @@ disable=
8183
too-many-arguments,
8284
invalid-name,
8385
too-many-instance-attributes,
84-
line-too-long, # We let Flake8 take care of this # TODO: Fix these and stop relying on flake8
8586
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
86-
import-error, # TODO: Fix import errors
87-
attribute-defined-outside-init, # TODO: Fix scope
87+
import-error, # Since we run Pylint before any of our builds in tox, this will always fail
8888
protected-access, # TODO: Fix access
8989
abstract-method, # TODO: Fix abstract methods
90-
unidiomatic-typecheck, # TODO: Fix typechecks
91-
wrong-import-order, # TODO: Fix import order
92-
no-else-return, # TODO: Remove unnecessary elses
93-
useless-object-inheritance, # TODO: Remove unnecessary imports
90+
useless-object-inheritance, # TODO: Enable this check and fix code once Python 2 is no longer supported.
9491
cyclic-import, # TODO: Resolve cyclic imports
95-
no-else-raise, # TODO: Remove unnecessary elses
9692
no-self-use, # TODO: Convert methods to functions where appropriate
97-
inconsistent-return-statements, # TODO: Make returns consistent
98-
consider-merging-isinstance, # TODO: Merge isinstance where appropriate
99-
consider-using-in, # TODO: Consider merging comparisons with "in"
100-
simplifiable-if-expression, # TODO: Simplify expressions
101-
too-many-public-methods, # TODO: Resolve
102-
ungrouped-imports, # TODO: Group imports
103-
consider-using-ternary, # TODO: Consider ternary expressions
104-
chained-comparison, # TODO: Simplify chained comparison between operands
105-
simplifiable-if-statement, # TODO: Simplify ifs
10693
too-many-branches, # TODO: Simplify or ignore as appropriate
107-
missing-docstring, # TODO: Fix missing docstring
10894

10995
[REPORTS]
11096
# Set the output format. Available formats are text, parseable, colorized, msvs
@@ -241,8 +227,9 @@ max-nested-blocks=5
241227
# Maximum number of characters on a single line.
242228
max-line-length=100
243229

244-
# Regexp for a line that is allowed to be longer than the limit.
245-
ignore-long-lines=^\s*(# )?<?https?://\S+>?$
230+
# Regexp for a line that is allowed to be longer than the limit. Can only be a single regex.
231+
# The following matches any semblance of a url of any sort.
232+
ignore-long-lines=^\s*.*(# )?(<?https?:\/\/)?[-a-zA-Z0-9@:%%._\+~#=><]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%%_\+.~#?&\/\/=<>]*\S*>?$
246233

247234
# Allow the body of an if to be on the same line as the test if there is no
248235
# else.

CHANGELOG.md

+44
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,49 @@
11
# Changelog
22

3+
## v1.34.0 (2019-07-18)
4+
5+
### Features
6+
7+
* Git integration for CodeCommit
8+
* deal with credentials for Git support for GitHub
9+
10+
### Bug fixes and other changes
11+
12+
* modify TODO on disabled Pylint check
13+
* enable consider-using-ternary Pylint check
14+
* enable chained-comparison Pylint check
15+
* enable too-many-public-methods Pylint check
16+
* enable consider-using-in Pylint check
17+
* set num_processes_per_host only if provided by user
18+
* fix attach for 1P algorithm estimators
19+
* enable ungrouped-imports Pylint check
20+
* enable wrong-import-order Pylint check
21+
* enable attribute-defined-outside-init Pylint check
22+
* enable consider-merging-isinstance Pylint check
23+
* enable inconsistent-return-statements Pylint check
24+
* enable simplifiable-if-expression pylint checks
25+
* fix list serialization for 1P algos
26+
* enable no-else-return and no-else-raise pylint checks
27+
* enable unidiomatic-typecheck pylint check
28+
29+
## v1.33.0 (2019-07-10)
30+
31+
### Features
32+
33+
* git support for hosting models
34+
* allow custom model name during deploy
35+
36+
### Bug fixes and other changes
37+
38+
* remove TODO comment on import-error Pylint check
39+
* enable wrong-import-position pylint check
40+
* Revert "change: enable wrong-import-position pylint check (#907)"
41+
* enable signature-differs pylint check
42+
* enable wrong-import-position pylint check
43+
* enable logging-not-lazy pylint check
44+
* reset default output path in Transformer.transform
45+
* Add ap-northeast-1 to Neo algorithms region map
46+
347
## v1.32.2 (2019-07-08)
448

549
### Bug fixes and other changes

CONTRIBUTING.md

+17
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@ reported the issue. Please try to include as much information as you can. Detail
1919
* Any modifications you've made relevant to the bug
2020
* A description of your environment or deployment
2121

22+
## Setting up your development environment [optional, but recommended]
23+
24+
* Set up the Cloud9 environment:
25+
* Instance type: You'll need at least 4 GB of RAM to avoid running into memory issues. We recommend at least a t3.medium to run the unit tests. Larger hosts will reduce the chance of encountering resource limits.
26+
* Follow the instructions at [Creating a Cloud9 EC2 Environment](https://docs.aws.amazon.com/cloud9/latest/user-guide/create-environment.html#create-environment-main) to set up a Cloud9 EC2 environment
27+
* Expand the storage of the EC2 instance from 10GB to 20GB
28+
* Because you'll need a minimum of 11GB of disk storage on the EC2 instance to run the package's unit tests, you'll need to expand your EC2 volume size. We recommend at least 20GB. A larger volume will reduce the chance of encountering resource limits.
29+
* Follow the instructions at [Modifying an EBS Volume Using Elastic Volumes (Console)](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/requesting-ebs-volume-modifications.html#modify-ebs-volume) to increase the EBS volume size associated with the newly created EC2 instance.
30+
* Wait 5-10min for the new EBS volume increase to take effect.
31+
* Allow EC2 to claim the additional space by stopping and then starting your EC2 host.
32+
* Create a fork of this package on GitHub. You should end up with a fork at `https://github.com/<username>/sagemaker-python-sdk`
33+
* Follow the instructions at [Fork a repo](https://help.github.com/en/articles/fork-a-repo) to fork a GitHub repository.
34+
* In the Cloud9 UI, pull down this package by clicking on "Clone from Github" or running the following command in the Cloud9 terminal: `git clone https://github.com/<username>/sagemaker-python-sdk` where <username> is your github username.
35+
* Install tox using `pip install tox`
36+
* Install coverage using `pip install .[test]`
37+
* cd into the sagemaker-python-sdk package: `cd sagemaker-python-sdk` or `cd /environment/sagemaker-python-sdk`
38+
* Run the following tox command and verify that all unit tests pass: `tox tests/unit`
2239

2340
## Contributing via Pull Requests
2441
Contributions via pull requests are much appreciated.

README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ MXNet SageMaker Estimators
173173

174174
By using MXNet SageMaker Estimators, you can train and host MXNet models on Amazon SageMaker.
175175

176-
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``.
176+
Supported versions of MXNet: ``0.12.1``, ``1.0.0``, ``1.1.0``, ``1.2.1``, ``1.3.0``, ``1.4.0``, ``1.4.1``.
177177

178-
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``.
178+
Supported versions of MXNet for Elastic Inference: ``1.3.0``, ``1.4.0``, ``1.4.1``.
179179

180180
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
181181

@@ -191,7 +191,7 @@ By using TensorFlow SageMaker Estimators, you can train and host TensorFlow mode
191191

192192
Supported versions of TensorFlow: ``1.4.1``, ``1.5.0``, ``1.6.0``, ``1.7.0``, ``1.8.0``, ``1.9.0``, ``1.10.0``, ``1.11.0``, ``1.12.0``, ``1.13.1``.
193193

194-
Supported versions of TensorFlow for Elastic Inference: ``1.11.0``, ``1.12.0``.
194+
Supported versions of TensorFlow for Elastic Inference: ``1.11.0``, ``1.12.0``, ``1.13.0``
195195

196196
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
197197

@@ -221,7 +221,7 @@ PyTorch SageMaker Estimators
221221

222222
With PyTorch SageMaker Estimators, you can train and host PyTorch models on Amazon SageMaker.
223223

224-
Supported versions of PyTorch: ``0.4.0``, ``1.0.0``.
224+
Supported versions of PyTorch: ``0.4.0``, ``1.0.0``, ``1.1.0``.
225225

226226
We recommend that you use the latest supported version, because that's where we focus most of our development efforts.
227227

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.32.3.dev0
1+
1.34.1.dev0

doc/conf.py

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
1111
# ANY KIND, either express or implied. See the License for the specific
1212
# language governing permissions and limitations under the License.
13+
"""Placeholder docstring"""
1314
from __future__ import absolute_import
1415

1516
import os
@@ -22,6 +23,10 @@
2223
class Mock(MagicMock):
2324
@classmethod
2425
def __getattr__(cls, name):
26+
"""
27+
Args:
28+
name:
29+
"""
2530
if name == "__version__":
2631
return "1.4.0"
2732
else:
@@ -55,6 +60,7 @@ def __getattr__(cls, name):
5560
"sphinx.ext.coverage",
5661
"sphinx.ext.autosummary",
5762
"sphinx.ext.napoleon",
63+
"sphinx.ext.autosectionlabel",
5864
]
5965

6066
# Add any paths that contain templates here, relative to this directory.
@@ -90,3 +96,6 @@ def __getattr__(cls, name):
9096

9197
# autosummary
9298
autosummary_generate = True
99+
100+
# autosectionlabel
101+
autosectionlabel_prefix_document = True

0 commit comments

Comments
 (0)