apsg 1.3.2__py3-none-any.whl → 1.3.3__py3-none-any.whl

apsg/__init__.py

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

apsg/database/_alchemy.py

@@ -35,7 +35,7 @@ class Meta(Base):
     __tablename__ = "meta"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    name = Column(String(16), nullable=False)
+    name = Column(String(16), nullable=False, unique=True)
     value = Column(Text)
 
     def __repr__(self):
@@ -47,7 +47,7 @@ class Site(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     id_units = Column(ForeignKey("units.id"), nullable=False, index=True)
-    name = Column(String(16), nullable=False)
+    name = Column(String(16), nullable=False, unique=True)
     x_coord = Column(Float, server_default=text("NULL"))
     y_coord = Column(Float, server_default=text("NULL"))
     description = Column(Text)
@@ -58,8 +58,6 @@ class Site(Base):
         "Structdata", back_populates="site", cascade="all, delete-orphan"
     )
 
-    __table_args__ = (UniqueConstraint("name", name="_site_name_uc"),)
-
     def __repr__(self):
         return "Site:{} ({})".format(self.name, self.unit.name)
 
@@ -131,7 +129,7 @@ class Structype(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     pos = Column(Integer, nullable=False, server_default=text("0"))
-    structure = Column(String(16), nullable=False)
+    structure = Column(String(16), nullable=False, unique=True)
     description = Column(Text)
     structcode = Column(Integer, server_default=text("0"))
     groupcode = Column(Integer, server_default=text("0"))
@@ -139,8 +137,6 @@ class Structype(Base):
 
     structdata = relationship("Structdata", back_populates="structype")
 
-    __table_args__ = (UniqueConstraint("structure", name="_structype_structure_uc"),)
-
     def __repr__(self):
         return "Type:{}".format(self.structure)
 
@@ -150,13 +146,11 @@ class Tag(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     pos = Column(Integer, nullable=False, server_default=text("0"))
-    name = Column(String(16), nullable=False)
+    name = Column(String(16), nullable=False, unique=True)
     description = Column(Text)
 
     structdata = relationship("Structdata", secondary=tagged, back_populates="tags")
 
-    __table_args__ = (UniqueConstraint("name", name="_tag_name_uc"),)
-
     def __repr__(self):
         return "Tag:{}".format(self.name)
 
@@ -166,13 +160,11 @@ class Unit(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     pos = Column(Integer, nullable=False, server_default=text("0"))
-    name = Column(String(60), nullable=False)
+    name = Column(String(60), nullable=False, unique=True)
     description = Column(Text)
 
     sites = relationship("Site", back_populates="unit")
 
-    __table_args__ = (UniqueConstraint("name", name="_unit_name_uc"),)
-
     def __repr__(self):
         return "Unit:{}".format(self.name)
 

apsg/database/_sdbread.py

@@ -94,6 +94,13 @@ class SDB(object):
                 raise
 
     def info(self, report="basic"):
+        """
+        PySDB database report
+
+        Args:
+            report (str): type of report. `basic`, `data` or `tags`. Default `basic`
+
+        """
         lines = []
         if report == "basic":
             lines.append("PySDB database version: {}".format(self.meta("version")))
@@ -111,7 +118,7 @@ class SDB(object):
                 if len(r) > 0:
                     lines.append("Number of {} measurements: {}".format(s, len(r)))
         elif report == "tags":
-            for s in self.structures():
+            for s in self.tags():
                 r = self.execsql(self._make_select(tags=s))
                 if len(r) > 0:
                     lines.append("{} measurements tagged as {}.".format(len(r), s))

apsg/shell.py

@@ -6,8 +6,6 @@
 Run the interactive shell.
 """
 
-
-import pkg_resources
 import code
 
 try:
@@ -15,14 +13,16 @@ try:
 except ImportError:
     pass
 
-from pylab import *  # NOQA
+import numpy as np
+import matplotlib.pyplot as plt
+import apsg
 from apsg import *  # NOQA
 
 
 def main():
     banner = "+----------------------------------------------------------+\n"
     banner += "    APSG toolbox "
-    banner += pkg_resources.require("apsg")[0].version
+    banner += apsg.__version__
     banner += " - http://ondrolexa.github.io/apsg\n"
     banner += "+----------------------------------------------------------+"
     vars = globals().copy()

{apsg-1.3.2.dist-info → apsg-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: apsg
-Version: 1.3.2
+Version: 1.3.3
 Summary: APSG - The package for structural geologists
 Author-email: Ondrej Lexa <lexa.ondrej@gmail.com>
 Maintainer-email: Ondrej Lexa <lexa.ondrej@gmail.com>
@@ -67,6 +67,7 @@ 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.2.dist-info → apsg-1.3.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-apsg/__init__.py,sha256=0HF522QDBElQju1ab_cwS3U0p00ZRfvzITYnTBRNDa4,1966
+apsg/__init__.py,sha256=TSryR0LIs4EdoYtd6YEhLdoh2CfQnMgNKc6v25SH6Vw,1966
 apsg/config.py,sha256=X3_yXT96xXlVxFA94EfYFKJbrcGIHT0PvB9s8EKmYOg,4569
-apsg/shell.py,sha256=UFIOy01KckLsOlqfB0UomyWZ1ITL36-lBUFhlxWdZLE,718
+apsg/shell.py,sha256=1D0PeB7qXzlpiOf2QYGo6OJlEVN1KJPYld1GEREBiFg,707
 apsg/database/__init__.py,sha256=7Rvcf1KBBBNhoM28ZlvQ01CkScQTroFkoS4d1kD55Ws,315
-apsg/database/_alchemy.py,sha256=cs8un4RJwUoE62GOberiTIQ2akFXYM0FoR-f1h4_DW8,19726
-apsg/database/_sdbread.py,sha256=Gzj0bpp0vnMvCfxIuX6Ktf01LoQWDCOcXST7HZp_XTY,10868
+apsg/database/_alchemy.py,sha256=fBcLJBwcqxeImu7y_I6rDGFX3_i9w67VN1-T1lULsi4,19489
+apsg/database/_sdbread.py,sha256=EP0hSp6_4-DZZptkMNDgKnQ3GD58mpr_SAgFohKu6xQ,11017
 apsg/decorator/__init__.py,sha256=fZ-dxpldQIk6-2JhVnCj-Tsl8bz2nvoGOyG7uXKvBfg,160
 apsg/decorator/_decorator.py,sha256=8TMSrcVvhU5UCbNMrnyrW3-65qo20_6N2ShtXd3bP-k,1194
 apsg/feature/__init__.py,sha256=XGLq3GXpiWtzX6ROtuSc0kCPJEPTVRoIUtr8VpRZOWI,1664
@@ -30,9 +30,9 @@ apsg/plotting/_projection.py,sha256=qnJgTQaFW0v2Pu9ySAEPADHhLgpXmfJ6QIrydry8rXQ,
 apsg/plotting/_roseplot.py,sha256=jbaUXSb3DIcXs0pWAQUTZfdlA2XcbquT0yHLYDjLirQ,12808
 apsg/plotting/_stereogrid.py,sha256=awh7MwN1WgszhOlr6UgR20wHQJ8u778-Tf_w1uflrV4,11869
 apsg/plotting/_stereonet.py,sha256=-BFM9RCInI-RYs1DKz-ymNFkMFJLTWuw3JcyUs7YiGM,36596
-apsg-1.3.2.dist-info/LICENSE,sha256=lY0kfpVRrzcgVZq7pI6rLK5WYiUMWe0bdKpDelN6hk8,1120
-apsg-1.3.2.dist-info/METADATA,sha256=RtbuiUnWF0ArtuePgaLRg3Ve7kMPT3e6RJFHzZZKKhI,8276
-apsg-1.3.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-apsg-1.3.2.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
-apsg-1.3.2.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
-apsg-1.3.2.dist-info/RECORD,,
+apsg-1.3.3.dist-info/licenses/LICENSE,sha256=lY0kfpVRrzcgVZq7pI6rLK5WYiUMWe0bdKpDelN6hk8,1120
+apsg-1.3.3.dist-info/METADATA,sha256=h1WqeVtnjWG8vo8gi4zZynpXCsGxIaGYwlata_jwAMU,8298
+apsg-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+apsg-1.3.3.dist-info/entry_points.txt,sha256=SowP7_uRI0NJuzznKBXyM9BJcSwBxbXo6Iz5LUo9mEQ,42
+apsg-1.3.3.dist-info/top_level.txt,sha256=xWxwi0nqqOyKdmpsszfR-bmqnNpgVbhnLRuIKGJnaUM,5
+apsg-1.3.3.dist-info/RECORD,,

{apsg-1.3.2.dist-info → apsg-1.3.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any