From 6a10e62c199def85ea855b75b7ce42aeeeb52f09 Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 11 Nov 2024 15:32:31 +1100 Subject: [PATCH 1/4] MAINT: upgrade to anaconda=2024.10 --- .github/workflows/ci.yml | 2 +- environment.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 211b29812..c41ea0a76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ jobs: preview: runs-on: quantecon-gpu-runner container: - image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312 + image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312 options: --gpus all steps: - uses: actions/checkout@v4 diff --git a/environment.yml b/environment.yml index 1b6c93144..21e76890d 100644 --- a/environment.yml +++ b/environment.yml @@ -3,12 +3,12 @@ channels: - default dependencies: - python=3.12 - - anaconda=2024.06 + - anaconda=2024.10 - pip - pip: - jupyter-book==0.15.1 - docutils==0.17.1 - - quantecon-book-theme==0.7.1 + - quantecon-book-theme==0.7.2 - sphinx-reredirects==0.1.3 - sphinx-tojupyter==0.3.0 - sphinxext-rediraffe==0.2.7 From b4395cbfe992e87dfee4c138e8b82401bd111423 Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 11 Nov 2024 15:33:06 +1100 Subject: [PATCH 2/4] tmp: disable build cache --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c41ea0a76..eeb3ef35d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,13 @@ jobs: - name: Display Pip Versions shell: bash -l {0} run: pip list - - name: Download "build" folder (cache) - uses: dawidd6/action-download-artifact@v6 - with: - workflow: cache.yml - branch: main - name: build-cache - path: _build + # - name: Download "build" folder (cache) + # uses: dawidd6/action-download-artifact@v6 + # with: + # workflow: cache.yml + # branch: main + # name: build-cache + # path: _build # Build Assets (Download Notebooks and PDF via LaTeX) - name: Build Download Notebooks (sphinx-tojupyter) shell: bash -l {0} From 448bebfe57dbc15d67ff6b1514daa2ec55574603 Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 12 Nov 2024 07:57:25 +1100 Subject: [PATCH 3/4] Revert "tmp: disable build cache" This reverts commit b4395cbfe992e87dfee4c138e8b82401bd111423. --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eeb3ef35d..c41ea0a76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,13 +20,13 @@ jobs: - name: Display Pip Versions shell: bash -l {0} run: pip list - # - name: Download "build" folder (cache) - # uses: dawidd6/action-download-artifact@v6 - # with: - # workflow: cache.yml - # branch: main - # name: build-cache - # path: _build + - name: Download "build" folder (cache) + uses: dawidd6/action-download-artifact@v6 + with: + workflow: cache.yml + branch: main + name: build-cache + path: _build # Build Assets (Download Notebooks and PDF via LaTeX) - name: Build Download Notebooks (sphinx-tojupyter) shell: bash -l {0} From 4ab7242be5eda632082ffa1e033678a4a7086c86 Mon Sep 17 00:00:00 2001 From: mmcky Date: Tue, 12 Nov 2024 07:59:28 +1100 Subject: [PATCH 4/4] use updated docker on all and remove old execution checker --- .github/workflows/cache.yml | 2 +- .github/workflows/execution.yml | 111 -------------------------------- .github/workflows/publish.yml | 2 +- 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 .github/workflows/execution.yml diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index 17f9a5442..7e5860ff6 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -7,7 +7,7 @@ jobs: cache: runs-on: quantecon-gpu-runner container: - image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312 + image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312 options: --gpus all steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/execution.yml b/.github/workflows/execution.yml deleted file mode 100644 index ab20f75b3..000000000 --- a/.github/workflows/execution.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: Run Execution Tests [Latest Anaconda] -on: - schedule: - # UTC 22:00 is early morning in Australia - - cron: '0 22 * * *' -jobs: - execution-tests-linux: - name: Execution Tests (${{ matrix.python-version }}, ${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest"] - python-version: ["3.12"] - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - - name: Install latex dependencies - run: | - sudo apt-get -qq update - sudo apt-get install -y \ - texlive-latex-recommended \ - texlive-latex-extra \ - texlive-fonts-recommended \ - texlive-fonts-extra \ - texlive-xetex \ - latexmk \ - xindy \ - dvipng \ - cm-super - - name: Install Anaconda + Dependencies - shell: bash -l {0} - run: | - conda install anaconda - pip install jupyter-book sphinx-multitoc-numbering quantecon-book-theme sphinxext-rediraffe sphinx-tojupyter sphinxcontrib-youtube sphinx-exercise prettytable - - name: Build Lectures (+ Execution Checks) - shell: bash -l {0} - run: jb build lectures --path-output=./ -W --keep-going - - name: Upload Execution Reports - uses: actions/upload-artifact@v4 - if: failure() - with: - name: execution-reports - path: _build/html/reports - - execution-tests-osx: - name: Execution Tests (${{ matrix.python-version }}, ${{ matrix.os }}) - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["macos-latest"] - python-version: ["3.12"] - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - - name: Install latex dependencies - run: | - brew install texlive - - name: Install Anaconda + Dependencies - shell: bash -l {0} - run: | - conda install anaconda - pip install jupyter-book sphinx-multitoc-numbering quantecon-book-theme sphinxext-rediraffe sphinx-tojupyter sphinxcontrib-youtube sphinx-exercise prettytable - - name: Build Lectures (+ Execution Checks) - shell: bash -l {0} - run: jb build lectures --path-output=./ -W --keep-going - - name: Upload Execution Reports - uses: actions/upload-artifact@v4 - if: failure() - with: - name: execution-reports - path: _build/html/reports - # execution-tests-win: - # name: Execution Tests (${{ matrix.python-version }}, ${{ matrix.os }}) - # runs-on: ${{ matrix.os }} - # strategy: - # fail-fast: false - # matrix: - # os: ["windows-latest"] - # python-version: ["3.12"] - # steps: - # - name: Checkout - # uses: actions/checkout@v4 - # - uses: conda-incubator/setup-miniconda@v2 - # with: - # auto-update-conda: true - # python-version: ${{ matrix.python-version }} - # - name: Install Anaconda + Dependencies - # shell: powershell - # run: | - # conda install anaconda - # pip install jupyter-book - # pip install jupyter-book sphinx-multitoc-numbering quantecon-book-theme sphinxext-rediraffe sphinx_tojupyter - # - name: Build Lectures (+ Execution Checks) - # shell: powershell - # run: jb build lectures --path-output=./ -W --keep-going - # - name: Upload Execution Reports - # uses: actions/upload-artifact@v4 - # if: failure() - # with: - # name: execution-reports - # path: _build/html/reports diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 75f987d78..416da8db0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') runs-on: quantecon-gpu-runner container: - image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-06-py312 + image: ghcr.io/quantecon/lecture-python-container:cuda-12.6.0-anaconda-2024-10-py312 options: --gpus all steps: - name: Checkout