Merge branch 'main' into patch-1

Author: FlipperPA

.gitignore

@@ -1,16 +1,8 @@
-# manage.py, always default to dev settings
-manage.py
-
-# Django media files
-media/*
-
-# Python bytecode:
+# Python
 *.py[co]
-
-# Packaging files:
 *.egg*
-
-# Sphinx docs:
+venv
+dist
 build
 
 # SQLite3 database files:
@@ -19,9 +11,6 @@ build
 # Logs:
 *.log
 
-# Eclipse
-.project
-
 # Linux Editors
 *~
 \#*\#
@@ -42,20 +31,5 @@ tramp
 Thumbs.db
 Desktop.ini
 
-# Dev tools
-.idea
-.vagrant
-
-# Ignore local configurations
-wrds/settings/local.py
-db.sqlite3
-
-# Node modules
-node_modules/
-
-# Bower components
-bower_components/
-
 # Coverage
 htmlcov/
-.coverage

drf_excel/fields.py

@@ -141,7 +141,8 @@ def init_value(self, value):
                     tzinfo=None
                 )
         except:
-            return value
+            pass
+        return value
 
     def prep_cell(self, cell: Cell):
         super().prep_cell(cell)
@@ -161,7 +162,7 @@ def __init__(self, list_sep, **kwargs):
     def prep_value(self) -> Any:
         if self.value is None:
             return super().prep_value()
-        elif len(self.value) > 0 and isinstance(self.value[0], Iterable):
+        elif len(self.value) > 0 and isinstance(self.value[0], Iterable) and not isinstance(self.value[0], str):
             # array of array; write as json
             return json.dumps(self.value, ensure_ascii=False)
         else:

pyproject.toml

@@ -0,0 +1,63 @@
+[project]
+name = "drf-excel"
+authors = [{name = "Tim Allen", email = "[email protected]"},]
+description = "Django REST Framework renderer for Excel spreadsheet (xlsx) files."
+dynamic = ["version"]
+readme = "README.md"
+requires-python = ">=3.7"
+keywords = ["djangorestframework", "django rest framework", "excel", "spreadsheet", "rest", "restful", "api", "xls", "xlsx", "openpyxl"]
+license = {text = "BSD-3-Clause"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3 :: Only",
+    "Framework :: Django",
+    "Framework :: Django :: 3",
+    "Framework :: Django :: 4",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+]
+dependencies = [
+    "djangorestframework>=3.14",
+    "openpyxl>=2.4",
+]
+
+[project.optional-dependencies]
+dev = [
+  "django-coverage-plugin",
+  "ipython",
+  "ruff",
+  "pytest-coverage",
+  "pytest-django",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/wharton/drf-excel/"
+"Repository" = "https://github.com/wharton/drf-excel/"
+"Documentation" = "https://github.com/wharton/drf-excel/"
+
+[build-system]
+requires = ["setuptools>=67", "setuptools_scm>=7", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+write_to = "drf_excel/_version.py"
+
+[tool.pytest.ini_options]
+addopts = "--cov --cov-report=html"
+python_files = "tests.py test_*.py"
+DJANGO_SETTINGS_MODULE = "tests.settings"
+
+[tool.coverage.run]
+plugins = ["django_coverage_plugin"]
+include = ["drf_excel/*"]