diff --git a/pyproject.toml b/pyproject.toml index 0c28680..b1454bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,8 +9,8 @@ authors = [ {name="Zhang Yunjun", email="yunjunz@outlook.com"}, {name="Dennis Milbert"}, ] -readme = "README.md" requires-python = ">=3.8" + keywords = ["solid Earth tides", "deformation", "geodesy", "geophysics"] license = {text = "GPL-3.0-or-later"} classifiers = [ @@ -25,7 +25,7 @@ classifiers = [ # see section: setuptools_scm # https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html#dynamic-metadata # dependencies will be read from text files -dynamic = ["version", "dependencies", "optional-dependencies"] +dynamic = ["version", "readme", "dependencies", "optional-dependencies"] [project.urls] "Homepage" = "https://github.com/insarlab/PySolid" @@ -37,6 +37,7 @@ zip-safe = false [tool.setuptools.dynamic] dependencies = { file = ["requirements.txt"] } +readme = { file = ["README.md"], content-type = "text/markdown" } # extra requirements: `pip install pysolid[docs]` or `pip install .[docs,test]` # note: the [docs] syntax requires setuptools>=64.0, thus, not working yet. diff --git a/setup.py b/setup.py deleted file mode 100644 index 950ba53..0000000 --- a/setup.py +++ /dev/null @@ -1,56 +0,0 @@ -# Author: Zhang Yunjun, Jan 2021 -# Copyright 2020, by the California Institute of Technology. - -# always prefer setuptools over distutils -import setuptools -from skbuild import setup - -# read the contents of README file -def readme(): - with open("README.md") as f: - return f.read() - -setup( - ## add the following redundant setup for setuptools<60, the latter is required for numpy.distutils - name="pysolid", - description="A Python wrapper for solid to compute solid Earth tides", - url="https://github.com/insarlab/PySolid", - long_description=readme(), - long_description_content_type="text/markdown", - author="Zhang Yunjun, Dennis Milbert", - author_email="yunjunz@outlook.com", - license="GPL-3.0-or-later", - license_files=("LICENSE",), - - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Science/Research", - "Topic :: Scientific/Engineering", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3", - ], - keywords="solid Eartth tides, deformation, geodesy, geophysics", - - project_urls={ - "Bug Reports": "https://github.com/insarlab/PySolid/issues", - "Source": "https://github.com/insarlab/PySolid", - }, - - # dependencies - python_requires=">=3.8", - install_requires=[ - "numpy", - "scipy", - ], - - # package discovery - packages=setuptools.find_packages("src"), # include all packages under src - package_dir={"": "src"}, # tell distutils packages are under src - - # data files - include_package_data=True, - package_data={ - "pysolid": ["solid.for"], - }, -) diff --git a/src/pysolid/point.py b/src/pysolid/point.py index 77b4df8..3a68d9e 100644 --- a/src/pysolid/point.py +++ b/src/pysolid/point.py @@ -203,6 +203,7 @@ def plot_solid_earth_tides_point(dt_out, tide_e, tide_n, tide_u, lalo=None, if lalo: axs[0].set_title('solid Earth tides at (N{}, E{})'.format(lalo[0], lalo[1]), fontsize=12) fig.tight_layout() + fig.align_ylabels() # output if out_fig: