python3Packages.beancount: 2.3.6 -> 3.1.0 (#371541)

Author: dotlambda

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -179,6 +179,8 @@
 
 - `ast-grep` remove `sg` command to prevent conflict with `sg` command from shadow-utils. If you need legacy sg command compatibility with old code, you can use `ast-grep.override { enableLegacySg = true; }`
 
+- `python3Packages.beancount` was updated to 3.1.0. Previous major version remains available as `python3Packages.beancount_2`.
+
 - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.
   See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.
 

pkgs/by-name/be/beanprice/package.nix

@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "beanprice";
-  version = "1.2.1-unstable-2024-06-19";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "beanprice";
-    rev = "e894c9182f4d16f9a46ccb87bdaeca1a7dede040";
-    hash = "sha256-l96W77gldE06Za8fj84LADGCqlYeWlHKvWQO+oLy1gI=";
+    tag = "v${version}";
+    hash = "sha256-+bqYnTzZByJlCPUhThM2B9UjgdWzjF21Yiw3fQAZ6k4=";
   };
 
   build-system = with python3Packages; [ setuptools ];
@@ -31,9 +31,10 @@ python3Packages.buildPythonApplication rec {
     regex
   ];
 
-  pythonImportsCheck = [ "beancount" ];
+  pythonImportsCheck = [ "beanprice" ];
 
   meta = {
+    broken = lib.versionOlder python3Packages.beancount.version "3";
     homepage = "https://github.com/beancount/beanprice";
     description = "Price quotes fetcher for Beancount";
     longDescription = ''

pkgs/by-name/fa/fava/package.nix

@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fava";
-  version = "1.29";
+  version = "1.30.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-UZZ142FchYXqPtHb6EWnKjV+xtJ0Gvu+SovTH6+kVn8=";
+    hash = "sha256-69Wx9/H7nLDPZP9LOUnDJngY9YTCcr+oQ0E6+xeIWPE=";
   };
 
   postPatch = ''
@@ -24,11 +24,12 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     babel
     beancount
+    beangulp
+    beanquery
     cheroot
     click
     flask
     flask-babel
-    jaraco-functools
     jinja2
     markdown2
     ply
@@ -39,17 +40,22 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
+  env = {
+    # Disable some tests when building with beancount2
+    SNAPSHOT_IGNORE = lib.versions.major python3Packages.beancount.version == "2";
+  };
+
   preCheck = ''
     export HOME=$TEMPDIR
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Web interface for beancount";
     mainProgram = "fava";
     homepage = "https://beancount.github.io/fava";
     changelog = "https://beancount.github.io/fava/changelog.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       bhipple
       sigmanificient
     ];

pkgs/development/python-modules/beancount/2.nix

@@ -0,0 +1,70 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  isPy3k,
+  beautifulsoup4,
+  bottle,
+  chardet,
+  python-dateutil,
+  google-api-python-client,
+  google-auth-oauthlib,
+  lxml,
+  oauth2client,
+  ply,
+  pytest,
+  python-magic,
+  requests,
+}:
+
+buildPythonPackage rec {
+  version = "2.3.6";
+  format = "setuptools";
+  pname = "beancount";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o=";
+  };
+
+  # Tests require files not included in the PyPI archive.
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    bottle
+    chardet
+    python-dateutil
+    google-api-python-client
+    google-auth-oauthlib
+    lxml
+    oauth2client
+    ply
+    python-magic
+    requests
+    # pytest really is a runtime dependency
+    # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82
+    pytest
+  ];
+
+  # beancount cannot be directly bumped to 3.x
+  # e.g. https://github.com/NixOS/nixpkgs/issues/380197
+  passthru.skipBulkUpdate = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/beancount/beancount";
+    description = "Double-entry bookkeeping computer language";
+    longDescription = ''
+      A double-entry bookkeeping computer language that lets you define
+      financial transaction records in a text file, read them in memory,
+      generate a variety of reports from them, and provides a web interface.
+    '';
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [
+      sharzy
+      polarmutex
+    ];
+  };
+}

pkgs/development/python-modules/beancount/default.nix

