Skip to content

Commit 7d1aead

Browse files
committed
Merge branch 'main' of https://github.com/oracle/accelerated-data-science into forecast_series_failure_bugfixes
2 parents 6c318cd + e1775be commit 7d1aead

File tree

106 files changed

+10167
-536
lines changed

Some content is hidden

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

106 files changed

+10167
-536
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
59+
uses: github/codeql-action/autobuild@v3
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,6 +69,6 @@ jobs:
6969
# ./location_of_script_within_repo/buildscript.sh
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
72+
uses: github/codeql-action/analyze@v3
7373
with:
7474
category: "/language:${{matrix.language}}"

.github/workflows/publish-to-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Set up Python
14-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1515
with:
1616
python-version: "3.x"
1717
- name: Build distribution 📦

.github/workflows/run-operators-unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
python-version: ["3.8", "3.10.8"]
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838

39-
- uses: actions/setup-python@v4
39+
- uses: actions/setup-python@v5
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
cache: "pip"

.github/workflows/run-unittests-default_setup.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: "[Py3.8][Py3.9][Py3.10] tests/unitary/default_setup/**"
22

33
on:
44
workflow_dispatch:
5-
push:
65
pull_request:
7-
types: [opened, reopened]
86
branches: [ "main" ]
97

108
# Cancel in progress workflows on pull_requests.
@@ -32,9 +30,9 @@ jobs:
3230
python-version: ["3.8", "3.9", "3.10"]
3331

3432
steps:
35-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3634

37-
- uses: actions/setup-python@v4
35+
- uses: actions/setup-python@v5
3836
with:
3937
python-version: ${{ matrix.python-version }}
4038
cache: "pip"
@@ -46,13 +44,15 @@ jobs:
4644
name: "Test config setup"
4745

4846
- name: "Run default_setup tests folder ONLY with minimum ADS dependencies"
49-
timeout-minutes: 15
47+
timeout-minutes: 30
5048
shell: bash
5149
env:
5250
NoDependency: True
5351
run: |
5452
set -x # print commands that are executed
5553
$CONDA/bin/conda init
5654
source /home/runner/.bashrc
55+
conda install python=${{ matrix.python-version }}
5756
pip install -r test-requirements.txt
57+
conda list
5858
python -m pytest -v -p no:warnings --durations=5 tests/unitary/default_setup

.github/workflows/run-unittests-py38-cov-report.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ name: "[Py3.8][COV REPORT] tests/unitary/**"
22

33
on:
44
workflow_dispatch:
5-
push:
65
pull_request:
7-
types: [opened, reopened]
86
branches: [ "main" ]
97

108
# Cancel in progress workflows on pull_requests.
@@ -36,20 +34,23 @@ jobs:
3634
test-path: "tests/unitary"
3735
# `model` tests running in "slow_tests",
3836
# `feature_store` tests has its own test suite
37+
# `forecast` tests has its own test suite
38+
# 'hpo' tests hangs if run together with all unitary tests. Tests running in separate command before running all unitary
3939
ignore-path: |
4040
--ignore tests/unitary/with_extras/model \
4141
--ignore tests/unitary/with_extras/feature_store \
42+
--ignore tests/unitary/with_extras/operator/forecast \
4243
--ignore tests/unitary/with_extras/hpo
4344
- name: "slow_tests"
4445
test-path: "tests/unitary/with_extras/model"
4546

4647
steps:
47-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4849

4950
- uses: ./.github/workflows/create-more-space
5051
name: "Create more disk space"
5152

52-
- uses: actions/setup-python@v4
53+
- uses: actions/setup-python@v5
5354
with:
5455
python-version: "3.8"
5556
cache: "pip"
@@ -62,13 +63,13 @@ jobs:
6263

6364
- uses: ./.github/workflows/test-env-setup
6465
name: "Test env setup"
65-
timeout-minutes: 20
66+
timeout-minutes: 30
6667

67-
# Installing forecast deps for python3.8 test setup only, it will not work with python3.9/3.10, because
68-
# automlx do not support py3.9 and some versions of py3.10. This step omitted in -py39-py30.yml workflow
69-
- name: "Install Forecasting dependencies"
68+
# Installing pii deps for python3.8 test setup only, it will not work with python3.9/3.10, because
69+
# 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
70+
- name: "Install PII dependencies"
7071
run: |
71-
pip install -e ".[forecast]"
72+
pip install -e ".[pii]"
7273
- name: "Install featurestore marketplace dependencies"
7374
run: |
7475
pip install -e ".[feature-store-marketplace]"
@@ -101,7 +102,7 @@ jobs:
101102
${{ matrix.test-path }} ${{ matrix.ignore-path }}
102103
103104
- name: "Save coverage files"
104-
uses: actions/upload-artifact@v3
105+
uses: actions/upload-artifact@v4
105106
with:
106107
name: cov-reports-${{ matrix.name }}
107108
path: |
@@ -120,11 +121,11 @@ jobs:
120121

