From ca0a11e8d9227644cb68d879b6d795e0aa22e729 Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:38:21 -0500 Subject: [PATCH 1/6] Update pyproject.toml [skip ci] --- pyproject.toml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6bbc235..dae0d3d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,62 @@ [build-system] -requires = ["setuptools>=40.6.0", "wheel", "setuptools_scm", "extension_helpers"] +requires = ["setuptools>=64", "setuptools_scm>=8"] build-backend = "setuptools.build_meta" +[project] +name = "simmer" + +authors = [ + {name = "Arjun Savel", email = "asavel@gmail.com"}, + {name= "Lea Hirsch"}, + {name= "Holden Gill"}, + {name= "Courtney D. Dressing"}, + {name= "David R. Ciardi"} +] +description = "Stellar Image Maturation via Efficient Reduction" +readme = "README.md" +requires-python = ">=3.8" +keywords = ["astronomy"] +license = {text = "MIT"} +classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "Natural Language :: English", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Topic :: Scientific/Engineering :: Astronomy", +] +dependencies = [ + "numpy", + "tqdm", + "pandas==1.2.3", + "astropy >=5.1", + "openpyxl>=2.5.12", + "scipy", + "matplotlib <3.1.1,>=3.0.1", + "Scikit-image>=0.16.2", + "pyyaml>=5.3.1", + "numba", + "emcee", + "cerberus>=1.3.2", + "photutils>=1.5.0", +] +dynamic = ["version"] + +[project.optional-dependencies] +test = ["pytest"] + +[project.urls] +Homepage = "https://github.com/arjunsavel/SImMER" +Issues = "https://github.com/arjunsavel/SImMER/issues" +Documentation = "https://simmer.readthedocs.io" + +[tool.setuptools_scm] +root = 'src/simmer' + + [tool.black] line-length = 79 exclude = ''' From 212de55abcf519b9d61ee6dd71ea3d775128dad3 Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:38:51 -0500 Subject: [PATCH 2/6] remove setup file! [skip ci] --- setup.py | 93 -------------------------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index b64652f..0000000 --- a/setup.py +++ /dev/null @@ -1,93 +0,0 @@ -# Inspired by: -# https://hynek.me/articles/sharing-your-labor-of-love-pypi-quick-and-dirty/ - -import codecs -import os -import re - -from setuptools import find_packages, setup - -################################################################### - -NAME = "simmer" -PACKAGES = find_packages(where="src") -META_PATH = os.path.join("src", "simmer", "__init__.py") -CLASSIFIERS = [ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Intended Audience :: Science/Research", - "Natural Language :: English", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Topic :: Scientific/Engineering :: Astronomy", -] -INSTALL_REQUIRES = [ - "numpy", - "tqdm", - "pandas==1.2.3", - "astropy >=5.1", - "openpyxl>=2.5.12", - "scipy", - "matplotlib <3.1.1,>=3.0.1", - "Scikit-image>=0.16.2", - "pyyaml>=5.3.1", - "numba", - "emcee", - "cerberus>=1.3.2", - "photutils>=1.5.0", -] - -################################################################### - -HERE = os.path.abspath(os.path.dirname(__file__)) - - -def read(*parts): - """ - Build an absolute path from *parts* and and return the contents of the - resulting file. Assume UTF-8 encoding. - """ - with codecs.open(os.path.join(HERE, *parts), "rb", "utf-8") as f: - return f.read() - - -META_FILE = read(META_PATH) - - -def find_meta(meta): - """ - Extract __*meta*__ from META_FILE. - """ - meta_match = re.search( - r"^__{meta}__ = ['\"]([^'\"]*)['\"]".format(meta=meta), META_FILE, re.M - ) - if meta_match: - return meta_match.group(1) - raise RuntimeError("Unable to find __{meta}__ string.".format(meta=meta)) - - -if __name__ == "__main__": - setup( - name=NAME, - description=find_meta("description"), - license=find_meta("license"), - url=find_meta("uri"), - version=find_meta("version"), - author=find_meta("author"), - author_email=find_meta("email"), - maintainer=find_meta("author"), - maintainer_email=find_meta("email"), - package_data={"": ["README.md", "LICENSE"]}, - long_description=read("README.md"), - long_description_content_type="text/markdown", - packages=PACKAGES, - package_dir={"": "src"}, - zip_safe=False, - python_requires=">3.8.0", - classifiers=CLASSIFIERS, - include_package_data=True, - install_requires=INSTALL_REQUIRES, - options={"bdist_wheel": {"universal": "1"}}, - ) From 39010d63bec53e35b0819883ca8dfa01d3820001 Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:39:19 -0500 Subject: [PATCH 3/6] remove extra info from init [skip ci] --- src/simmer/__init__.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/simmer/__init__.py b/src/simmer/__init__.py index a401962..8b13789 100644 --- a/src/simmer/__init__.py +++ b/src/simmer/__init__.py @@ -1,9 +1 @@ -# -*- coding: utf-8 -*- -__uri__ = "https://simmer.readthedocs.io" -__author__ = "Arjun B. Savel, Lea Hirsch, Holden Gill, Courtney D. Dressing, David R. Ciardi" -__email__ = "asavel@gmail.com" -__license__ = "MIT" -__version__ = "1.0.2" -__release__ = "1.0.2" -__description__ = "Stellar Image Maturation via Efficient Reduction" From 0c364511ab63267916035df0c0e65675d82c2dba Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:40:41 -0500 Subject: [PATCH 4/6] just remove extra test line! --- .github/workflows/run_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 8d405ac..b846a49 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -31,7 +31,6 @@ jobs: python3 -m pip install -U setuptools setuptools_scm pep517 python3 -m pip install -e . - - name: Run tests run: | python -m unittest discover src From 6e44578350ced563a819cf56a135c1bea7308a04 Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:49:16 -0500 Subject: [PATCH 5/6] remove root for version? --- pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dae0d3d..94d4b29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,8 +53,6 @@ Homepage = "https://github.com/arjunsavel/SImMER" Issues = "https://github.com/arjunsavel/SImMER/issues" Documentation = "https://simmer.readthedocs.io" -[tool.setuptools_scm] -root = 'src/simmer' [tool.black] From e638b2b4a0a73333217e0e1b42679e85c1382861 Mon Sep 17 00:00:00 2001 From: Arjun Savel <35353555+arjunsavel@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:00:38 -0500 Subject: [PATCH 6/6] remove coverage file [skip ci] --- .github/workflows/run_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index b846a49..863c4de 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -41,7 +41,6 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with: fail_ci_if_error: true - files: ./coverage1.xml,./coverage2.xml # optional flags: unittests name: codecov-umbrella verbose: true