Skip to content

Commit 376db2c

Browse files
author
Release Manager
committed
gh-35845: Allow sphinx <= 7.x and other conda related improvements <!-- Please provide a concise, informative and self-explanatory title. --> <!-- Don't put issue numbers in the title. Put it in the Description below. --> <!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" --> ### 📚 Description Allow sphinx 6 and 7 to be installed (using conda) since after #35658 this no longer leeds to errors. Also disable the `enviroment-optional` matrix testing since this is currently broken (can easily be renenabled in the PR that fixes it), and always run the test step in the conda workflow. <!-- Describe your changes here in detail. --> <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #35845 Reported by: Tobias Diez Reviewer(s): François Bissey, Matthias Köppe, Tobias Diez
2 parents 04f9e45 + e951e6a commit 376db2c

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/ci-conda.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ jobs:
3434
matrix:
3535
os: [ubuntu-latest, macos-latest]
3636
python: ['3.9', '3.10', '3.11']
37-
conda-env: [environment, environment-optional]
37+
# Optional environment is disabled for now as its not yet working
38+
# environment: [environment, environment-optional]
39+
conda-env: [environment]
3840

3941
steps:
4042
- uses: actions/checkout@v3
@@ -100,19 +102,20 @@ jobs:
100102
SAGE_NUM_THREADS: 2
101103

102104
- name: Verify dependencies
103-
if: always()
105+
if: success() || failure()
104106
shell: bash -l {0}
105107
run: pip check
106108

107109
- name: Test
110+
if: success() || failure()
108111
shell: bash -l {0}
109112
run: ./sage -t --all -p0
110113

111114
- name: Print logs
115+
if: always()
112116
run: |
113117
for file in $(find . -type f -name "*.log"); do
114118
echo "::group::$file"
115119
cat "$file"
116120
echo "::endgroup::"
117121
done
118-
if: always()

build/pkgs/sphinx/distros/conda.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sphinx<6,>=5.2
1+
sphinx<8,>=5.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sphinx >=5.2, <6
1+
sphinx >=5.2, <8

0 commit comments

Comments
 (0)