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

Fix version specifiers of python packages for conda #35350

Merged
merged 5 commits into from
Apr 6, 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
23 changes: 21 additions & 2 deletions .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- '*'
branches:
- 'public/build/**-runci'
pull_request:
types:
- labeled
workflow_dispatch:
# Allow to run manually

Expand All @@ -19,6 +22,13 @@ jobs:
name: Conda
runs-on: ${{ matrix.os }}

# Run on push, workflow dispatch and when certain labels are added
if: |
github.event.action != 'labeled' ||
tobiasdiez marked this conversation as resolved.
Show resolved Hide resolved
github.event.label.name == 'c: packages: optional' ||
github.event.label.name == 'c: packages: standard' ||
github.event.label.name == 's: run conda ci'

strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -77,13 +87,22 @@ jobs:
echo "::remove-matcher owner=configure-system-package-warning::"
echo "::remove-matcher owner=configure-system-package-error::"

# Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed
pip install --no-build-isolation -v -v ptyprocess==0.5.1

- name: Build
shell: bash -l {0}
run: |
pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
pip install --no-build-isolation -v -v -e ./src
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
pip install --no-build-isolation --no-deps -v -v -e ./src
env:
SAGE_NUM_THREADS: 2

- name: Verify dependencies
if: always()
shell: bash -l {0}
run: pip check

- name: Test
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/ipywidgets/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ipywidgets
ipywidgets<8.0.0
2 changes: 1 addition & 1 deletion build/pkgs/lrcalc_python/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-lrcalc
python-lrcalc~=2.1
2 changes: 1 addition & 1 deletion build/pkgs/networkx/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
networkx
networkx<3.0,>=2.4
4 changes: 3 additions & 1 deletion build/pkgs/ptyprocess/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ptyprocess
# The version should be fixed to 0.5.1 (see https://github.com/sagemath/sage/issues/32147), but this is not available on conda-forge
# thus don't install ptyprocess with conda, but let pip handle it
# ptyprocess
2 changes: 1 addition & 1 deletion build/pkgs/scipy/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scipy
scipy<1.11,>=1.5
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
sphinx<6,>=5.2