From 0070ff2b51124a60be1554da8cbf2e68d41f313a Mon Sep 17 00:00:00 2001 From: Matheus Fidelis Date: Tue, 28 Feb 2023 22:27:18 -0300 Subject: [PATCH 1/8] test support python 3.11 --- .github/workflows/ci.yaml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e22e8da68..a77f8289a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.7, 3.8, 3.9, '3.10'] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] steps: - name: Clone repo uses: actions/checkout@v2 @@ -69,7 +69,7 @@ jobs: # fail-fast: false # matrix: # os: [ubuntu-latest, macos-latest] -# python-version: [3.7, 3.8, 3.9, '3.10'] +# python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] # steps: # - name: Clone repo # uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 45c0d8c66..fc4eb0c21 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ } statuses = [ '1 - Planning', '2 - Pre-Alpha', '3 - Alpha', '4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ] -py_versions = '3.6 3.7 3.8 3.9 3.10'.split() +py_versions = '3.6 3.7 3.8 3.9 3.10 3.11'.split() requirements = cfg.get('requirements','').split() if cfg.get('pip_requirements'): requirements += cfg.get('pip_requirements','').split() From 71d5e15cb65624f97b5f1cb381a28a4dc1aaf3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Tue, 12 Sep 2023 13:17:51 -0600 Subject: [PATCH 2/8] remove ray cap --- dev/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/environment.yml b/dev/environment.yml index c13f5bbf5..447424afb 100644 --- a/dev/environment.yml +++ b/dev/environment.yml @@ -16,7 +16,7 @@ dependencies: - tabulate - plotly - pip: - - ray<2.5.0 + - ray - fugue[dask,ray] - nbdev - plotly-resampler From f8f0cf9eb90b4feadd280948d8354794fdbcac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Tue, 12 Sep 2023 13:58:07 -0600 Subject: [PATCH 3/8] add pyarrow --- dev/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/environment.yml b/dev/environment.yml index 447424afb..05c835e53 100644 --- a/dev/environment.yml +++ b/dev/environment.yml @@ -11,6 +11,7 @@ dependencies: - pyspark>=3.3 - pip - prophet + - pyarrow - scipy>=1.7.3 - statsmodels>=0.13.2 - tabulate From 43100fc63a161575bd776cc0f8acc470502b601d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Tue, 12 Sep 2023 18:01:12 -0600 Subject: [PATCH 4/8] update mamba action --- .github/workflows/ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fef0c22de..e9f2809f9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -45,11 +45,11 @@ jobs: uses: actions/checkout@v2 - name: Set up environment - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: dev/environment.yml - extra-specs: python=${{ matrix.python-version }} - cache-env: true + create-args: python=${{ matrix.python-version }} + cache-environment: true - name: Install pip requirements run: pip install ./ @@ -77,11 +77,11 @@ jobs: uses: actions/checkout@v2 - name: Set up environment - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: dev/environment.yml - extra-specs: python=3.10 - cache-env: true + create-args: python=3.10 + cache-environment: true - name: Install library and extra deps run: pip install ".[dev]" fire From bbcbee4dbdc0de6b45f9c65145dda0e6ff394534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Wed, 13 Sep 2023 12:05:52 -0600 Subject: [PATCH 5/8] remove ray --- dev/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/environment.yml b/dev/environment.yml index 05c835e53..a4d68c4f4 100644 --- a/dev/environment.yml +++ b/dev/environment.yml @@ -17,7 +17,6 @@ dependencies: - tabulate - plotly - pip: - - ray - fugue[dask,ray] - nbdev - plotly-resampler From 7a7ebfde81a3f25a3dc2ea917df92e8aa5180df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Wed, 13 Sep 2023 12:54:11 -0600 Subject: [PATCH 6/8] try pyarrow from pip --- dev/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/environment.yml b/dev/environment.yml index a4d68c4f4..d3c85fa52 100644 --- a/dev/environment.yml +++ b/dev/environment.yml @@ -11,7 +11,6 @@ dependencies: - pyspark>=3.3 - pip - prophet - - pyarrow - scipy>=1.7.3 - statsmodels>=0.13.2 - tabulate @@ -21,5 +20,6 @@ dependencies: - nbdev - plotly-resampler - polars + - pyarrow - supersmoother - tqdm From 1c49ce9ce1870e82f588cb7d75f730b1dbc30b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Wed, 13 Sep 2023 13:07:01 -0600 Subject: [PATCH 7/8] Revert "try pyarrow from pip" This reverts commit 7a7ebfde81a3f25a3dc2ea917df92e8aa5180df9. --- dev/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/environment.yml b/dev/environment.yml index d3c85fa52..a4d68c4f4 100644 --- a/dev/environment.yml +++ b/dev/environment.yml @@ -11,6 +11,7 @@ dependencies: - pyspark>=3.3 - pip - prophet + - pyarrow - scipy>=1.7.3 - statsmodels>=0.13.2 - tabulate @@ -20,6 +21,5 @@ dependencies: - nbdev - plotly-resampler - polars - - pyarrow - supersmoother - tqdm From 239a82650a6df72701cb59e4ed19e0f91942361e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Morales?= Date: Thu, 14 Sep 2023 18:06:21 -0600 Subject: [PATCH 8/8] split windows tests --- .github/workflows/ci.yaml | 35 ++++++++++++++++++++++++++--------- dev/local_environment.yml | 23 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 dev/local_environment.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e9f2809f9..1d7545a11 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,16 +33,39 @@ jobs: git status -s # display the status to see which nbs need cleaning up if [ -n "$(git status -uno -s)" ]; then echo -e "!!! Detected unstripped out notebooks\n!!!Remember to run nbdev_install_git_hooks"; false; fi + run-local-tests: + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] + steps: + - name: Clone repo + uses: actions/checkout@v3 + + - name: Set up environment + uses: mamba-org/setup-micromamba@v1 + with: + environment-file: dev/local_environment.yml + create-args: python=${{ matrix.python-version }} + cache-environment: true + + - name: Install pip requirements + run: pip install ./ + + - name: Run local tests + run: nbdev_test --skip_file_re '(models|distributed|ets).*.ipynb' --pause 1.0 + run-tests: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] python-version: [3.7, 3.8, 3.9, '3.10', '3.11'] steps: - name: Clone repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up environment uses: mamba-org/setup-micromamba@v1 @@ -54,16 +77,10 @@ jobs: - name: Install pip requirements run: pip install ./ - - name: Run tests on windows - if: ${{ matrix.os == 'windows-latest' }} #until nbdev fix - run: nbdev_test --skip_file_re '(models|distributed|ets).*.ipynb' --pause 1.0 - - name: Run tests - if: ${{ matrix.os != 'windows-latest' }} run: nbdev_test --skip_file_re '(distributed).*.ipynb' --pause 1.0 - name: Run integration tests - if: ${{ matrix.os != 'windows-latest' }} run: | pip install ".[dev]" pytest pytest action_files @@ -74,7 +91,7 @@ jobs: fail-fast: false steps: - name: Clone repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up environment uses: mamba-org/setup-micromamba@v1 diff --git a/dev/local_environment.yml b/dev/local_environment.yml new file mode 100644 index 000000000..8cbb842a9 --- /dev/null +++ b/dev/local_environment.yml @@ -0,0 +1,23 @@ +name: statsforecast +channels: + - conda-forge +dependencies: + - holidays<0.21 # zone info errors + - jupyterlab + - matplotlib + - numba>=0.55.0 + - numpy>=1.21.6 + - pandas>=1.3.5 + - pip + - prophet + - pyarrow + - scipy>=1.7.3 + - statsmodels>=0.13.2 + - tabulate + - plotly + - pip: + - nbdev + - plotly-resampler + - polars + - supersmoother + - tqdm