python312Packages.pythonqwt: init at 0.12.7 #327446
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
8.has: package (new)
natsukium
reviewed
Jul 17, 2024
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
5c4ae30 to
153e3fe
Compare
|
Thanks for the review :). Why did you suggest to add
Done. |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
153e3fe to
d2a610a
Compare
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
d2a610a to
685a798
Compare
13 tasks
dotlambda
requested changes
Sep 1, 2024
That's just accidental cause something propagates it but might stop doing so in the future. Also, cross compilation. |
OK that's a good reason, thanks for explaining. |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
2 times, most recently
from
b58a075 to
2e2b411
Compare
|
Resolved all of the review comments, besides of course the numpy / numpy_2 debate which is still under discussion. |
dotlambda
reviewed
Sep 1, 2024
|
Here's what you should do if PlotPy really only supports NumPy 2: diff --git a/pkgs/by-name/pl/plotpy-test/package.nix b/pkgs/by-name/pl/plotpy-test/package.nix
new file mode 100644
index 000000000000..c07481355fac
--- /dev/null
+++ b/pkgs/by-name/pl/plotpy-test/package.nix
@@ -0,0 +1,12 @@
+{
+ python3,
+}:
+
+let
+ python = python3.override {
+ packageOverrides = self: super: {
+ numpy = self.numpy_2;
+ };
+ };
+in
+python.pkgs.plotpy
diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index afa802aab927..5a00f6c32134 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
- numpy_2,
+ numpy,
qtpy,
h5py,
requests,
@@ -32,19 +32,17 @@ buildPythonPackage rec {
dependencies = [
qtpy
h5py
+ numpy
requests
tomli
];
+
nativeCheckInputs = [
pytestCheckHook
# Not propagating this, to allow one to choose to either choose a pyqt /
# pyside implementation
pyqt6
];
- buildInputs = [
- # Can work with both numpy_2 and numpy_1, so not propagating it.
- numpy_2
- ];
preCheck = ''
export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"
diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix
index 05e47385f601..7c7ce8f27e8e 100644
--- a/pkgs/development/python-modules/plotpy/default.nix
+++ b/pkgs/development/python-modules/plotpy/default.nix
@@ -3,10 +3,11 @@
buildPythonPackage,
fetchFromGitHub,
cython_0,
- numpy_2,
+ numpy,
setuptools,
guidata,
pillow,
+ plotpy-test,
qwt,
scikit-image,
scipy,
@@ -32,8 +33,7 @@ buildPythonPackage rec {
dependencies = [
guidata
- # Doesn't support numpy_1
- numpy_2
+ numpy
pillow
qwt
scikit-image
@@ -43,7 +43,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "plot_py" ];
+ passthru.tests = {
+ # builds plotpy in a Python package set with `numpy = numpy_2`
+ inherit plotpy-test;
+ };
+
meta = {
+ broken = lib.versionOlder numpy.version "2";
description = "Curve and image plotting tools for Python/Qt applications";
homepage = "https://github.com/PlotPyStack/PlotPy";
changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md";
diff --git a/pkgs/development/python-modules/qwt/default.nix b/pkgs/development/python-modules/qwt/default.nix
index ace4905fa570..f3b99c5dfc69 100644
--- a/pkgs/development/python-modules/qwt/default.nix
+++ b/pkgs/development/python-modules/qwt/default.nix
@@ -27,18 +27,16 @@ buildPythonPackage rec {
];
dependencies = [
+ numpy
qtpy
];
+
nativeCheckInputs = [
pytestCheckHook
# Not propagating this, to allow one to choose to either choose a pyqt /
# pyside implementation
pyqt6
];
- buildInputs = [
- # Can work with both numpy_2 and numpy_1, so not propagating it.
- numpy
- ];
preCheck = ''
export QT_PLUGIN_PATH="${lib.getBin qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}"The |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
2 times, most recently
from
9fd16dd to
a1b02f6
Compare
13 tasks
doronbehar
changed the title
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
a1b02f6 to
050acda
Compare
|
OK I propagated all of numpy's usages, and so the rest of the review comments are resolved. I can live with Numpy 1 in the near future, until better dependencies' conflict resolution will be available. |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
050acda to
b9c55d3
Compare
|
Converted back to a draft because there are still a few issues that upstream now makes an effort to solve at PlotPyStack/PlotPy#20 . |
doronbehar
force-pushed
the
pkg/PlotPyStack
branch
from
b9c55d3 to
97fb6ff
Compare
doronbehar
changed the title
|
Upstream fixed the issues it had with some of the tests. Now it should be ready :). |
|
@dotlambda your review is required. |
|
Friendly ping @dotlambda . |
dotlambda
approved these changes
Oct 21, 2024
|
Sorry for the delay! |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.