@@ -1,70 +1,68 @@
 {
   lib,
+  bison,
   buildPythonPackage,
-  fetchPypi,
-  isPy3k,
-  beautifulsoup4,
-  bottle,
-  chardet,
+  click,
+  fetchFromGitHub,
+  flex,
+  gnupg,
+  meson,
+  meson-python,
+  pytestCheckHook,
   python-dateutil,
-  google-api-python-client,
-  google-auth-oauthlib,
-  lxml,
-  oauth2client,
-  ply,
-  pytest,
-  python-magic,
-  requests,
+  regex,
 }:
 
 buildPythonPackage rec {
-  version = "2.3.6";
-  format = "setuptools";
+  version = "3.1.0";
   pname = "beancount";
+  pyproject = true;
 
-  disabled = !isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o=";
+  src = fetchFromGitHub {
+    owner = "beancount";
+    repo = "beancount";
+    tag = version;
+    hash = "sha256-ogjBW/NGlMmhYlzcx3EWWoVi+OOEv2Wm49tzwMiNb8A=";
   };
 
-  # Tests require files not included in the PyPI archive.
-  doCheck = false;
+  build-system = [
+    meson
+    meson-python
+  ];
 
-  propagatedBuildInputs = [
-    beautifulsoup4
-    bottle
-    chardet
+  dependencies = [
+    click
     python-dateutil
-    google-api-python-client
-    google-auth-oauthlib
-    lxml
-    oauth2client
-    ply
-    python-magic
-    requests
-    # pytest really is a runtime dependency
-    # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82
-    pytest
+    regex
+  ];
+
+  nativeBuildInputs = [
+    bison
+    flex
   ];
 
-  # beancount cannot be directly bumped to 3.x
-  # e.g. https://github.com/NixOS/nixpkgs/issues/380197
-  passthru.skipBulkUpdate = true;
+  nativeCheckInputs = [
+    gnupg
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # avoid local paths, relative imports wont resolve correctly
+    mv beancount tests
+  '';
+
+  pythonImportsCheck = [ "beancount" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/beancount/beancount";
+    changelog = "https://github.com/beancount/beancount/releases/tag/${src.tag}";
     description = "Double-entry bookkeeping computer language";
     longDescription = ''
       A double-entry bookkeeping computer language that lets you define
       financial transaction records in a text file, read them in memory,
       generate a variety of reports from them, and provides a web interface.
     '';
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [
-      sharzy
-      polarmutex
-    ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ alapshin ];
   };
 }

pkgs/development/python-modules/beangulp/default.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  beancount,
+  beautifulsoup4,
+  buildPythonPackage,
+  chardet,
+  click,
+  fetchFromGitHub,
+  lxml,
+  petl,
+  python-magic,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "beangulp";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "beancount";
+    repo = "beangulp";
+    tag = "v${version}";
+    hash = "sha256-h7xLHwEyS+tOI7v6Erp12VfVnxOf4930++zghhC3in4=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    beancount
+    beautifulsoup4
+    chardet
+    click
+    lxml
+    python-magic
+  ];
+
+  nativeCheckInputs = [
+    petl
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "beangulp"
+  ];
+
+  meta = {
+    homepage = "https://github.com/beancount/beangulp";
+    description = "Importers framework for Beancount";
+    longDescription = ''
+      Beangulp provides a framework for importing transactions into a Beancoount
+      ledger from account statements and other documents and for managing documents.
+    '';
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ alapshin ];
+  };
+}

pkgs/development/python-modules/beanquery/default.nix

@@ -7,18 +7,20 @@
   python-dateutil,
   pytestCheckHook,
   setuptools,
-  tatsu,
+  tatsu-lts,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "beanquery";
-  version = "0.1.0";
+  version = "0.1.0-unstable-2025-01-10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "beancount";
     repo = "beanquery";
-    tag = "v${version}";
-    hash = "sha256-1+KTUvnqPceRbzY1OZwOSQdK7f78K9kSwtQfI1SUIa8=";
+    # Pinned at commit where tatsu dependency replaced with tatsu-lts
+    # Later snapsot versions break fava build due to API changes at beanquery/shell.py
+    rev = "e77a67996a54eef2e9d77b6352c74a40164e281d";
+    hash = "sha256-XYfKAscm55lY4YjIGTQ6RMFnCPWemfszpheGQ9qjMiM=";
   };
 
   build-system = [ setuptools ];
@@ -27,15 +29,12 @@ buildPythonPackage rec {
     beancount
     click
     python-dateutil
-    tatsu
+    tatsu-lts
   ];
 
-  pythonRelaxDeps = [ "tatsu" ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [
-    "beancount"
     "beanquery"
   ];