diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index eba0610c463..2048d9c43ae 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -34,7 +34,9 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] python: ['3.9', '3.10', '3.11'] - conda-env: [environment, environment-optional] + # Optional environment is disabled for now as its not yet working + # environment: [environment, environment-optional] + conda-env: [environment] steps: - uses: actions/checkout@v3 @@ -100,19 +102,20 @@ jobs: SAGE_NUM_THREADS: 2 - name: Verify dependencies - if: always() + if: success() || failure() shell: bash -l {0} run: pip check - name: Test + if: success() || failure() shell: bash -l {0} run: ./sage -t --all -p0 - name: Print logs + if: always() run: | for file in $(find . -type f -name "*.log"); do echo "::group::$file" cat "$file" echo "::endgroup::" done - if: always() diff --git a/build/pkgs/sphinx/distros/conda.txt b/build/pkgs/sphinx/distros/conda.txt index 244ffb45e50..596885d6456 100644 --- a/build/pkgs/sphinx/distros/conda.txt +++ b/build/pkgs/sphinx/distros/conda.txt @@ -1 +1 @@ -sphinx<6,>=5.2 +sphinx<8,>=5.2 diff --git a/build/pkgs/sphinx/install-requires.txt b/build/pkgs/sphinx/install-requires.txt index 16e1ac533d9..9003fdec2f8 100644 --- a/build/pkgs/sphinx/install-requires.txt +++ b/build/pkgs/sphinx/install-requires.txt @@ -1 +1 @@ -sphinx >=5.2, <6 +sphinx >=5.2, <8