gnucash: update to 3.10

This commit is contained in:
Manfred Usselmann 2020-04-14 20:47:13 +02:00 committed by Helmut Pozimski
parent 74125d9487
commit a674f1ecb5
3 changed files with 32 additions and 31 deletions

View file

@ -1,28 +0,0 @@
Source: Hoshpak/upstream
Upstream: partial
Reason: compatibility of the remaining code with python3
--- gnucash/python/pycons/ishell.py 2018-09-27 12:30:44.136631542 +0200
+++ gnucash/python/pycons/ishell.py 2018-09-27 12:46:51.636875378 +0200
@@ -16,11 +16,10 @@
import os
import sys
import re
-from StringIO import StringIO
try:
import IPython
- from IPython import ipapi
-except Exception,e:
+ from IPython.core import interactiveshell
+except Exception as e:
raise "Error importing IPython (%s)" % str(e)
@@ -54,7 +53,7 @@
header='IPython system call: ',
verbose=self.IP.rc.system_verbose)
# Get a hold of the public IPython API object and use it
- self.ip = ipapi.get()
+ self.ip = interactiveshell.get_ipython()
self.ip.magic('colors LightBG')
sys.excepthook = excepthook
self.iter_more = 0

View file

@ -0,0 +1,29 @@
--- bindings/python/tests/CMakeLists.txt
+++ bindings/python/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ if (WITH_PYTHON)
# Because it hasn't been built yet
set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core)
endif()
- add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py swig-app-utils-python)
+ add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py sw_app_utils)
add_dependencies(check test-python-bindings)
add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
set_property(TEST python-bindings PROPERTY ENVIRONMENT
@@ -21,6 +21,7 @@ set(test_python_bindings_DATA
test_business.py
test_commodity.py
test_numeric.py
+ test_session.py
test_split.py
test_transaction.py
test_query.py)
--- bindings/python/tests/runTests.py.in
+++ bindings/python/tests/runTests.py.in
@@ -5,7 +5,6 @@ import os
os.environ["GNC_UNINSTALLED"] = "1"
-from test_session import TestSession
from test_book import TestBook
from test_account import TestAccount
from test_split import TestSplit

View file

@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=3.9
revision=2
version=3.10
revision=1
wrksrc="${pkgname}-${version%b}"
build_style=cmake
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnucash.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=8d02dddc7cbc9d7324f4b577825dffffb8c4c938746701407e7b04bd647eb9ff
checksum=b60772c276a63639964d1e24c795fbb9a7c0c6c45959168fe5cdfe08eb796f16
pycompile_dirs="usr/share/gnucash/python"
conf_files="/etc/gnucash/environment"