diff --git a/.flake8 b/.flake8
index 80124c9e8..0dede3f1d 100644
--- a/.flake8
+++ b/.flake8
@@ -12,6 +12,5 @@ extend-ignore =
per-file-ignores =
scripts/create_pickle.py:F403,F405,
graphblas/tests/*.py:T201,
- graphblas/core/agg.py:F401,F403,
graphblas/core/ss/matrix.py:SIM113,
graphblas/**/__init__.py:F401,
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
index 7c7a7691b..9a96851b6 100644
--- a/.github/workflows/test_and_build.yml
+++ b/.github/workflows/test_and_build.yml
@@ -395,7 +395,7 @@ jobs:
echo "from graphblas.agg import count" > script.py
coverage run -a script.py
echo "from graphblas import agg" > script.py # Does this still cover?
- echo "from graphblas.core import agg" >> script.py
+ echo "from graphblas.core.operator import agg" >> script.py
coverage run -a script.py
# Tests lazy loading of lib, ffi, and NULL in gb.core
echo "from graphblas.core import base" > script.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b1d264509..bc97547cc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
# We can probably remove `isort` if we come to trust `ruff --fix`,
# but we'll need to figure out the configuration to do this in `ruff`
- repo: https://github.com/pycqa/isort
- rev: 5.13.1
+ rev: 5.13.2
hooks:
- id: isort
# Let's keep `pyupgrade` even though `ruff --fix` probably does most of it
@@ -66,7 +66,7 @@ repos:
- id: black
- id: black-jupyter
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.1.7
+ rev: v0.1.8
hooks:
- id: ruff
args: [--fix-only, --show-fixes]
@@ -94,7 +94,7 @@ repos:
additional_dependencies: [tomli]
files: ^(graphblas|docs)/
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.1.7
+ rev: v0.1.8
hooks:
- id: ruff
- repo: https://github.com/sphinx-contrib/sphinx-lint
diff --git a/graphblas/agg/__init__.py b/graphblas/agg/__init__.py
index 9f6ead0b5..725c11aab 100644
--- a/graphblas/agg/__init__.py
+++ b/graphblas/agg/__init__.py
@@ -73,7 +73,7 @@
# - bxnor monoid: even bits
# - bnor monoid: odd bits
"""
-# All items are dynamically added by classes in core/agg.py
+# All items are dynamically added by classes in core/operator/agg.py
# This module acts as a container of Aggregator instances
_deprecated = {}
diff --git a/graphblas/core/agg.py b/graphblas/core/agg.py
deleted file mode 100644
index 23848d3b9..000000000
--- a/graphblas/core/agg.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""graphblas.core.agg namespace is deprecated; please use graphblas.core.operator.agg instead.
-
-.. deprecated:: 2023.3.0
-``graphblas.core.agg`` will be removed in a future release.
-Use ``graphblas.core.operator.agg`` instead.
-Will be removed in version 2023.11.0 or later.
-
-"""
-import warnings
-
-from .operator.agg import * # pylint: disable=wildcard-import,unused-wildcard-import
-
-warnings.warn(
- "graphblas.core.agg namespace is deprecated; please use graphblas.core.operator.agg instead.",
- DeprecationWarning,
- stacklevel=1,
-)
diff --git a/graphblas/tests/test_op.py b/graphblas/tests/test_op.py
index c7d1ce97c..41fae80ae 100644
--- a/graphblas/tests/test_op.py
+++ b/graphblas/tests/test_op.py
@@ -1450,8 +1450,6 @@ def test_deprecated():
gb.op.secondj
with pytest.warns(DeprecationWarning, match="please use"):
gb.agg.argmin
- with pytest.warns(DeprecationWarning, match="please use"):
- import graphblas.core.agg # noqa: F401
@pytest.mark.slow
diff --git a/pyproject.toml b/pyproject.toml
index 04ef28645..3bd4a4310 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -375,7 +375,6 @@ ignore = [
]
[tool.ruff.per-file-ignores]
-"graphblas/core/agg.py" = ["F401", "F403"] # Deprecated
"graphblas/core/operator/base.py" = ["S102"] # exec is used for UDF
"graphblas/core/ss/matrix.py" = ["NPY002"] # numba doesn't support rng generator yet
"graphblas/core/ss/vector.py" = ["NPY002"] # numba doesn't support rng generator yet
diff --git a/scripts/check_versions.sh b/scripts/check_versions.sh
index 958bf2210..75d6283f0 100755
--- a/scripts/check_versions.sh
+++ b/scripts/check_versions.sh
@@ -9,7 +9,7 @@ conda search 'numpy[channel=conda-forge]>=1.26.2'
conda search 'pandas[channel=conda-forge]>=2.1.4'
conda search 'scipy[channel=conda-forge]>=1.11.4'
conda search 'networkx[channel=conda-forge]>=3.2.1'
-conda search 'awkward[channel=conda-forge]>=2.5.0'
+conda search 'awkward[channel=conda-forge]>=2.5.1'
conda search 'sparse[channel=conda-forge]>=0.14.0'
conda search 'fast_matrix_market[channel=conda-forge]>=1.7.5'
conda search 'numba[channel=conda-forge]>=0.58.1'
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy