From 50e65d82a493d57dc0a148db1cc95a88bd07c7bd Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Tue, 24 Jan 2023 10:37:27 -0800 Subject: [PATCH 1/7] add python 3.10, drop python 3.7 --- .github/workflows/continuous_integration.yml | 14 +++++++------- setup.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 9e05350..94f7d31 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -50,7 +50,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -79,7 +79,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -110,7 +110,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -141,7 +141,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -172,7 +172,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -203,7 +203,7 @@ jobs: ref: "refs/pull/${{ github.event.number }}/merge" - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Check if changes beside docs uses: dorny/paths-filter@v2 id: changes @@ -298,7 +298,7 @@ jobs: uses: ./.github/actions/setup-env-vars - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - uses: r-lib/actions/setup-pandoc@v2 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/setup.py b/setup.py index 73fd5d3..c7c9d49 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ AUTOGLUON = "autogluon" CLOUD = "cloud" -PYTHON_REQUIRES = ">=3.7, <3.10" +PYTHON_REQUIRES = ">=3.8, <3.11" def create_version_file(*, version): @@ -108,7 +108,7 @@ def default_setup_args(*, version): install_requires = [ # common module provides utils with stable api across minor version # TODO: update to 0.7 when 0.7 dlc container available in sagemaker - "autogluon.common>=0.6,<1.0", + "autogluon.common>=0.7,<1.0", # <2 because unlikely to introduce breaking changes in minor releases. >=1.10 because 1.10 is 3 years old, no need to support older "boto3>=1.10,<2.0", "numpy>=1.21,<1.27", From 62b5fc1736e0b6bef5c0d15446dbf2393daca14a Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 17 Feb 2023 19:01:47 +0000 Subject: [PATCH 2/7] update common dependency --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index c7c9d49..a42b584 100644 --- a/setup.py +++ b/setup.py @@ -107,7 +107,6 @@ def default_setup_args(*, version): install_requires = [ # common module provides utils with stable api across minor version - # TODO: update to 0.7 when 0.7 dlc container available in sagemaker "autogluon.common>=0.7,<1.0", # <2 because unlikely to introduce breaking changes in minor releases. >=1.10 because 1.10 is 3 years old, no need to support older "boto3>=1.10,<2.0", From e603ce136f33710c51f56b049b7c1bbb668e147d Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 24 Mar 2023 18:08:30 +0000 Subject: [PATCH 3/7] 0.7.0 --- .github/workflows/continuous_integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 94f7d31..a155f57 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -65,7 +65,7 @@ jobs: test_general_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: @@ -96,7 +96,7 @@ jobs: test_tabular_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: @@ -127,7 +127,7 @@ jobs: test_text_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: @@ -158,7 +158,7 @@ jobs: test_image_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: @@ -189,7 +189,7 @@ jobs: test_multimodal_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: @@ -220,7 +220,7 @@ jobs: test_timeseries_cloud: strategy: matrix: - AG_VERSION: ["source", "0.6.2"] + AG_VERSION: ["source", "0.7.0"] needs: cloud_lint_check runs-on: ubuntu-latest steps: From 4ca0802de7a4a37d2fa25e1ecad08166477934d0 Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 24 Mar 2023 18:42:44 +0000 Subject: [PATCH 4/7] fix --- tests/unittests/tabular/test_tabular.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unittests/tabular/test_tabular.py b/tests/unittests/tabular/test_tabular.py index 19ff5bd..a797d66 100644 --- a/tests/unittests/tabular/test_tabular.py +++ b/tests/unittests/tabular/test_tabular.py @@ -59,6 +59,6 @@ def test_tabular_tabular_text_image(test_helper, framework_version): custom_image_uri=inference_custom_image_uri, ), ) - local_predictor = cloud_predictor.to_local_predictor(require_version_match=False) + local_predictor = cloud_predictor.to_local_predictor(require_version_match=False, require_py_version_match=False) models = local_predictor.get_model_names() assert "ImagePredictor" in models From 740b1541f30ae569267249cfc72d1316a0df01c8 Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 24 Mar 2023 19:42:09 +0000 Subject: [PATCH 5/7] black --- tests/unittests/tabular/test_tabular.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unittests/tabular/test_tabular.py b/tests/unittests/tabular/test_tabular.py index a797d66..4a50b5c 100644 --- a/tests/unittests/tabular/test_tabular.py +++ b/tests/unittests/tabular/test_tabular.py @@ -59,6 +59,8 @@ def test_tabular_tabular_text_image(test_helper, framework_version): custom_image_uri=inference_custom_image_uri, ), ) - local_predictor = cloud_predictor.to_local_predictor(require_version_match=False, require_py_version_match=False) + local_predictor = cloud_predictor.to_local_predictor( + require_version_match=False, require_py_version_match=False + ) models = local_predictor.get_model_names() assert "ImagePredictor" in models From d802fb449dc4b5aef1ad3130f34cb310fcc5951b Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 24 Mar 2023 20:31:43 +0000 Subject: [PATCH 6/7] fix --- .github/workflow_scripts/test_cloud.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflow_scripts/test_cloud.sh b/.github/workflow_scripts/test_cloud.sh index 89460d0..430a566 100755 --- a/.github/workflow_scripts/test_cloud.sh +++ b/.github/workflow_scripts/test_cloud.sh @@ -7,6 +7,8 @@ set -ex source $(dirname "$0")/env_setup.sh +install_cloud_test + if [ $MODULE = "tabular" ] then install_tabular $AG_VERSION @@ -15,6 +17,4 @@ then install_multimodal $AG_VERSION fi -install_cloud_test - python3 -m pytest -n 2 --junitxml=results.xml tests/unittests/$MODULE/ --framework_version $AG_VERSION From 8bdf843c94f7dfce1b59c2d49e8337709fe3949c Mon Sep 17 00:00:00 2001 From: Weisu Yin Date: Fri, 24 Mar 2023 22:38:43 +0000 Subject: [PATCH 7/7] fix --- .github/workflows/continuous_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index a155f57..af05473 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -298,7 +298,7 @@ jobs: uses: ./.github/actions/setup-env-vars - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.8' - uses: r-lib/actions/setup-pandoc@v2 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1