Skip to content

Commit

Permalink
Fix issues caused by new releases of dependencies (#298)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhermes committed Aug 29, 2022
1 parent d3b7001 commit df068b6
Show file tree
Hide file tree
Showing 20 changed files with 1,955 additions and 1,794 deletions.
2 changes: 1 addition & 1 deletion docs/algorithms/curve-curve-intersection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ larger.
... [y_val],
... ])
>>> max_err = np.max(np.abs(points - expected_pts))
>>> binary_exponent(max_err) <= -50
>>> binary_exponent(max_err) <= -49
True

.. image:: ../images/curves15_and_25.png
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
11 changes: 5 additions & 6 deletions docs/python/binary-extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ The ``bezier._speedup`` module depends on this local copy of ``libbezier``:

$ readelf -d _speedup.cpython-310-x86_64-linux-gnu.so

Dynamic section at offset 0x333000 contains 27 entries:
Dynamic section at offset 0x327000 contains 27 entries:
Tag Type Name/Value
0x000000000000000f (RPATH) Library rpath: [$ORIGIN/../bezier.libs]
0x0000000000000001 (NEEDED) Shared library: [libbezier-3374330c.so.2021.2.12]
0x0000000000000001 (NEEDED) Shared library: [libpthread.so.0]
0x0000000000000001 (NEEDED) Shared library: [libc.so.6]
0x000000000000000c (INIT) 0x9e98
0x000000000000000d (FINI) 0x6a8b8
0x000000000000000c (INIT) 0x9e18
0x000000000000000d (FINI) 0x691a8
...

and the local copy of ``libbezier`` depends on the other dependencies in
Expand Down Expand Up @@ -164,7 +164,7 @@ with copies of ``libbezier``, ``libgfortran``, ``libquadmath`` and
>>> print_tree(dylibs_directory)
.dylibs/
libbezier.2021.2.12.dylib
libgcc_s.1.dylib
libgcc_s.1.1.dylib
libgfortran.5.dylib
libquadmath.0.dylib

Expand Down Expand Up @@ -202,9 +202,8 @@ it indirectly depends on ``libgfortran``, ``libquadmath`` and ``libgcc_s``:
.dylibs/libbezier.2021.2.12.dylib:
/DLC/bezier/.dylibs/libbezier.2021.2.12.dylib (...)
@loader_path/libgfortran.5.dylib (...)
/usr/lib/libSystem.B.dylib (...)
@loader_path/libgcc_s.1.dylib (...)
@loader_path/libquadmath.0.dylib (...)
/usr/lib/libSystem.B.dylib (...)

.. note::

Expand Down
8 changes: 4 additions & 4 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NumPy is required for building `bezier` from source.
numpy >= 1.21.4
numpy >= 1.23.2
# Sphinx and related are required for building documentation.
Sphinx >= 4.4.0
Sphinx >= 5.1.1
sphinx-copybutton >= 0.5.0
sphinx-docstring-typing >= 0.0.4
sphinx_rtd_theme >= 1.0.0
sphinx-copybutton >= 0.5.0
sphinx-rtd-theme >= 1.0.0
25 changes: 12 additions & 13 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,26 @@
IS_MACOS = sys.platform == "darwin"
IS_WINDOWS = os.name == "nt"
DEPS = {
"black": "black >= 22.1.0",
"black": "black >= 22.6.0",
"cmake-format": "cmake-format >= 0.6.13",
"cmake": "cmake >= 3.21.4",
"cmake": "cmake >= 3.24.1",
"coverage": "coverage",
"Cython": "Cython >= 0.29.28",
"Cython": "Cython >= 0.29.32",
"docutils": "docutils",
"flake8": "flake8",
"flake8-import-order": "flake8-import-order",
"jsonschema": "jsonschema >= 4.2.1",
"lcov_cobertura": "lcov_cobertura >= 1.6",
"jsonschema": "jsonschema >= 4.14.0",
"lcov-cobertura": "lcov-cobertura >= 2.0.2",
"machomachomangler": "machomachomangler == 0.0.1",
"matplotlib": "matplotlib >= 3.4.3",
"numpy": "numpy >= 1.21.4",
"matplotlib": "matplotlib >= 3.5.3",
"numpy": "numpy >= 1.23.2",
"pycobertura": "pycobertura >= 2.1.0",
"Pygments": "Pygments",
"pylint": "pylint >= 2.12.1",
"pytest": "pytest >= 6.2.5",
"pylint": "pylint >= 2.15.0",
"pytest": "pytest >= 7.1.2",
"pytest-cov": "pytest-cov",
"scipy": "scipy >= 1.7.2",
"sympy": "sympy >= 1.9",
"scipy": "scipy >= 1.9.1",
"sympy": "sympy >= 1.11",
"seaborn": "seaborn >= 0.11.2",
}
BASE_DEPS = (DEPS["numpy"], DEPS["pytest"])
Expand Down Expand Up @@ -391,7 +391,6 @@ def lint(session):
"--rcfile",
"pylintrc",
"--max-module-lines=3035",
"--disable=missing-type-doc",
get_path("src", "python", "bezier"),
)
# Run Pylint over the tests source.
Expand Down Expand Up @@ -436,7 +435,7 @@ def blacken(session):

@nox.session(py=DEFAULT_INTERPRETER)
def fortran_unit(session):
session.install(DEPS["lcov_cobertura"], DEPS["pycobertura"])
session.install(DEPS["lcov-cobertura"], DEPS["pycobertura"])
if py.path.local.sysfind("make") is None:
session.skip("`make` must be installed")
if py.path.local.sysfind("gfortran") is None:
Expand Down
4 changes: 1 addition & 3 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ignore=.git,.cache,.nox
# DEFAULT: load-plugins=
# RATIONALE: We want to make sure our docstrings match the objects
# they document.
load-plugins=pylint.extensions.check_docs
load-plugins=pylint.extensions.docparams

# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
Expand All @@ -21,8 +21,6 @@ disable =
I,
cyclic-import,
no-else-return,
misplaced-comparison-constant,
bad-continuation,
useless-object-inheritance,

[REPORTS]
Expand Down
8 changes: 4 additions & 4 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NumPy is required for building `bezier` from source.
numpy >= 1.21.4
numpy >= 1.23.2
# SymPy and SciPy are optional dependencies for pure-Python implementations.
scipy >= 1.7.2
sympy >= 1.9
scipy >= 1.9.1
sympy >= 1.11
# Test requirements.
pytest >= 6.2.5
pytest >= 7.1.2
4 changes: 3 additions & 1 deletion src/python/bezier/_plot_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@ def add_patch(ax, color, pts_per_edge, *edges, alpha=0.625):
color (Tuple[float, float, float]): Color as RGB profile.
pts_per_edge (int): Number of points to use in polygonal
approximation of edge.
alpha (Optional[float]): Alpha value of patch center, between 0 and 1 inclusive.
alpha (Optional[float]): Alpha value of patch center, between 0 and 1
inclusive.
*edges (Tuple[~bezier.curve.Curve, ...]): Curved edges defining
a boundary.
"""
# pylint: disable=too-many-locals
# pylint: disable=import-outside-toplevel
from matplotlib import patches
from matplotlib import path as _path_mod
Expand Down

0 comments on commit df068b6

Please sign in to comment.