apsg 1.1.4__tar.gz → 1.3.0__tar.gz

apsg-1.1.4/HISTORY.md → apsg-1.3.0/CHANGELOG.md

@@ -1,4 +1,28 @@
-# Changes
+# Changelog
+
+## 1.3.0 (Dec 14 2024)
+ * Python 3.10 set as minimal version
+ * Tensor3 eigenlins and eigenfols implemented as methods
+ * pandas accessors G property returns apsg FeatureSet
+
+### 1.2.3 (Nov 18 2024)
+ * ClusterSet accepts PairSet and FaultSet
+ * quicknet label option added
+ * vector pow bug fix
+
+### 1.2.2 (Oct 21 2024)
+ * Fault sense could be defined by str, one of 's', 'd', 'n' and 'r'
+
+### 1.2.1 (Sep 23 2024)
+ * Fault sense could be defined by str, one of 's', 'd', 'n' and 'r'
+
+## 1.2.0 (May 24 2024)
+ * 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
 
 ### 1.1.4 (Dec 13 2023)
  * Ellipsoid repr bugfix
@@ -30,7 +54,7 @@ See documentation and Pandas interface tutorial for further details.
  * density_lookup method implemented for StereoNet.grid
  * Stress tensor sigma* properties using inverted order of eigenvalues
  * render2fig method of StereoNet implemented
- * vector-like objects are not iterable, so properly render in pandas 
+ * vector-like objects are not iterable, so properly render in pandas
 
 ## 1.0.0 (Oct 7 2022)
 New major release

{apsg-1.1.4 → apsg-1.3.0}/CONTRIBUTING.md

