apsg 1.1.5__tar.gz → 1.2.0__tar.gz

{apsg-1.1.5 → apsg-1.2.0}/HISTORY.md

@@ -1,5 +1,9 @@
 # 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 → apsg-1.2.0}/PKG-INFO

@@ -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,6 +23,8 @@ 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"
@@ -32,7 +34,6 @@ Requires-Dist: pytest; extra == "test"
 Requires-Dist: black; extra == "test"
 Provides-Extra: extra
 Requires-Dist: jupyterlab; extra == "extra"
-Requires-Dist: pandas; extra == "extra"
 
 <img src="https://ondrolexa.github.io/apsg/apsg_banner.svg" alt="APSG logo" width="300px"/>
 
@@ -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 → apsg-1.2.0}/docs/conf.py

@@ -69,9 +69,9 @@ copyright = "2023, Ondrej Lexa"
 # the built documents.
 #
 # The short X.Y version.
-version = "1.1"
+version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.5"
+release = "1.2.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{apsg-1.1.5 → apsg-1.2.0}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.5
+current_version = 1.2.0
 commit = False
 tag = False
 

{apsg-1.1.5 → apsg-1.2.0}/setup.py

@@ -17,7 +17,7 @@ with open(path.join(CURRENT_PATH, "HISTORY.md")) as file:
 
 setup(
     name="apsg",
-    version="1.1.5",
+    version="1.2.0",
     description="APSG - The package for structural geologists",
     long_description=readme + "\n\n" + history,
     long_description_content_type="text/markdown",
@@ -37,11 +37,11 @@ setup(
     ],
     packages=find_packages(where="src"),
     package_dir={"": "src"},
-    install_requires=["numpy", "matplotlib", "scipy"],
+    install_requires=["numpy", "matplotlib", "scipy", "sqlalchemy", "pandas"],
     extras_require={
         "docs": ["sphinx", "ipykernel", "nbsphinx"],
         "test": ["pytest", "black"],
-        "extra": ["jupyterlab", "pandas"],
+        "extra": ["jupyterlab"],
     },
     project_urls={
         "Documentation": "https://apsg.readthedocs.io/",

{apsg-1.1.5 → apsg-1.2.0}/src/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-1.1.5 → apsg-1.2.0}/src/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 → apsg-1.2.0}/src/apsg.egg-info/PKG-INFO

@@ -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,6 +23,8 @@ 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"
@@ -32,7 +34,6 @@ Requires-Dist: pytest; extra == "test"
 Requires-Dist: black; extra == "test"
 Provides-Extra: extra
 Requires-Dist: jupyterlab; extra == "extra"
-Requires-Dist: pandas; extra == "extra"
 
 <img src="https://ondrolexa.github.io/apsg/apsg_banner.svg" alt="APSG logo" width="300px"/>
 
@@ -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 → apsg-1.2.0}/src/apsg.egg-info/requires.txt

@@ -1,6 +1,8 @@
 numpy
 matplotlib
 scipy
+sqlalchemy
+pandas
 
 [docs]
 sphinx
@@ -9,7 +11,6 @@ nbsphinx
 
 [extra]
 jupyterlab
-pandas
 
 [test]
 pytest