Skip to content

Commit

Permalink
gh-35845: Allow sphinx <= 7.x and other conda related improvements
Browse files Browse the repository at this point in the history
    
<!-- 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
  • Loading branch information
Release Manager committed Jul 19, 2023
2 parents 04f9e45 + e951e6a commit 376db2c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion build/pkgs/sphinx/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sphinx<6,>=5.2
sphinx<8,>=5.2
2 changes: 1 addition & 1 deletion build/pkgs/sphinx/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sphinx >=5.2, <6
sphinx >=5.2, <8

0 comments on commit 376db2c

Please sign in to comment.