Skip to content

Commit ccbf463

Browse files
tobiasdiezMatthias Köppe
authored andcommitted
Allow sphinx 6 and other conda related improvements
1 parent 1ca4a47 commit ccbf463

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/ci-conda.yml

Lines changed: 5 additions & 2 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
@@ -105,14 +107,15 @@ jobs:
105107
run: pip check
106108

107109
- name: Test
110+
if: always()
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>=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

0 commit comments

Comments
 (0)