Skip to content

Merge branch 'master' into zwei #1636

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.

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 29 commits into from
Jun 26, 2020
Merged

Merge branch 'master' into zwei #1636

merged 29 commits into from
Jun 26, 2020

Conversation

laurenyu
Copy link
Contributor

@laurenyu laurenyu commented Jun 26, 2020

Issue #, if available:

Description of changes:
Merging these changes from master into zwei

Testing done:

Merge Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your pull request.

General

  • I have read the CONTRIBUTING doc
  • I used the commit message format described in CONTRIBUTING
  • I have passed the region in to all S3 and STS clients that I've initialized as part of this change.
  • I have updated any necessary documentation, including READMEs and API docs (if appropriate)

Tests

  • I have added tests that prove my fix is effective or that my feature works (if appropriate)
  • I have checked that my tests are not configured for a specific region or account (if appropriate)
  • I have used unique_name_from_base to create resource names in integ tests (if appropriate)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

ci and others added 29 commits June 16, 2020 17:17
This was a workaround while waiting for rules_config to be released to PyPI.
This commit also consolidates the doc dependencies to doc/requirements.txt,
removes some unnecessary dependencies, and upgrades sphinx-rtd-theme to 0.5.0.
* prepare release v1.65.1

* update development version to v1.65.2.dev0

* doc: document that Local Mode + local code doesn't support dependencies arg (aws#1608)

* infra: upgrade Sphinx to 3.1.1 (aws#1605)

This commit also consolidates the doc dependencies to doc/requirements.txt,
removes some unnecessary dependencies, and upgrades sphinx-rtd-theme to 0.5.0.

* feature: add py38 to buildspecs

Co-authored-by: ci <ci>
Co-authored-by: Lauren Yu <[email protected]>
@sagemaker-bot
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-unit-tests
  • Commit ID: 5c6deaf
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

@metrizable metrizable left a comment

Choose a reason for hiding this comment

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

ship it!

Comment on lines +53 to 54
"and have also enabled parameter server for distributed training. "
"Distributed training with the default parameter server configuration will not "
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this have a comma after the "If" portion?

Suggested change
"and have also enabled parameter server for distributed training. "
"Distributed training with the default parameter server configuration will not "
"and have also enabled parameter server for distributed training, "
"distributed training with the default parameter server configuration will not "

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I want to keep this a pure merge commit, so fixed it in #1637

@sagemaker-bot
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-zwei-pr
  • Commit ID: 5c6deaf
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-notebook-tests
  • Commit ID: 5c6deaf
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@sagemaker-bot
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: sagemaker-python-sdk-local-mode-tests
  • Commit ID: 5c6deaf
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@laurenyu laurenyu merged commit 5c6deaf into aws:zwei Jun 26, 2020
@laurenyu laurenyu deleted the merge-master branch June 26, 2020 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants