Skip to content

Commit

Permalink
minor release
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrolexa committed Dec 13, 2024
1 parent 1641e7c commit 3b03b05
Show file tree
Hide file tree
Showing 10 changed files with 571 additions and 657 deletions.
31 changes: 10 additions & 21 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
name: Upload Python Package

on:
release:
types: [created]
release:
types: [created]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_APIKEY }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Build and publish to pypi
uses: JRubics/poetry-publish@v2.0
with:
pypi_token: ${{ secrets.PYPI_APIKEY }}
6 changes: 3 additions & 3 deletions HISTORY.md → CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Changes
# Changelog

## 1.3.0 (master)
## 1.3.0 (Dec 14 2024)
* Python 3.10 set as minimal version
* Tensor3 eigenlins and eigenfols implemented as methods
* pandas accessors G property to get apsg FeatureSet
* pandas accessors G property returns apsg FeatureSet

### 1.2.3 (Nov 18 2024)
* ClusterSet accepts PairSet and FaultSet
Expand Down
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

11 changes: 0 additions & 11 deletions MANIFEST.in

This file was deleted.

5 changes: 3 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import sys
import os
import importlib.metadata

# If extensions (or modules to document with autodoc) are in another
# directory, add these directories to sys.path here. If the directory is
Expand Down Expand Up @@ -69,9 +70,9 @@
# the built documents.
#
# The short X.Y version.
version = "1.3"
version = importlib.metadata.version("apsg")
# The full version, including alpha/beta/rc tags.
release = "1.3.0"
release = version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1,042 changes: 526 additions & 516 deletions poetry.lock

Large diffs are not rendered by default.

36 changes: 27 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,47 @@ 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.9"
numpy = "^1.20"
matplotlib = "^3.6"
scipy = "^1.10"
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 = "^7.2"
ipykernel = "^6.29"
nbsphinx = "^0.8"
sphinx = "*"
ipykernel = "*"
nbsphinx = "*"


[tool.poetry.group.extra.dependencies]
jupyterlab = "^4"


[tool.poetry.group.test.dependencies]
pytest = "^7.4"
black = "^24"
pytest = "*"
black = "*"

[tool.poetry.scripts]
iapsg = "apsg.shell:main"

[build-system]
requires = ["poetry-core"]
Expand Down
18 changes: 0 additions & 18 deletions setup.cfg

This file was deleted.

55 changes: 0 additions & 55 deletions setup.py

This file was deleted.

3 changes: 2 additions & 1 deletion src/apsg/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-

import importlib.metadata
from apsg.math import (
Vector3 as vec,
Vector2 as vec2,
Expand Down Expand Up @@ -98,6 +99,6 @@
"quicknet",
)

__version__ = "1.3.0"
__version__ = importlib.metadata.version("apsg")
__author__ = "Ondrej Lexa"
__email__ = "lexa.ondrej@gmail.com"

0 comments on commit 3b03b05

Please sign in to comment.