From 366dbc8f6ae13b9240e456979c1b73eee84cf15c Mon Sep 17 00:00:00 2001 From: Dana Benson Date: Tue, 6 Dec 2022 10:08:24 -0800 Subject: [PATCH] drop 3.6, add 3.9 and 3.10 --- .github/workflows/test_release.yml | 10 ++++---- CONTRIBUTING.md | 37 +++++++++++++++--------------- README.rst | 6 ++--- setup.py | 2 +- tox.ini | 2 +- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index c132c9e..0ac2701 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -36,10 +36,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Setup Python 3.6 - uses: actions/setup-python@v1 - with: - python-version: 3.6 - name: Setup Python 3.7 uses: actions/setup-python@v1 with: @@ -48,6 +44,10 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.8 + - name: Setup Python 3.9 + uses: actions/setup-python@v1 + with: + python-version: 3.9 - name: Install Dependencies run: pip install tox # runs unit tests for each python version @@ -58,7 +58,7 @@ jobs: - name: Integration Tests # pull requests are untrusted and do not have access to secrets needed for integ tests if: github.event_name != 'pull_request' - run: tox -e py36 -- tests/integ + run: tox -e py39 -- tests/integ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b928a8..9a86f2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,20 +8,21 @@ information to effectively respond to your bug report or contribution. ## Table of Contents -* [Table of Contents](#table-of-contents) -* [Reporting Bugs/Feature Requests](#reporting-bugsfeature-requests) -* [Contributing via Pull Requests (PRs)](#contributing-via-pull-requests-prs) - * [Setting up Your Development Environment *[Optional, but Recommended]*](#setting-up-your-development-environment-optional-but-recommended) - * [Pulling Down the Code](#pulling-down-the-code) - * [Running the Unit Tests](#running-the-unit-tests) - * [Running the Integration Tests](#running-the-integration-tests) - * [Making and Testing Your Change](#making-and-testing-your-change) - * [Committing Your Change](#committing-your-change) - * [Sending a Pull Request](#sending-a-pull-request) -* [Finding Contributions to Work On](#finding-contributions-to-work-on) -* [Code of Conduct](#code-of-conduct) -* [Security Issue Notifications](#security-issue-notifications) -* [Licensing](#licensing) +- [Contributing Guidelines](#contributing-guidelines) + - [Table of Contents](#table-of-contents) + - [Reporting Bugs/Feature Requests](#reporting-bugsfeature-requests) + - [Contributing via Pull Requests](#contributing-via-pull-requests) + - [Setting Up Your Development Environment](#setting-up-your-development-environment) + - [Pulling Down the Code](#pulling-down-the-code) + - [Running the Unit Tests](#running-the-unit-tests) + - [Running the Integration Tests](#running-the-integration-tests) + - [Making and Testing Your Change](#making-and-testing-your-change) + - [Sending a Pull Request](#sending-a-pull-request) + - [Committing Your Change](#committing-your-change) + - [Finding contributions to work on](#finding-contributions-to-work-on) + - [Code of Conduct](#code-of-conduct) + - [Security issue notifications](#security-issue-notifications) + - [Licensing](#licensing) ## Reporting Bugs/Feature Requests @@ -72,9 +73,9 @@ GitHub provides additional document on [forking a repository](https://help.githu 1. cd into the sagemaker-experiments folder: `cd sagemaker-experiments` or `cd /environment/sagemaker-experiments` 1. Run the following tox command and verify that all code checks and unit tests pass: `tox -- tests/unit` -You can also run a single test with the following command: `tox -e py36 -- -s -vv ::` +You can also run a single test with the following command: `tox -e py39 -- -s -vv ::` * Note that the coverage test will fail if you only run a single test, so make sure to surround the command with `export IGNORE_COVERAGE=-` and `unset IGNORE_COVERAGE` - * Example: `export IGNORE_COVERAGE=- ; tox -e py36 -- -s -vv tests/unit/test_experiment.py::test_processing_job_environment ; unset IGNORE_COVERAGE` + * Example: `export IGNORE_COVERAGE=- ; tox -e py39 -- -s -vv tests/unit/test_experiment.py::test_processing_job_environment ; unset IGNORE_COVERAGE` ### Running the Integration Tests @@ -82,9 +83,9 @@ Our CI system runs integration tests (the ones in the `tests/integ` directory), You should only worry about manually running any new integration tests that you write, or integration tests that test an area of code that you've modified. 1. Follow the instructions at [Set Up the AWS Command Line Interface (AWS CLI)](https://docs.aws.amazon.com/polly/latest/dg/setup-aws-cli.html). -1. To run a test, specify the test file and method you want to run per the following command: `tox -e py36 -- -s -vv ::` +1. To run a test, specify the test file and method you want to run per the following command: `tox -e py39 -- -s -vv ::` * Note that the coverage test will fail if you only run a single test, so make sure to surround the command with `export IGNORE_COVERAGE=-` and `unset IGNORE_COVERAGE` - * Example: `export IGNORE_COVERAGE=- ; tox -e py36 -- -s -vv tests/integ/test_tf_script_mode.py::test_mnist ; unset IGNORE_COVERAGE` + * Example: `export IGNORE_COVERAGE=- ; tox -e py39 -- -s -vv tests/integ/test_tf_script_mode.py::test_mnist ; unset IGNORE_COVERAGE` 1. optionally run slow tests `tox -e slow-tests` ### Making and Testing Your Change diff --git a/README.rst b/README.rst index e671265..47e692e 100644 --- a/README.rst +++ b/README.rst @@ -199,7 +199,7 @@ To run the integration tests, the following prerequisites must be met: .. code-block:: bash - tox -e py37 -- --region cn-north-1 + tox -e py39 -- --region cn-north-1 **Docker Based Integration Tests** @@ -229,10 +229,10 @@ Docker Setup .. code-block:: bash # run only docker based tests - tox -e py38 -- tests/integ -m 'docker' + tox -e py39 -- tests/integ -m 'docker' # exclude docker based tests - tox -e py38 -- tests/integ -m 'not docker' + tox -e py39 -- tests/integ -m 'not docker' diff --git a/setup.py b/setup.py index 8e22e65..89670e5 100644 --- a/setup.py +++ b/setup.py @@ -52,9 +52,9 @@ def read(fname): "Natural Language :: English", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", ], setup_requires=["setuptools_scm", "setuptools"], install_requires=required_packages, diff --git a/tox.ini b/tox.ini index 0ba26a5..69e8848 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{36,37,38} +envlist = py{37,38,39} skip_missing_interpreters = False ignore_basepython_conflict = True