@@ -89,4 +89,3 @@ Before you submit a pull request, check that it meets these guidelines:
 3. The pull request should work for Python 2.7, 3.5, and 3.6.
    Check [https://travis-ci.org/ondrolexa/apsg/pull_requests](https://travis-ci.org/ondrolexa/apsg/pull_requests)
    and make sure that the tests pass for all supported Python versions.
-

apsg-1.3.0/PKG-INFO

@@ -0,0 +1,141 @@
+Metadata-Version: 2.1
+Name: apsg
+Version: 1.3.0
+Summary: APSG - The package for structural geologists
+Home-page: https://github.com/ondrolexa/apsg
+License: MIT
+Author: Ondrej Lexa
+Author-email: lexa.ondrej@gmail.com
+Requires-Python: >=3.10,<4.0
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: matplotlib (>=3.9,<4.0)
+Requires-Dist: numpy (>=2.1,<3.0)
+Requires-Dist: pandas (>=2.1,<3.0)
+Requires-Dist: pyqt5 (>=5.15,<6.0)
+Requires-Dist: scipy (>=1.14,<2.0)
+Requires-Dist: sqlalchemy (>=1.3,<2.0)
+Project-URL: Documentation, https://apsg.readthedocs.io
+Project-URL: Repository, https://github.com/ondrolexa/apsg
+Description-Content-Type: text/markdown
+
+<img src="https://ondrolexa.github.io/apsg/apsg_banner.svg" alt="APSG logo" width="300px"/>
+
+[![PyPI - Version](https://img.shields.io/pypi/v/apsg)](https://pypi.org/project/apsg)
+[![Conda](https://img.shields.io/conda/v/conda-forge/apsg)](https://anaconda.org/conda-forge/apsg)
+[![Documentation Status](https://readthedocs.org/projects/apsg/badge/?version=stable)](https://apsg.readthedocs.io/en/stable/?badge=stable)
+[![DOI](https://zenodo.org/badge/24879346.svg)](https://zenodo.org/badge/latestdoi/24879346)
+
+## :thinking: What is APSG?
+
+APSG is the package for structural geologists. It defines several new python classes to easily manage, analyze and visualize orientational structural geology data.
+
+> [!IMPORTANT]
+> APSG has been significantly refactored from version 1.0 and several changes are
+> breaking backward compatibility. The main APSG namespace provides often-used
+> classes in lowercase names as aliases to `PascalCase` convention used in
+> modules to provide a simplified interface for users. The `PascalCase` names of
+> classes use longer and plain English names instead acronyms for better readability.
+>
+> Check [documentation](https://apsg.readthedocs.org) for more details.
+
+## :hammer_and_wrench: Requirements
+
+You need Python 3.9 or later to run APSG. The package requires [NumPy](https://numpy.org/) and [SciPy](https://www.scipy.org/),
+[Matplotlib](https://matplotlib.org/), [SciPy](https://scipy.org/), [SQLAlchemy](https://www.sqlalchemy.org/)
+and [pandas](https://pandas.pydata.org/).
+
+## :rocket: Quick start
+
+Install the **latest stable** version of APSG from PyPI:
+```bash
+pip install apsg
+```
+
+or install **master** with:
+```bash
+pip install git+https://github.com/ondrolexa/apsg.git
+```
+
+Alternatively, you can cloce the repository and do a local install (recommended for dev):
+```bash
+git clone https://github.com/ondrolexa/apsg.git
+cd apsg
+pip install -e ."
+```
+
+#### Upgrading via pip
+
+To upgrade an existing version of APSG from PyPI, execute:
+```bash
+pip install apsg --upgrade --no-deps
+```
+
+#### Comments on system-wide instalations on Debian systems
+
+Latest Debian-based systems does not allow to install non-debian packages system-wide.
+However, installing all requirements allows to force install APSG system-wide without troubles.
+
+Install requirements using apt:
+```bash
+sudo apt install python3-numpy python3-matplotlib python3-scipy python3-sqlalchemy python3-pandas
+```
+
+and then install apsg using pip:
+```bash
+pip install --break-system-packages apsg
+```
+
+### Conda/Mamba
+
+The APSG package is also available on `conda-forge` channel. Installing `apsg`
+from the `conda-forge` channel can be achieved by adding `conda-forge` to your
+channels:
+
+```bash
+conda config --add channels conda-forge
+```
+
+Once the `conda-forge` channel has been enabled, `apsg` can be installed with:
+
+```bash
+conda install apsg
+```
+
+It is possible to list all of the versions of `apsg` available on your platform with:
+
+```bash
+conda search apsg --channel conda-forge
+```
+
+#### Current release info
+
+| Name | Downloads | Version | Platforms |
+| --- | --- | --- | --- |
+| [![Conda Recipe](https://img.shields.io/badge/recipe-apsg-green.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) |
+
+## :blue_book: Documentation
+
+Explore all the features of APSG. You can find detailed documentation [here](https://apsg.readthedocs.org).
+
+## :computer: Contributing
+
+Most discussion happens on [Github](https://github.com/ondrolexa/apsg). Feel free to open [an issue](https://github.com/ondrolexa/apsg/issues/new) or comment on any open issue or pull request. Check ``CONTRIBUTING.md`` for more details.
+
+## :coin: Donate
+
+APSG is an open-source project, available for you for free. It took a lot of time and resources to build this software. If you find this software useful and want to support its future development please consider donating me.
+
+[![Donate via PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=QTYZWVUNDUAH8&item_name=APSG+development+donation&currency_code=EUR&source=url)
+
+## License
+
+APSG is free software: you can redistribute it and/or modify it under the terms of the MIT License. A copy of this license is provided in ``LICENSE`` file.
+

{apsg-1.1.4 → apsg-1.3.0}/README.md

@@ -5,92 +5,103 @@
 [![Documentation Status](https://readthedocs.org/projects/apsg/badge/?version=stable)](https://apsg.readthedocs.io/en/stable/?badge=stable)
 [![DOI](https://zenodo.org/badge/24879346.svg)](https://zenodo.org/badge/latestdoi/24879346)
 
-## What is APSG?
+## :thinking: What is APSG?
 
 APSG is the package for structural geologists. It defines several new python classes to easily manage, analyze and visualize orientational structural geology data.
 
-## Major changes in class names and API from version 1.0.0
+> [!IMPORTANT]
+> APSG has been significantly refactored from version 1.0 and several changes are
+> breaking backward compatibility. The main APSG namespace provides often-used
+> classes in lowercase names as aliases to `PascalCase` convention used in
+> modules to provide a simplified interface for users. The `PascalCase` names of
+> classes use longer and plain English names instead acronyms for better readability.
+>
+> Check [documentation](https://apsg.readthedocs.org) for more details.
 
-APSG has been significantly refactored from version 1.0 and several changes are
-breaking backward compatibility. The main APSG namespace provides often-used
-classes in lowercase names as aliases to `PascalCase` convention used in
-modules to provide a simplified interface for users. The `PascalCase` names of
-classes use longer and plain English names instead acronyms for better
-readability.
+## :hammer_and_wrench: Requirements
 
-Check [documentation](https://apsg.readthedocs.org) for more details.
+You need Python 3.9 or later to run APSG. The package requires [NumPy](https://numpy.org/) and [SciPy](https://www.scipy.org/),
+[Matplotlib](https://matplotlib.org/), [SciPy](https://scipy.org/), [SQLAlchemy](https://www.sqlalchemy.org/)
+and [pandas](https://pandas.pydata.org/).
 
+## :rocket: Quick start
 
-## Requirements
-
-You need Python 3.8 or later to run APSG. The package requires [NumPy](https://numpy.org/) and [SciPy](https://www.scipy.org/), and [Matplotlib](https://matplotlib.org/).
-
-## Quick start
-
-APSG can be installed using pip:
-```
+Install the **latest stable** version of APSG from PyPI:
+```bash
 pip install apsg
 ```
-If you want to run the latest version of the code, you can install it from git:
-```
+
+or install **master** with:
+```bash
 pip install git+https://github.com/ondrolexa/apsg.git
 ```
-Alternatively, you can download the package manually from the GitHub repository [https://github.com/ondrolexa/apsg](https://github.com/ondrolexa/apsg), unzip it, navigate into the package, and use the command:
-```
-python setup.py install
-```
-or
-```
-pip install .
+
+Alternatively, you can cloce the repository and do a local install (recommended for dev):
+```bash
+git clone https://github.com/ondrolexa/apsg.git
+cd apsg
+pip install -e ."
 ```
 
 #### Upgrading via pip
 
-To upgrade an existing version of APSG from PyPI, execute
-```
+To upgrade an existing version of APSG from PyPI, execute:
+```bash
 pip install apsg --upgrade --no-deps
 ```
-Please note that the dependencies (Matplotlib, NumPy and SciPy) will also be upgraded if you omit the `--no-deps` flag; use the `--no-deps` ("no dependencies") flag if you don't want this.
 
-### Conda
+#### Comments on system-wide instalations on Debian systems
 
-The APSG package is also available on `conda-forge` channel.
+Latest Debian-based systems does not allow to install non-debian packages system-wide.
+However, installing all requirements allows to force install APSG system-wide without troubles.
 
-#### Current release info
+Install requirements using apt:
+```bash
+sudo apt install python3-numpy python3-matplotlib python3-scipy python3-sqlalchemy python3-pandas
+```
 
-| Name | Downloads | Version | Platforms |
-| --- | --- | --- | --- |
-| [![Conda Recipe](https://img.shields.io/badge/recipe-apsg-green.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) |
+and then install apsg using pip:
+```bash
+pip install --break-system-packages apsg
+```
 
-#### Installing apsg
+### Conda/Mamba
 
-Installing `apsg` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with:
+The APSG package is also available on `conda-forge` channel. Installing `apsg`
+from the `conda-forge` channel can be achieved by adding `conda-forge` to your
+channels:
 
-```
+```bash
 conda config --add channels conda-forge
 ```
 
 Once the `conda-forge` channel has been enabled, `apsg` can be installed with:
 
-```
+```bash
 conda install apsg
 ```
 
 It is possible to list all of the versions of `apsg` available on your platform with:
 
-```
+```bash
 conda search apsg --channel conda-forge
 ```
 
-## Documentation
+#### Current release info
+
+| Name | Downloads | Version | Platforms |
+| --- | --- | --- | --- |
+| [![Conda Recipe](https://img.shields.io/badge/recipe-apsg-green.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/apsg.svg)](https://anaconda.org/conda-forge/apsg) |
+
+## :blue_book: Documentation
 
-Explore the full features of APSG. You can find detailed documentation [here](https://apsg.readthedocs.org).
+Explore all the features of APSG. You can find detailed documentation [here](https://apsg.readthedocs.org).
 
-## Contributing
+## :computer: Contributing
 
 Most discussion happens on [Github](https://github.com/ondrolexa/apsg). Feel free to open [an issue](https://github.com/ondrolexa/apsg/issues/new) or comment on any open issue or pull request. Check ``CONTRIBUTING.md`` for more details.
 
-## Donate
+## :coin: Donate
 
 APSG is an open-source project, available for you for free. It took a lot of time and resources to build this software. If you find this software useful and want to support its future development please consider donating me.
 

apsg-1.3.0/pyproject.toml

@@ -0,0 +1,67 @@
+[tool.poetry]
+name = "apsg"
+version = "1.3.0"
+description = "APSG - The package for structural geologists"
+authors = ["Ondrej Lexa <lexa.ondrej@gmail.com>"]
+readme = "README.md"
+license = "MIT"
+repository = "https://github.com/ondrolexa/apsg"
+documentation = "https://apsg.readthedocs.io"
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+include = ["AUTHORS.md", "CHANGELOG.md", "CONTRIBUTING.md"]
+
+[tool.poetry.dependencies]
+python = "^3.10"
+numpy = "^2.1"
+matplotlib = "^3.9"
+pyqt5 = "^5.15"
+scipy = "^1.14"
+sqlalchemy = "^1.3"
+pandas = "^2.1"
+
+
+[tool.poetry.group.docs.dependencies]
+sphinx = "*"
+ipykernel = "*"
+nbsphinx = "*"
+
+
+[tool.poetry.group.extra.dependencies]
+jupyterlab = "^4"
+
+
+[tool.poetry.group.test.dependencies]
+pytest = "*"
+black = "*"
+
+[tool.poetry.scripts]
+iapsg = "apsg.shell:main"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.black]
+line-length = 88
+include = '\.pyi?$'
+exclude = '''
+/(
+  \.toml
+  |\.sh
+  |\.git
+  |\.ini
+)/
+'''
+
+[[tool.poetry.source]]
+name = "pypi-public"
+url = "https://pypi.org/simple/"

{apsg-1.1.4 → apsg-1.3.0}/src/apsg/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import importlib.metadata
 from apsg.math import (
     Vector3 as vec,
     Vector2 as vec2,
@@ -98,6 +99,6 @@ __all__ = (
     "quicknet",
 )
 
-__version__ = "1.1.4"
+__version__ = importlib.metadata.version("apsg")
 __author__ = "Ondrej Lexa"
 __email__ = "lexa.ondrej@gmail.com"