Skip to content
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.

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

python3Packages.import-expression: 1.1.4 -> 1.1.5 #314735

Merged
merged 2 commits into from
May 27, 2024

Conversation

StarrFox
Copy link
Contributor

@StarrFox StarrFox commented May 26, 2024

Description of changes

updates version to 1.1.5, the main change this version is that tests are included in the pypi source dists so we don't need to pull from github anymore

the patch is also no longer needed as it was merged in this version

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@itslychee
Copy link
Contributor

Thanks for the PR, if you wouldn't mind, could you update the nativeBuildInputs and propagatedBuildInputs field names to build-system and dependencies respectively, the Python wrapper was recently updated to have clearer naming on where deps go.

https://nixos.org/manual/nixpkgs/unstable/#buildpythonpackage-function
#271597

@StarrFox
Copy link
Contributor Author

Thanks for the PR, if you wouldn't mind, could you update the nativeBuildInputs and propagatedBuildInputs field names to build-system and dependencies respectively, the Python wrapper was recently updated to have clearer naming on where deps go.

https://nixos.org/manual/nixpkgs/unstable/#buildpythonpackage-function #271597

done

@itslychee
Copy link
Contributor

Thank you, if you could rewrite the commit message to be like python3Packages.import-expression: update legacy attributes to follow the commit conventions that'd be wonderful!

@itslychee itslychee added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label May 27, 2024
@ofborg ofborg bot requested a review from itslychee May 27, 2024 01:32
@itslychee
Copy link
Contributor

silly bot

@tomberek
Copy link
Contributor

Result of nixpkgs-review pr 314735 run on x86_64-linux 1

4 packages failed to build:
  • python312Packages.import-expression
  • python312Packages.import-expression.dist
  • python312Packages.jishaku
  • python312Packages.jishaku.dist
4 packages built:
  • python311Packages.import-expression
  • python311Packages.import-expression.dist
  • python311Packages.jishaku
  • python311Packages.jishaku.dist

@tomberek
Copy link
Contributor

Might want something like:

diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 3407aa277152..34f49401996d 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -6,6 +6,7 @@
   pytestCheckHook,
   astunparse,
   setuptools,
+  pythonAtLeast,
 }:
 buildPythonPackage rec {
   pname = "import-expression";
@@ -36,6 +37,7 @@ buildPythonPackage rec {
       psfl
     ];
     mainProgram = "import-expression";
+    broken = pythonAtLeast "3.12";
     maintainers = with lib.maintainers; [ lychee ];
   };
 }

or fix the issue

@tomberek
Copy link
Contributor

merging, as this doesn't make the breakage worse, but still recommend addressing python312

@tomberek tomberek force-pushed the import_expression_1.1.5 branch from 0d84496 to ad43b9c Compare May 27, 2024 02:29
@tomberek tomberek merged commit a23b799 into NixOS:master May 27, 2024
6 of 7 checks passed
@StarrFox StarrFox deleted the import_expression_1.1.5 branch May 27, 2024 03:06
@StarrFox
Copy link
Contributor Author

Might want something like:

diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 3407aa277152..34f49401996d 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -6,6 +6,7 @@
   pytestCheckHook,
   astunparse,
   setuptools,
+  pythonAtLeast,
 }:
 buildPythonPackage rec {
   pname = "import-expression";
@@ -36,6 +37,7 @@ buildPythonPackage rec {
       psfl
     ];
     mainProgram = "import-expression";
+    broken = pythonAtLeast "3.12";
     maintainers = with lib.maintainers; [ lychee ];
   };
 }

or fix the issue

ioistired/import-expression@e1b5c76

new version of package which fixes the 3.12 issue out now

@itslychee
Copy link
Contributor

Not really sure why they bumped the major version as there doesn't seem to be anything breaking, but regardless I think it's okay to bump the package's major version, unsure of what the policy is around that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants