diff --git a/README.md b/README.md index 54b350d..7daa94a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Download the last version of the `pyOSOAA` from [github](https://github.com/fnem Once downloaded decompress it, go to the folder containing the code and run ```bash -python setup.py install +pip install . ``` To then check that software installed correctly diff --git a/pyproject.toml b/pyproject.toml index a54b716..4b46ae7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,16 +1,17 @@ [build-system] -requires = ["setuptools>=61.0"] +requires = ["setuptools>=61.0", "wheel"] build-backend = "setuptools.build_meta" [project] name = "pyOSOAA" -version = "1.5" +version = "1.5.0" authors = [ - { name="Francisco Nemiña", email="fnemina@conae.gov.ar" }, + { name = "Francisco Nemiña", email = "fnemina@conae.gov.ar" }, ] description = "pyOSOAA is a python interface for the Ocean Successive Orders with Atmosphere - Advanced (OSOAA) radiative transfer." readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.8" +license = { file = "LICENSE" } classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", @@ -18,10 +19,34 @@ classifiers = [ "Topic :: Scientific/Engineering :: Physics", "Topic :: Software Development :: Libraries :: Python Modules", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", ] +keywords = ["radiative transfer", "OSOAA", "atmospheric science", "oceanography"] +dependencies = [ + "numpy>=1.21.0", + "scipy>=1.7.0", + "matplotlib>=3.4.0", +] [project.urls] -"Homepage" = "https://github.com/fnemina/pyOSOAA" -"Bug Tracker" = "https://github.com/fnemina/pyOSOAA/issues" \ No newline at end of file +Homepage = "https://github.com/fnemina/pyOSOAA" +BugTracker = "https://github.com/fnemina/pyOSOAA/issues" + +[project.optional-dependencies] +dev = [ + "pytest>=6.0", + "black>=22.0", + "flake8>=4.0", +] +docs = [ + "sphinx>=4.0", + "sphinx-rtd-theme>=1.0", +] + +[tool.setuptools.packages.find] \ No newline at end of file diff --git a/setup.py b/setup.py index 8e71f31..6db0984 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,6 @@ import os from setuptools import setup - PROJECT_ROOT = os.path.dirname(__file__) @@ -17,32 +16,32 @@ def read_file(filepath, root=PROJECT_ROOT): * `root` is the base path and it defaults to the `PROJECT_ROOT` directory. * `filepath` should be a relative path, starting from `root`. """ - with open(os.path.join(root, filepath)) as fd: + with open(os.path.join(root, filepath), encoding="utf-8") as fd: text = fd.read() return text LONG_DESCRIPTION = read_file("README.md") -SHORT_DESCRIPTION = "pyOSOAA is a python interface for the Ocean Successive"\ - + "Orders with Atmosphere - Advanced (OSOAA)"\ - + "radiative transfer." -REQS = [] - +SHORT_DESCRIPTION = ( + "pyOSOAA is a python interface for the Ocean Successive " + "Orders with Atmosphere - Advanced (OSOAA) radiative transfer." +) setup( - name = "pyOSOAA", - packages = ['pyOSOAA'], - install_requires = REQS, - version = "1.4.post", - author = "Francisco Nemiña", - author_email = "fnemina@conae.gov.ar", - description = SHORT_DESCRIPTION, - url = "https://github.com/fnemina/pyOSOAA", - long_description = LONG_DESCRIPTION, + name="pyOSOAA", + version="1.5.0", + author="Francisco Nemiña", + author_email="fnemina@conae.gov.ar", + description=SHORT_DESCRIPTION, + long_description=LONG_DESCRIPTION, + long_description_content_type="text/markdown", + url="https://github.com/fnemina/pyOSOAA", project_urls={ "Bug Tracker": "https://github.com/fnemina/pyOSOAA/issues", - }, - classifiers = [ + }, + packages=["pyOSOAA"], + python_requires=">=3.8", + classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Science/Research", "Topic :: Scientific/Engineering :: Atmospheric Science", @@ -50,6 +49,11 @@ def read_file(filepath, root=PROJECT_ROOT): "Topic :: Software Development :: Libraries :: Python Modules", "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Programming Language :: Python", - "Programming Language :: Python :: 3" + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], )