121122
steps:
122123
- name: "Checkout current branch"
123-
uses: actions/checkout@v3
124+
uses: actions/checkout@v4
124125
with:
125126
fetch-depth: 0
126127
- name: "Download coverage files"
127-
uses: actions/download-artifact@v3
128+
uses: actions/download-artifact@v4
128129
- name: "Calculate overall coverage"
129130
run: |
130131
set -x # print commands that are executed
@@ -182,7 +183,7 @@ jobs:
182183
fi
183184
184185
- name: "Add comment with cov diff to PR"
185-
uses: actions/github-script@v6
186+
uses: actions/github-script@v7
186187
if: github.event_name == 'pull_request'
187188
with:
188189
github-token: ${{ github.token }}
@@ -199,7 +200,7 @@ jobs:
199200
--compare-branch=origin/${{ env.COMPARE_BRANCH }} \
200201
--html-report=cov-diff.html
201202
- name: "Save coverage difference report"
202-
uses: actions/upload-artifact@v3
203+
uses: actions/upload-artifact@v4
203204
with:
204205
name: cov-html-reports
205206
path: |

.github/workflows/run-unittests-py39-py310.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ name: "[Py3.9][Py3.10] - tests/unitary/**"
22

33
on:
44
workflow_dispatch:
5-
push:
65
pull_request:
7-
types: [opened, reopened]
8-
branches: [ "main" ]
96

107
# Cancel in progress workflows on pull_requests.
118
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -38,22 +35,24 @@ jobs:
3835
# `model` tests running in "slow_tests",
3936
# `feature_store` tests has its own test suite
4037
# `forecast` tests not supported in python 3.9,3.10 (automlx dependency). Tests are running in python3.8 test env, see run-unittests-py38-cov-report.yml
38+
# 'pii' tests run only with py3.8, 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
4139
# 'hpo' tests hangs if run together with all unitary tests. Tests running in separate command before running all unitary
4240
ignore-path: |
4341
--ignore tests/unitary/with_extras/model \
4442
--ignore tests/unitary/with_extras/feature_store \
4543
--ignore tests/unitary/with_extras/operator/forecast \
44+
--ignore tests/unitary/with_extras/operator/pii \
4645
--ignore tests/unitary/with_extras/hpo
4746
- name: "slow_tests"
4847
test-path: "tests/unitary/with_extras/model"
4948

5049
steps:
51-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
5251

5352
- uses: ./.github/workflows/create-more-space
5453
name: "Create more disk space"
5554

56-
- uses: actions/setup-python@v4
55+
- uses: actions/setup-python@v5
5756
with:
5857
python-version: ${{ matrix.python-version }}
5958
cache: "pip"
@@ -66,7 +65,7 @@ jobs:
6665

6766
- uses: ./.github/workflows/test-env-setup
6867
name: "Test env setup"
69-
timeout-minutes: 20
68+
timeout-minutes: 30
7069

7170
- name: "Run hpo tests"
7271
timeout-minutes: 10

.github/workflows/test-env-setup/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ runs:
1414
sudo apt-get install libkrb5-dev graphviz
1515
$CONDA/bin/conda init
1616
source /home/runner/.bashrc
17-
17+
conda install python=${{ matrix.python-version }}
1818
pip install -r dev-requirements.txt
19+
conda list

README-development.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ To run all unit test install extra dependencies to test all modules of ADS ASD.
101101

102102
```bash
103103
# Update your environment with tests dependencies
104-
pip install -r dev-requirements.txt
104+
pip install -r test-requirements.txt
105+
pip install -e ".[testsuite]"
105106
# Run all unit tests
106107
python3 -m pytest tests/unitary
107108
```
@@ -113,7 +114,8 @@ To run all but opctl integration tests, you can run:
113114

114115
```bash
115116
# Update your environment with tests dependencies
116-
pip install -r dev-requirements.txt
117+
pip install -r test-requirements.txt
118+
pip install -e ".[testsuite]"
117119
# Run integration tests
118120
python3 -m pytest tests/integration --ignore=tests/integration/opctl
119121
```

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ You have various options when installing ADS.
3232
To use the AI Forecast Operator, install the "forecast" dependencies using the following command:
3333

3434
```bash
35-
python3 -m pip install 'oracle_ads[forecast]==2.9.0'
35+
python3 -m pip install 'oracle_ads[forecast]>=2.9.0'
3636
```
3737

3838
### Installing extras libraries

THIRD_PARTY_LICENSES.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,12 @@ delta
405405
* Source code: https://github.com/delta-io/delta/
406406
* Project home: https://delta.io/
407407

408+
cachetools
409+
* Copyright (c) 2014-2024 Thomas Kemmer
410+
* License: The MIT License (MIT)
411+
* Source code: https://github.com/tkem/cachetools/
412+
* Project home: https://cachetools.readthedocs.io/
413+
408414
=============================== Licenses ===============================
409415
------------------------------------------------------------------------
410416

0 commit comments

Comments
 (0)