Skip to content

Commit

Permalink
license: switch from GPLv3 to GPLv3+ (#15)
Browse files Browse the repository at this point in the history
+ README.md/setup.py: switch from GPLv3 to GPLv3+. The LICENSE file is the same.

+ __init__.py: use absolute module imports for top-level functions/variables

+ setup: add download_url, classifiers, keywords, python_requires
  • Loading branch information
yunjunz authored Jul 28, 2022
1 parent 1b48b5b commit 3e7ac64
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Language](https://img.shields.io/badge/python-3.6%2B-blue.svg)](https://www.python.org/)
[![CircleCI](https://img.shields.io/circleci/build/github/insarlab/PyAPS.svg?logo=circleci&label=test)](https://circleci.com/gh/insarlab/PyAPS)
[![Version](https://img.shields.io/github/v/release/insarlab/PyAPS?color=green)](https://github.com/insarlab/PyAPS/releases)
[![License](https://img.shields.io/badge/license-GPLv3-yellow.svg)](https://github.com/insarlab/PyAPS/blob/main/LICENSE)
[![License](https://img.shields.io/badge/license-GPLv3+-yellow.svg)](https://github.com/insarlab/PyAPS/blob/main/LICENSE)
[![Citation](https://img.shields.io/badge/doi-10.1029%2F2011GL048757-blue)](https://doi.org/10.1029/2011GL048757)

## PyAPS - Python based Atmospheric Phase Screen estimation
Expand Down
22 changes: 17 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,25 @@
name='pyaps3',
version=version,
description="Python based Atmospheric Phase Screen Estimation",
url="https://github.com/insarlab/PyAPS",
download_url=("https://github.com/insarlab/PyAPS/archive/v{}.tar.gz".format(version)),
long_description=long_description,
long_description_content_type="text/markdown",

author="Romain Jolivet, Angelique Benoit",
author_email="insar@geologie.ens.fr",
license="GPL-3.0-or-later",
license_files=("LICENSE",),

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="InSAR, troposphere, geodesy, geophysics, ERA5",

url="https://github.com/insarlab/PyAPS",
project_urls={
"Bug Reports": "https://github.com/insarlab/PyAPS/issues",
"Documentation": "https://github.com/insarlab/PyAPS/tree/main/docs",
Expand All @@ -41,6 +50,7 @@
package_dir={"": "src"}, # tell distutils packages are under src

# dependencies
python_requires=">=3.6",
install_requires=[
'cdsapi',
'matplotlib',
Expand All @@ -54,5 +64,7 @@

# data files
include_package_data=True,
package_data={"pyaps3": ["*.cfg"]},
package_data={
"pyaps3": ["*.cfg"],
},
)
7 changes: 3 additions & 4 deletions src/pyaps3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@

__all__ = ['autoget','objects']

from .objects import PyAPS
from .autoget import ECMWFdload, MERRAdload, NARRdload
from pyaps3.objects import PyAPS
from pyaps3.autoget import ECMWFdload, MERRAdload, NARRdload

# get version info
from .version import release_version, release_date
__version__ = release_version
from pyaps3.version import release_version as __version__

############################################################
# Program is part of PyAPS #
Expand Down

0 comments on commit 3e7ac64

Please sign in to comment.