Merge pull request #314 from ej2/0.9.4

0.9.4 Release

Author: ej2

CHANGELOG.rst

@@ -1,5 +1,11 @@
 Changelog
 =========
+* 0.9.4 (August 29, 2023)
+    * Removed python 2 compatible decorators
+    * Removed python 2 dependencies
+    * Fixed issue with MarkupInfo field on AccountBasedExpenseLineDetail
+    * Removed test files from package
+
 * 0.9.3 (March 7, 2023)
     * Added support for Recurring Transaction
     * Added support for optional query params

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.md
 include LICENSE
-recursive-include tests *
+recursive-exclude tests *

Makefile

@@ -1,4 +1,3 @@
-
 publish: clean
 	python setup.py sdist
 	twine upload dist/*

Pipfile

@@ -10,9 +10,8 @@ urllib3 = ">=1.26.5"
 bleach = ">=3.3.0"
 intuit-oauth = "==1.2.4"
 rauth = ">=0.7.3"
-requests = ">=2.26.0"
-simplejson = ">=3.17.0"
-six = ">=1.14.0"
+requests = ">=2.31.0"
+simplejson = ">=3.19.1"
 nose = "*"
 coverage = "*"
 twine = "*"

Pipfile.lock

@@ -4,6 +4,7 @@ python-quickbooks
 [![Python package](https://github.com/ej2/python-quickbooks/actions/workflows/python-package.yml/badge.svg)](https://github.com/ej2/python-quickbooks/actions/workflows/python-package.yml)
 [![Coverage Status](https://coveralls.io/repos/github/ej2/python-quickbooks/badge.svg?branch=master)](https://coveralls.io/github/ej2/python-quickbooks?branch=master)
 [![](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/ej2/python-quickbooks/blob/master/LICENSE)
+[![PyPI](https://img.shields.io/pypi/v/python-quickbooks)](https://pypi.org/project/python-quickbooks/)
 
 A Python 3 library for accessing the Quickbooks API. Complete rework of
 [quickbooks-python](https://github.com/troolee/quickbooks-python).
@@ -14,6 +15,13 @@ You can find additional examples of usage in [Integration tests folder](https://
 
 For information about contributing, see the [Contributing Page](https://github.com/ej2/python-quickbooks/blob/master/contributing.md).
 
+Installation
+------------
+
+```bash
+pip install python-quickbooks
+```
+
 QuickBooks OAuth
 ------------------------------------------------
 

README.md

@@ -1,4 +1,4 @@
-coverage==6.4.2
-ipdb==0.13.9
-mock==2.0.0
+coverage==7.3.0
+ipdb==0.13.13
+mock==5.1.0
 nose==1.3.7

dev_requirements.txt

@@ -1,9 +1,8 @@
-from future.moves.urllib.parse import quote
+from urllib.parse import quote
 
 try: import simplejson as json
 except ImportError: import json
 
-import six
 from .utils import build_where_clause, build_choose_clause
 from .client import QuickBooks
 from .exceptions import QuickbooksException
@@ -70,14 +69,9 @@ def to_dict(obj, classkey=None):
     elif hasattr(obj, "__iter__") and not isinstance(obj, str):
         return [to_dict(v, classkey) for v in obj]
     elif hasattr(obj, "__dict__"):
-        if six.PY2:
-            data = dict([(key, to_dict(value, classkey))
-                        for key, value in obj.__dict__.iteritems()
-                        if not callable(value) and not key.startswith('_')])
-        else:
-            data = dict([(key, to_dict(value, classkey))
-                        for key, value in obj.__dict__.items()
-                        if not callable(value) and not key.startswith('_')])
+        data = dict([(key, to_dict(value, classkey))
+                    for key, value in obj.__dict__.items()
+                    if not callable(value) and not key.startswith('_')])
 
         if classkey is not None and hasattr(obj, "__class__"):
             data[classkey] = obj.__class__.__name__

quickbooks/mixins.py

@@ -1,8 +1,6 @@
-from six import python_2_unicode_compatible
 from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity
 
 
-@python_2_unicode_compatible
 class Account(QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: Account is a component of a Chart Of Accounts, and is part of a Ledger. Used to record a total

quickbooks/objects/account.py

@@ -1,10 +1,8 @@
-from six import python_2_unicode_compatible
 from .base import Ref, QuickbooksManagedObject, QuickbooksTransactionEntity, AttachableRef
 from ..client import QuickBooks
 from ..mixins import DeleteMixin
 
 
-@python_2_unicode_compatible
 class Attachable(DeleteMixin, QuickbooksManagedObject, QuickbooksTransactionEntity):
     """
     QBO definition: This page covers the Attachable, Upload, and Download resources used for attachment management. Attachments are supplemental information linked to a transaction or Item object. They can be files, notes, or a combination of both.