Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow sphinx <= 7.x and other conda related improvements #35845

Merged
merged 3 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's maybe merge #35593?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can simply revert this change in your PR once it's ready.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure.


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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to keep an upper bound.
sphinx<8
would be appropriate as the fixes for 7 have been done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? I would only add a version constraint if there are really known issues.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we know that in every Sphinx upgrade we had to fix something critical.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That probably applies to many dependencies, but almost none of them have upper constraints in the conda info.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I am saying that it specifically applies to Sphinx.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of this applies to cython as well in an even more extreme way, and there we don't specify any upper bound.

Please check the facts before making such claims; it really makes no sense to discuss at this level. We do set an upper bound for Cython in install-requires.txt. (There we know already that the next major will break things. That's #29863.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

finally, its not conda specific.

We agree here -- I of course also object to removing the upper bound from build/pkgs/sphinx/install-requires.txt.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conda is marked experimental, so a few rough edges are acceptable.

That's a terrible argument; certainly we don't want to keep it "experimental".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your input, I see your point but don't agree with it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which point? I've made many.

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