apsg 1.1.5__py2.py3-none-any.whl → 1.2.0__py2.py3-none-any.whl

apsg/__init__.py

@@ -98,6 +98,6 @@ __all__ = (
     "quicknet",
 )
 
-__version__ = "1.1.5"
+__version__ = "1.2.0"
 __author__ = "Ondrej Lexa"
 __email__ = "lexa.ondrej@gmail.com"

apsg/plotting/_stereonet.py

@@ -940,17 +940,17 @@ def quicknet(*args, **kwargs):
         filename (str): filename for figure. Default `stereonet.png`
         savefig_kwargs (dict): dict passed to ``plt.savefig``
         fol_as_pole (bool): True to plot planar features as poles,
-            False for plotting as great circle. Default `True`
+            False for plotting as great circle. Default `False`
 
     Example:
         >>> l = linset.random_fisher(position=lin(120, 50))
         >>> f = folset.random_fisher(position=lin(300, 40))
-        >>> quicknet(f, l, fol_as_pole=False)
+        >>> quicknet(f, l)
     """
     savefig = kwargs.get("savefig", False)
     filename = kwargs.get("filename", "stereonet.png")
     savefig_kwargs = kwargs.get("savefig_kwargs", {})
-    fol_as_pole = kwargs.get("fol_as_pole", True)
+    fol_as_pole = kwargs.get("fol_as_pole", False)
     s = StereoNet(**kwargs)
     for arg in args:
         if isinstance(arg, Vector3):
@@ -963,10 +963,10 @@ def quicknet(*args, **kwargs):
                 s.line(arg)
             else:
                 s.vector(arg)
-        elif isinstance(arg, Pair):
-            s.pair(arg)
         elif isinstance(arg, Fault):
             s.fault(arg)
+        elif isinstance(arg, Pair):
+            s.pair(arg)
         elif isinstance(arg, Cone):
             s.cone(arg)
         elif isinstance(arg, Vector3Set):
@@ -979,10 +979,10 @@ def quicknet(*args, **kwargs):
                 s.line(arg)
             else:
                 s.vector(arg)
-        elif isinstance(arg, PairSet):
-            s.pair(arg)
         elif isinstance(arg, FaultSet):
             s.fault(arg)
+        elif isinstance(arg, PairSet):
+            s.pair(arg)
         else:
             print(f"{type(arg)} not supported.")
     if savefig:

{apsg-1.1.5.dist-info → apsg-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apsg
-Version: 1.1.5
+Version: 1.2.0
 Summary: APSG - The package for structural geologists
 Home-page: https://github.com/ondrolexa/apsg
 Author: Ondrej Lexa
@@ -23,13 +23,14 @@ License-File: AUTHORS.md
 Requires-Dist: numpy
 Requires-Dist: matplotlib
 Requires-Dist: scipy
+Requires-Dist: sqlalchemy
+Requires-Dist: pandas
 Provides-Extra: docs
 Requires-Dist: sphinx ; extra == 'docs'
 Requires-Dist: ipykernel ; extra == 'docs'
 Requires-Dist: nbsphinx ; extra == 'docs'
 Provides-Extra: extra
 Requires-Dist: jupyterlab ; extra == 'extra'
-Requires-Dist: pandas ; extra == 'extra'
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 Requires-Dist: black ; extra == 'test'
@@ -139,6 +140,10 @@ APSG is free software: you can redistribute it and/or modify it under the terms
 
 # Changes
 
+### 1.2.0 (master)
+ * sqlalchemy and pandas added to requirements
+ * quicknet fault bug fixed
+
 ### 1.1.5 (May 15 2024)
  * paleomag Core .dd bug fixed
  * fix round-off domain math error for acosd and asind

{apsg-1.1.5.dist-info → apsg-1.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-apsg/__init__.py,sha256=6Iaw3uD3tBDYuGkMgEO7DQgCKgti9Jm5JMDACeay844,1966
+apsg/__init__.py,sha256=NYMhZtiEFs2y0gZTex3pUd-fXRkZGMyoboNDM5doXO4,1966
 apsg/config.py,sha256=X3_yXT96xXlVxFA94EfYFKJbrcGIHT0PvB9s8EKmYOg,4569
 apsg/shell.py,sha256=UFIOy01KckLsOlqfB0UomyWZ1ITL36-lBUFhlxWdZLE,718
 apsg/database/__init__.py,sha256=7Rvcf1KBBBNhoM28ZlvQ01CkScQTroFkoS4d1kD55Ws,315
@@ -29,11 +29,11 @@ apsg/plotting/_plot_artists.py,sha256=6S0EKCqYU6rlBxcxcXALTk9PaUK6QL-BgUKmZH8tkM
 apsg/plotting/_projection.py,sha256=qnJgTQaFW0v2Pu9ySAEPADHhLgpXmfJ6QIrydry8rXQ,11473
 apsg/plotting/_roseplot.py,sha256=wqXo6b0k7lEvMrnByJYuoR_cuK1QIYZyZkObvigUx-g,12809
 apsg/plotting/_stereogrid.py,sha256=Buj0kp5P4cvTPowN6Jyt8wzvRMu3h5If1pwVWaal53M,11981
-apsg/plotting/_stereonet.py,sha256=LgAuKDSTRl1eCuCbhFJcKEdYr-ScfJmeqO-msbwOIC4,36506
-apsg-1.1.5.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
-apsg-1.1.5.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
-apsg-1.1.5.dist-info/METADATA,sha256=fONgSyncfVwVzTXpaax-PbZakRKvnBV1SfSiL5TAElA,15160
-apsg-1.1.5.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-apsg-1.1.5.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
-apsg-1.1.5.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
-apsg-1.1.5.dist-info/RECORD,,
+apsg/plotting/_stereonet.py,sha256=f1nmBSKs_SjDW0npQJSX4gN2idqxtsHcfEwI64ITDak,36489
+apsg-1.2.0.dist-info/AUTHORS.md,sha256=OEu_2jVMx1fm5EOj4vBlI04uvX4P2sqjPYP12VjPIcI,130
+apsg-1.2.0.dist-info/LICENSE,sha256=NhDqn8b2aOSNn4U4tCfJTOQ6jeggFpLIBgJrAkzdiH0,1117
+apsg-1.2.0.dist-info/METADATA,sha256=QcncOf0aZ7--wmJ9IG10MSijHOkgLcg8GcTOP7DbOWc,15262
+apsg-1.2.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+apsg-1.2.0.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
+apsg-1.2.0.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
+apsg-1.2.0.dist-info/RECORD,,