Skip to content

Don't install graphblas=8.0 yet #459

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Jun 3, 2023
Merged

Don't install graphblas=8.0 yet #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53c2306
Don't install graphblas=8.0 yet
eriknw Jun 2, 2023
052ff08
Show bash command
eriknw Jun 2, 2023
c238f5e
use `set -x` instead
eriknw Jun 2, 2023
79dc531
Don't install python-suitesparse-graphblas from upstream (which needs…
eriknw Jun 2, 2023
3b6e654
Use `set -x` more strategically
eriknw Jun 2, 2023
221fb1c
I don't understand...
eriknw Jun 2, 2023
f929ae5
heh, try this
eriknw Jun 2, 2023
92b05a2
heh, this almost certainly won't work
eriknw Jun 2, 2023
c7b9fd5
heh, maybe this
eriknw Jun 2, 2023
a48eae4
I don't think we need this
eriknw Jun 2, 2023
e7e0d57
I give up... let's just be explicit
eriknw Jun 2, 2023
80653cf
Bump versions
eriknw Jun 2, 2023
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
19 changes: 11 additions & 8 deletions .github/workflows/test_and_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ on:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
# concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
# cancel-in-progress: true

jobs:
rngs:
Expand Down Expand Up @@ -131,9 +131,9 @@ jobs:
source
upstream
weights: |
1
1
1
1000000
1000000
1000000
1
- name: Setup mamba
uses: conda-incubator/setup-miniconda@v2
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
nxver=$(python -c 'import random ; print(random.choice(["=2.7", "=2.8", "=3.0", "=3.1", ""]))')
yamlver=$(python -c 'import random ; print(random.choice(["=5.4", "=6.0", ""]))')
sparsever=$(python -c 'import random ; print(random.choice(["=0.13", "=0.14", ""]))')
fmmver=$(python -c 'import random ; print(random.choice(["=1.4", "=1.5", ""]))')
fmmver=$(python -c 'import random ; print(random.choice(["=1.4", "=1.5", "=1.6", ""]))')
if [[ ${{ startsWith(steps.pyver.outputs.selected, '3.8') }} == true ]]; then
npver=$(python -c 'import random ; print(random.choice(["=1.21", "=1.22", "=1.23", "=1.24", ""]))')
spver=$(python -c 'import random ; print(random.choice(["=1.8", "=1.9", "=1.10", ""]))')
Expand Down Expand Up @@ -252,13 +252,14 @@ jobs:
fi
echo "versions: np${npver} sp${spver} pd${pdver} ak${akver} nx${nxver} numba${numbaver} yaml${yamlver} sparse${sparsever} psgver${psgver}"

set -x # echo on
$(command -v mamba || command -v conda) install packaging pytest coverage coveralls=3.3.1 pytest-randomly cffi donfig tomli \
pyyaml${yamlver} ${sparse} pandas${pdver} scipy${spver} numpy${npver} ${awkward} \
networkx${nxver} ${numba} ${fmm} ${psg} \
${{ matrix.slowtask == 'pytest_bizarro' && 'black' || '' }} \
${{ matrix.slowtask == 'notebooks' && 'matplotlib nbconvert jupyter "ipython>=7"' || '' }} \
${{ steps.sourcetype.outputs.selected == 'upstream' && 'cython' || '' }} \
${{ steps.sourcetype.outputs.selected != 'wheel' && '"graphblas>=7.4.0"' || '' }} \
${{ steps.sourcetype.outputs.selected != 'wheel' && '"graphblas=7.4"' || '' }} \
${{ contains(steps.pyver.outputs.selected, 'pypy') && 'pypy' || '' }}
- name: Build extension module
run: |
Expand Down Expand Up @@ -308,6 +309,7 @@ jobs:
if [[ $H && $bizarro ]] ; then if [[ $macos ]] ; then echo " $suitesparse" ; elif [[ $windows ]] ; then echo " $vanilla" ; fi ; fi)
echo ${args}
pytest -v --pyargs suitesparse_graphblas
set -x # echo on
coverage run -m pytest --color=yes --randomly -v ${args} \
${{ matrix.slowtask == 'pytest_normal' && '--runslow' || '' }}
- name: Unit tests (bizarro scalars)
Expand Down Expand Up @@ -343,6 +345,7 @@ jobs:
if [[ $H && $normal ]] ; then if [[ $macos ]] ; then echo " $suitesparse" ; elif [[ $windows ]] ; then echo " $vanilla" ; fi ; fi)$( \
if [[ $H && $bizarro ]] ; then if [[ $macos ]] ; then echo " $vanilla" ; elif [[ $windows ]] ; then echo " $suitesparse" ; fi ; fi)
echo ${args}
set -x # echo on
coverage run -a -m pytest --color=yes --randomly -v ${args} \
${{ matrix.slowtask == 'pytest_bizarro' && '--runslow' || '' }}
git checkout . # Undo changes to scalar default
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ repos:
- id: black
- id: black-jupyter
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.269
rev: v0.0.270
hooks:
- id: ruff
args: [--fix-only, --show-fixes]
Expand Down Expand Up @@ -94,7 +94,7 @@ repos:
additional_dependencies: [tomli]
files: ^(graphblas|docs)/
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.269
rev: v0.0.270
hooks:
- id: ruff
- repo: https://github.com/sphinx-contrib/sphinx-lint
Expand All @@ -110,7 +110,7 @@ repos:
- id: pyroma
args: [-n, "10", .]
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: "v0.9.0.2"
rev: "v0.9.0.5"
hooks:
- id: shellcheck
- repo: local
Expand Down
2 changes: 1 addition & 1 deletion graphblas/tests/test_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,7 +1432,7 @@ def test_vector_index_with_scalar():
s0 = Scalar.from_value(0, dtype=dtype)
w = v[[s1, s0]].new()
assert w.isequal(expected)
for dtype in ["bool", "fp32", "fp64"] + ["fc32", "fc64"] if dtypes._supports_complex else []:
for dtype in ["bool", "fp32", "fp64"] + (["fc32", "fc64"] if dtypes._supports_complex else []):
s = Scalar.from_value(1, dtype=dtype)
with pytest.raises(TypeError, match="An integer is required for indexing"):
v[s]
Expand Down
8 changes: 4 additions & 4 deletions scripts/check_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
# This may be helpful when updating dependency versions in CI.
# Tip: add `--json` for more information.
conda search 'numpy[channel=conda-forge]>=1.24.3'
conda search 'pandas[channel=conda-forge]>=2.0.1'
conda search 'pandas[channel=conda-forge]>=2.0.2'
conda search 'scipy[channel=conda-forge]>=1.10.1'
conda search 'networkx[channel=conda-forge]>=3.1'
conda search 'awkward[channel=conda-forge]>=2.2.0'
conda search 'awkward[channel=conda-forge]>=2.2.1'
conda search 'sparse[channel=conda-forge]>=0.14.0'
conda search 'fast_matrix_market[channel=conda-forge]>=1.5.1'
conda search 'numba[channel=conda-forge]>=0.56.4'
conda search 'fast_matrix_market[channel=conda-forge]>=1.6.0'
conda search 'numba[channel=conda-forge]>=0.57.0'
conda search 'pyyaml[channel=conda-forge]>=6.0'
conda search 'flake8-bugbear[channel=conda-forge]>=23.5.9'
conda search 'flake8-simplify[channel=conda-forge]>=0.20.0'
Expand Down