From efd80d31f7417c247bcfa30d5cfe1402fb1e03de Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Mon, 5 Jun 2023 15:21:56 -0700 Subject: [PATCH 1/6] add sncosmo dependenty; revert to versioning scheme which does not require the metadata package --- pyproject.toml | 7 +++++-- python/desc/skycatalogs/__init__.py | 13 +------------ python/desc/skycatalogs/_version.py | 1 + 3 files changed, 7 insertions(+), 14 deletions(-) create mode 100644 python/desc/skycatalogs/_version.py diff --git a/pyproject.toml b/pyproject.toml index ef4da8a6..fc683a49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "skyCatalogs" -version = "1.4.0-rc1" +dynamic = ["version"] description = "Writes, reads catalogs input to LSST DESC simulations" readme = "README.md" authors = [{ name = "Joanne Bogart", email = "jrb@slac.stanford.edu" }] @@ -19,9 +19,12 @@ dependencies = [ 'astropy', 'pyarrow', 'pandas', - 'importlib-metadata;python_version<"3.8"' + 'sncosmo' ] requires-python = ">=3.7" # For setuptools >= 61.0 support +[tools.setuptools.dynamic] +version = {attr = +"desc.skyCatalogs._version.__version__"} [tool.setuptools.packages.find] where = ["python"] diff --git a/python/desc/skycatalogs/__init__.py b/python/desc/skycatalogs/__init__.py index a99e9e3e..b54c9258 100644 --- a/python/desc/skycatalogs/__init__.py +++ b/python/desc/skycatalogs/__init__.py @@ -1,15 +1,4 @@ -##from ._version import * -try: - # For Python >= 3.8 - from importlib import metadata -except ImportError: - # For Python < 3.8 - import importlib_metadata as metadata - -try: - __version__ = metadata.version("skyCatalogs") -except metadata.PackageNotFoundError: - pass +from ._version import __version__ from .skyCatalogs import * from .catalog_creator import * diff --git a/python/desc/skycatalogs/_version.py b/python/desc/skycatalogs/_version.py new file mode 100644 index 00000000..c03a2516 --- /dev/null +++ b/python/desc/skycatalogs/_version.py @@ -0,0 +1 @@ +__version__ = "1.4.0-rc2" From 27866ef77c55fe647ae611b913e7dde980329686 Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Mon, 5 Jun 2023 15:40:13 -0700 Subject: [PATCH 2/6] fix copy-paste error --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc683a49..bf99542a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,6 @@ dependencies = [ requires-python = ">=3.7" # For setuptools >= 61.0 support [tools.setuptools.dynamic] -version = {attr = -"desc.skyCatalogs._version.__version__"} +version = {attr = "desc.skyCatalogs._version.__version__"} [tool.setuptools.packages.find] where = ["python"] From 5de9fccb0d7a17937317674d123df7c8e8516b24 Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Mon, 5 Jun 2023 15:47:23 -0700 Subject: [PATCH 3/6] spelling bug --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bf99542a..18d614f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,6 @@ dependencies = [ requires-python = ">=3.7" # For setuptools >= 61.0 support [tools.setuptools.dynamic] -version = {attr = "desc.skyCatalogs._version.__version__"} +version = {attr = "desc.skycatalogs._version.__version__"} [tool.setuptools.packages.find] where = ["python"] From a1af044e93b384bfcd6d03ea2d85936a027ecb63 Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Tue, 6 Jun 2023 06:53:40 -0700 Subject: [PATCH 4/6] fix typo so that version is found during build --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 18d614f4..8b4431ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,12 +3,12 @@ requires = ["setuptools >= 61.0"] # PEP 621 compliant build-backend = "setuptools.build_meta" [project] -name = "skyCatalogs" dynamic = ["version"] +name = "skyCatalogs" description = "Writes, reads catalogs input to LSST DESC simulations" readme = "README.md" authors = [{ name = "Joanne Bogart", email = "jrb@slac.stanford.edu" }] -license = { file = "LICENCE" } +license = { file = "LICENSE" } classifiers = [ "Programming Language :: Python :: 3", ] @@ -23,7 +23,8 @@ dependencies = [ ] requires-python = ">=3.7" # For setuptools >= 61.0 support -[tools.setuptools.dynamic] +[tool.setuptools.dynamic] version = {attr = "desc.skycatalogs._version.__version__"} + [tool.setuptools.packages.find] where = ["python"] From 7a95db7a42b7dc13e2b53983c36fb26bb2d4a116 Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Tue, 6 Jun 2023 08:10:39 -0700 Subject: [PATCH 5/6] try taking out sncosmo --- pyproject.toml | 3 +-- python/desc/skycatalogs/_version.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8b4431ba..8be6b31b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,8 +18,7 @@ dependencies = [ 'healpy', 'astropy', 'pyarrow', - 'pandas', - 'sncosmo' + 'pandas' ] requires-python = ">=3.7" # For setuptools >= 61.0 support diff --git a/python/desc/skycatalogs/_version.py b/python/desc/skycatalogs/_version.py index c03a2516..7bacdb9d 100644 --- a/python/desc/skycatalogs/_version.py +++ b/python/desc/skycatalogs/_version.py @@ -1 +1 @@ -__version__ = "1.4.0-rc2" +__version__ = "1.4.0-rc3" From 36689405b889e1a2d6e57eeee4ef5f38c26deb9c Mon Sep 17 00:00:00 2001 From: Joanne Bogart Date: Tue, 6 Jun 2023 08:25:53 -0700 Subject: [PATCH 6/6] put sncosmo back --- pyproject.toml | 3 ++- python/desc/skycatalogs/_version.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8be6b31b..8b4431ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,8 @@ dependencies = [ 'healpy', 'astropy', 'pyarrow', - 'pandas' + 'pandas', + 'sncosmo' ] requires-python = ">=3.7" # For setuptools >= 61.0 support diff --git a/python/desc/skycatalogs/_version.py b/python/desc/skycatalogs/_version.py index 7bacdb9d..caa13d2c 100644 --- a/python/desc/skycatalogs/_version.py +++ b/python/desc/skycatalogs/_version.py @@ -1 +1 @@ -__version__ = "1.4.0-rc3" +__version__ = "1.4.0-rc4"