update merged

.gitignore

@@ -164,3 +164,6 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+
+# Latex temp files (in case you include a documentation in latex e.g.)
+*.aux

setup.cfg

@@ -22,14 +22,16 @@ url = https://gitlab.mpcdf.mpg.de/dboe/tfields
 author = Daniel Böckenhoff
 author_email = dboe@ipp.mpg.de
 classifiers = 
-	Development Status :: 3 - Alpha
-	License :: OSI Approved :: MIT License
-	Programming Language :: Python
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.5
-	Programming Language :: Python :: 3.6
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
+    Development Status :: 3 - Alpha
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 license = MIT License
 license_files = LICENSE.rst
 description = Tensors, tensor fields, graphs, mesh manipulation, CAD and more on the basis of numpy.ndarrays. All objects keep track of their coordinate system. Symbolic math operations work for object manipulation.
@@ -44,6 +46,7 @@ project_urls =
 python_requires = >=3.0
 packages = find:
 install_requires = 
+	pathlib;python_version<'3.10'
 	six
 	numpy
 	sympy<=1.6.2  # diffgeom changes in 1.7 see unit branch for first implementation of compatibility
@@ -53,6 +56,8 @@ install_requires =
 	sortedcontainers
 tests_require = 
 	doctest
+    unittest
+    pytest
 
 [options.packages.find]
 exclude = 
@@ -128,13 +133,15 @@ junit_family = xunit2
 minversion = 3.7
 skip_missing_interpreters = true
 envlist = 
-	py{38}
+	py{38,39,310}
 recreate = true
 usedevelop = true
 
 [gh-actions]
 python = 
 	3.8: py38
+	3.9: py39
+	3.10: py310
 
 [testenv]
 description = run test suite under {basepython}