From 267fe00e525bc0cc10a20b52d1180b95848b84b5 Mon Sep 17 00:00:00 2001 From: bch0w Date: Mon, 27 Feb 2023 19:52:40 -0900 Subject: [PATCH 1/2] replace old setup file with modern pyproject.toml, leaving setup as a skeleton script --- pyproject.toml | 27 +++++++++++++++++++ setup.py | 72 +------------------------------------------------- 2 files changed, 28 insertions(+), 71 deletions(-) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..940201a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,27 @@ +[build-system] +requires = ["setuptools>=61.0.0", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "pyflex" +version = "0.2.0" +description = "Python port of the FLEXWIN package" +readme = "README.md" +requires-python = ">=3.7" +license = {file = "LICENSE.txt"} +authors = [ + {name = "adjTomo Dev Team"}, + {email = "adjtomo@gmail.com"} +] +dependencies = [ + "obspy", +] + +[project.optional-dependencies] +dev = ["pytest", "ipython", "ipdb", "flake8", "nose"] + +[project.urls] +homepage = "https://github.com/adjtomo/" +documentation = "https://adjtomo.github.io/pyflex" +repository = "https://github.com/adjtomo/pyflex" + diff --git a/setup.py b/setup.py index 90550fa..6068493 100644 --- a/setup.py +++ b/setup.py @@ -1,73 +1,3 @@ -#!/usr/bin/env python -# -*- encoding: utf8 -*- -import glob -import inspect -import io -import os - -from setuptools import find_packages from setuptools import setup -changelog = os.path.join(os.path.dirname(os.path.abspath( - inspect.getfile(inspect.currentframe()))), "CHANGELOG.md") -with open(changelog, "rt") as fh: - changelog = fh.read() - -long_description = """ -Source code: https://github.com/adjtomo/pyflex - -Documentation: http://krischer.github.io/pyflex - -%s""".strip() % changelog - - -def read(*names, **kwargs): - return io.open( - os.path.join(os.path.dirname(__file__), *names), - encoding=kwargs.get("encoding", "utf8")).read() - - -setup( - name="pyflex", - version="0.2.0", - license='GNU General Public License, Version 3 (GPLv3)', - description="Python port of the FLEXWIN package", - long_description=long_description, - author="adjTomo Development Team", - author_email="adjtomo@gmail.com", - url="https://github.com/adjtomo/pyflex", - packages=find_packages(), - # packages=find_packages("pyflex"), - # package_dir={"": "pyflex"}, - # py_modules=[os.path.splitext(os.path.basename(i))[0] - # for i in glob.glob("pyflex/*.py")], - include_package_data=True, - zip_safe=False, - classifiers=[ - # complete classifier list: - # http://pypi.python.org/pypi?%3Aaction=list_classifiers - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Intended Audience :: Science/Research", - "Operating System :: Unix", - "Operating System :: POSIX", - "Operating System :: Microsoft :: Windows", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: Implementation :: CPython", - "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Physics", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)" - ], - keywords=[ - "seismology", "flexwin", "science", "tomography", "inversion" - ], - install_requires=[ - "obspy >= 1.0", "flake8", "pytest", "nose" - ], - extras_require={ - "docs": ["sphinx", "ipython", "runipy"] - } -) +setup() From 2a420f2fdd75dac1ec93659c01ad058349732c20 Mon Sep 17 00:00:00 2001 From: bch0w Date: Mon, 27 Feb 2023 23:22:13 -0900 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32372f5..12f4db6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ Changelog --------- -* **Pyflex 0.1.6** WIP +* **Pyflex 0.2.0** *Jul 14th 2022* * Ownership transfered to GitHub organization adjTomo * WindowSelector now returns rejected windows * Making codebase work with latest ObsPy, fixing tests