apsg 1.3.4__tar.gz → 1.3.6__tar.gz

{apsg-1.3.4/src/apsg.egg-info → apsg-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsg
-Version: 1.3.4
+Version: 1.3.6
 Summary: APSG - The package for structural geologists
 Author-email: Ondrej Lexa <lexa.ondrej@gmail.com>
 Maintainer-email: Ondrej Lexa <lexa.ondrej@gmail.com>
@@ -59,14 +59,8 @@ Requires-Dist: ipykernel; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: autodocsumm; extra == "docs"
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
+Requires-Dist: apsg[docs,extra,tests]; extra == "dev"
 Requires-Dist: black; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: sphinx_rtd_theme; extra == "dev"
-Requires-Dist: readthedocs-sphinx-search; extra == "dev"
-Requires-Dist: ipykernel; extra == "dev"
-Requires-Dist: nbsphinx; extra == "dev"
-Requires-Dist: autodocsumm; extra == "dev"
 Dynamic: license-file
 
 <img src="https://ondrolexa.github.io/apsg/apsg_banner.svg" alt="APSG logo" width="300px"/>

{apsg-1.3.4 → apsg-1.3.6}/pyproject.toml

@@ -28,16 +28,7 @@ docs = [
     "nbsphinx",
     "autodocsumm",
 ]
-dev = [
-    "pytest",
-    "black",
-    "sphinx",
-    "sphinx_rtd_theme",
-    "readthedocs-sphinx-search",
-    "ipykernel",
-    "nbsphinx",
-    "autodocsumm",
-]
+dev = ["apsg[extra,tests,docs]", "black"]
 
 [project.urls]
 Homepage = "https://github.com/ondrolexa/apsg"

{apsg-1.3.4 → apsg-1.3.6}/src/apsg/__init__.py

@@ -1,56 +1,114 @@
 # -*- coding: utf-8 -*-
 
-from apsg.math import (
-    Vector3 as vec,
-    Vector2 as vec2,
-    Matrix2 as matrix2,
-    Matrix3 as matrix,
-)
 from apsg.config import apsg_conf
 from apsg.feature import (
-    Lineation as lin,
-    Foliation as fol,
-    Pair as pair,
-    Fault as fault,
+    ClusterSet as cluster,
+)
+from apsg.feature import (
     Cone as cone,
 )
 from apsg.feature import (
-    Vector3Set as vecset,
-    Vector2Set as vec2set,
-    LineationSet as linset,
-    FoliationSet as folset,
-    PairSet as pairset,
-    FaultSet as faultset,
     ConeSet as coneset,
+)
+from apsg.feature import (
+    DeformationGradient2 as defgrad2,
+)
+from apsg.feature import (
+    DeformationGradient3 as defgrad,
+)
+from apsg.feature import (
+    Direction as dir2,
+)
+from apsg.feature import (
+    Direction2Set as dir2set,
+)
+from apsg.feature import (
+    Ellipse as ellipse,
+)
+from apsg.feature import (
     EllipseSet as ellipseset,
+)
+from apsg.feature import (
+    Ellipsoid as ellipsoid,
+)
+from apsg.feature import (
     EllipsoidSet as ellipsoidset,
+)
+from apsg.feature import (
+    Fault as fault,
+)
+from apsg.feature import (
+    FaultSet as faultset,
+)
+from apsg.feature import (
+    Foliation as fol,
+)
+from apsg.feature import (
+    FoliationSet as folset,
+)
+from apsg.feature import G
+from apsg.feature import (
+    Lineation as lin,
+)
+from apsg.feature import (
+    LineationSet as linset,
+)
+from apsg.feature import (
+    OrientationTensor2 as ortensor2,
+)
+from apsg.feature import (
     OrientationTensor2Set as ortensor2set,
+)
+from apsg.feature import (
+    OrientationTensor3 as ortensor,
+)
+from apsg.feature import (
     OrientationTensor3Set as ortensorset,
-    ClusterSet as cluster,
 )
 from apsg.feature import (
-    DeformationGradient3 as defgrad,
-    VelocityGradient3 as velgrad,
+    Pair as pair,
+)
+from apsg.feature import (
+    PairSet as pairset,
+)
+from apsg.feature import (
+    Stress2 as stress2,
+)
+from apsg.feature import (
     Stress3 as stress,
-    Ellipsoid as ellipsoid,
-    OrientationTensor3 as ortensor,
 )
 from apsg.feature import (
-    DeformationGradient2 as defgrad2,
+    Vector2Set as vec2set,
+)
+from apsg.feature import (
+    Vector3Set as vecset,
+)
+from apsg.feature import (
     VelocityGradient2 as velgrad2,
-    Stress2 as stress2,
-    Ellipse as ellipse,
-    OrientationTensor2 as ortensor2,
 )
-from apsg.feature import G
+from apsg.feature import (
+    VelocityGradient3 as velgrad,
+)
+from apsg.math import (
+    Matrix2 as matrix2,
+)
+from apsg.math import (
+    Matrix3 as matrix,
+)
+from apsg.math import (
+    Vector2 as vec2,
+)
+from apsg.math import (
+    Vector3 as vec,
+)
 from apsg.plotting import (
+    FlinnPlot,
+    HsuPlot,
+    RamsayPlot,
+    RosePlot,
     StereoGrid,
     StereoNet,
-    RosePlot,
     VollmerPlot,
-    RamsayPlot,
-    FlinnPlot,
-    HsuPlot,
     quicknet,
 )
 
@@ -60,6 +118,7 @@ __all__ = (
     "vec2",
     "matrix",
     "matrix2",
+    "dir2",
     "lin",
     "fol",
     "pair",
@@ -67,6 +126,7 @@ __all__ = (
     "cone",
     "vecset",
     "vec2set",
+    "dir2set",
     "linset",
     "folset",
     "pairset",
@@ -98,6 +158,6 @@ __all__ = (
     "quicknet",
 )
 
-__version__ = "1.3.4"
+__version__ = "1.3.6"
 __author__ = "Ondrej Lexa"
 __email__ = "lexa.ondrej@gmail.com"

{apsg-1.3.4 → apsg-1.3.6}/src/apsg/config.py

@@ -138,7 +138,6 @@ apsg_conf = dict(
     ),
     roseplot_default_kwargs=dict(
         bins=36,
-        axial=True,
         density=True,
         arrowness=0.95,
         rwidth=1,

{apsg-1.3.4 → apsg-1.3.6}/src/apsg/database/_sdbread.py

@@ -10,7 +10,7 @@ from apsg.feature._geodata import Lineation, Foliation
 from apsg.feature._container import LineationSet, FoliationSet
 
 
-class SDB(object):
+class SDB:
     """
     sqlite3 based read-only interface to PySDB database
 

{apsg-1.3.4 → apsg-1.3.6}/src/apsg/feature/__init__.py

@@ -1,39 +1,42 @@
 # -*- coding: utf-8 -*-
 import sys
-from apsg.feature._geodata import Lineation, Foliation, Pair, Fault, Cone
+
 from apsg.feature._container import (
-    FeatureSet,
-    Vector2Set,
-    Vector3Set,
-    LineationSet,
-    FoliationSet,
-    PairSet,
-    FaultSet,
+    ClusterSet,
     ConeSet,
+    Direction2Set,
     EllipseSet,
     EllipsoidSet,
+    FaultSet,
+    FeatureSet,
+    FoliationSet,
+    G,
+    LineationSet,
     OrientationTensor2Set,
     OrientationTensor3Set,
-    G,
-    ClusterSet,
-)
-from apsg.feature._tensor3 import (
-    DeformationGradient3,
-    VelocityGradient3,
-    Stress3,
-    Ellipsoid,
-    OrientationTensor3,
+    PairSet,
+    Vector2Set,
+    Vector3Set,
 )
+from apsg.feature._geodata import Cone, Direction, Fault, Foliation, Lineation, Pair
+from apsg.feature._paleomag import Core
 from apsg.feature._tensor2 import (
     DeformationGradient2,
-    VelocityGradient2,
-    Stress2,
     Ellipse,
     OrientationTensor2,
+    Stress2,
+    VelocityGradient2,
+)
+from apsg.feature._tensor3 import (
+    DeformationGradient3,
+    Ellipsoid,
+    OrientationTensor3,
+    Stress3,
+    VelocityGradient3,
 )
-from apsg.feature._paleomag import Core
 
 __all__ = (
+    "Direction",
     "Lineation",
     "Foliation",
     "Pair",
@@ -50,6 +53,7 @@ __all__ = (
     "Ellipse",
     "OrientationTensor2",
     "Vector2Set",
+    "Direction2Set",
     "FeatureSet",
     "Vector3Set",
     "LineationSet",