From 0555f8f8bfe5ac056833d945c8ea23ea87259bbd Mon Sep 17 00:00:00 2001 From: jborbely Date: Mon, 20 May 2024 14:21:46 +1200 Subject: [PATCH 1/3] use "features" instead of "extra-dependencies" --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 409c2ae..470e007 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,7 +88,7 @@ versions = [ clean = "rm -rf .coverage_html dist docs/_apidoc docs/_build .pytest_cache" [tool.hatch.envs.hatch-test] -extra-dependencies = ["msl-loadlib[tests]"] +features = ["tests"] default-args = ["--config-file=pyproject.toml"] [tool.hatch.envs.hatch-test.scripts] @@ -98,7 +98,7 @@ cov-combine = "coverage combine" cov-report = "coverage html" [tool.hatch.envs.docs] -dependencies = ["msl-loadlib[docs]"] +features = ["docs"] [tool.hatch.envs.docs.scripts] apidoc = "sphinx-apidoc --force --module-first --separate --implicit-namespaces --output-dir docs/_apidoc msl" From b30e0c21e8e675a2623461e44b3c224e748f6b92 Mon Sep 17 00:00:00 2001 From: jborbely Date: Mon, 20 May 2024 14:22:28 +1200 Subject: [PATCH 2/3] docs: update literalinclude path --- docs/cpp_source.rst | 4 ++-- docs/dotnet_source.rst | 2 +- docs/fortran_source.rst | 2 +- docs/java_source.rst | 6 +++--- docs/labview_source.rst | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/cpp_source.rst b/docs/cpp_source.rst index afba0f3..8f72b59 100644 --- a/docs/cpp_source.rst +++ b/docs/cpp_source.rst @@ -11,7 +11,7 @@ Source code for the example C++ library. cpp_lib.h ========= -.. literalinclude:: ../msl/examples/loadlib/cpp_lib.h +.. literalinclude:: ../src/msl/examples/loadlib/cpp_lib.h :language: cpp .. _cpp-lib-source: @@ -20,5 +20,5 @@ cpp_lib.h cpp_lib.cpp =========== -.. literalinclude:: ../msl/examples/loadlib/cpp_lib.cpp +.. literalinclude:: ../src/msl/examples/loadlib/cpp_lib.cpp :language: cpp diff --git a/docs/dotnet_source.rst b/docs/dotnet_source.rst index fabd9ef..6e0a19d 100644 --- a/docs/dotnet_source.rst +++ b/docs/dotnet_source.rst @@ -9,5 +9,5 @@ Source code for the example C# library. dotnet_lib.cs ============= -.. literalinclude:: ../msl/examples/loadlib/dotnet_lib.cs +.. literalinclude:: ../src/msl/examples/loadlib/dotnet_lib.cs :language: csharp diff --git a/docs/fortran_source.rst b/docs/fortran_source.rst index d4ea103..90f4e92 100644 --- a/docs/fortran_source.rst +++ b/docs/fortran_source.rst @@ -9,5 +9,5 @@ Source code for the example FORTRAN library. fortran_lib.f90 =============== -.. literalinclude:: ../msl/examples/loadlib/fortran_lib.f90 +.. literalinclude:: ../src/msl/examples/loadlib/fortran_lib.f90 :language: fortran diff --git a/docs/java_source.rst b/docs/java_source.rst index 96387ac..9578331 100644 --- a/docs/java_source.rst +++ b/docs/java_source.rst @@ -16,7 +16,7 @@ The following file is compiled to ``Trig.class`` byte code. Trig.java ---------- -.. literalinclude:: ../msl/examples/loadlib/Trig.java +.. literalinclude:: ../src/msl/examples/loadlib/Trig.java :language: java .. _java-lib-jar: @@ -32,7 +32,7 @@ The following classes are included in the ``nz.msl.examples`` package in ``java_ MathUtils.java -------------- -.. literalinclude:: ../msl/examples/loadlib/nz/msl/examples/MathUtils.java +.. literalinclude:: ../src/msl/examples/loadlib/nz/msl/examples/MathUtils.java :language: java .. _java-lib-Matrix: @@ -40,5 +40,5 @@ MathUtils.java Matrix.java ----------- -.. literalinclude:: ../msl/examples/loadlib/nz/msl/examples/Matrix.java +.. literalinclude:: ../src/msl/examples/loadlib/nz/msl/examples/Matrix.java :language: java diff --git a/docs/labview_source.rst b/docs/labview_source.rst index 447b796..68ab27a 100644 --- a/docs/labview_source.rst +++ b/docs/labview_source.rst @@ -19,5 +19,5 @@ labview_lib.vi labview_lib.h ============= -.. literalinclude:: ../msl/examples/loadlib/labview_lib.h +.. literalinclude:: ../src/msl/examples/loadlib/labview_lib.h :language: cpp From 6ad2485f122d66188db6f6749ddc6f2c44be40cb Mon Sep 17 00:00:00 2001 From: jborbely Date: Tue, 21 May 2024 08:47:22 +1200 Subject: [PATCH 3/3] recompile fortran_libarm64.dylib --- .../examples/loadlib/fortran_libarm64.dylib | Bin 34456 -> 34456 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/msl/examples/loadlib/fortran_libarm64.dylib b/src/msl/examples/loadlib/fortran_libarm64.dylib index 538afb6cb88528b5c32d3b8b912af05a75729c54..8ed0fc6b01e681ef8afe8f22f499ebd08849fbc6 100644 GIT binary patch delta 266 zcmbQy%QT~xX@Usjj*X(t%mNnoD)#QwwO=#w|4-R1Q(xIlUcqd_7%=%RvxbI)p|O5W zW|Dq-aznVyzkR8o|fr)R2{QVEn|;9+232$*cjqM?MTxUe)aB{#7oL(c%Bcyc>S zEMvsvr!4ZKAjO8pdPaH%NES?%W|g1pz^WpNRTkum$+oQO;#g%F7&h-_HPoBLCb9XA vaeJTwi}Gzz&HXCPTG!kE#XX#MW8=@<6-RCJwyNx3_hu$fncn8ft*ndy{hV1w delta 289 zcmbQy%QT~xX@Usjg^i-k%mVw%R;sZ!+i&W+5}2hUv1|3@70f1#5tHvSYZ&O~WG3mS zCnxJCmlhSJ=9Pf>>1p{zB}IvOdZv0Ql|ViN1n>Z