dkist-processing-common 10.2.1__tar.gz → 10.2.2__tar.gz

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/CHANGELOG.rst

@@ -1,3 +1,13 @@
+v10.2.2 (2024-10-14)
+====================
+
+Misc
+----
+
+- Switch from setup.cfg to pyproject.toml for build configuration (`#214 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/214>`__)
+- Make and publish wheels at code push in build pipeline (`#214 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/214>`__)
+
+
 v10.2.1 (2024-09-27)
 ====================
 

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/PKG-INFO

@@ -1,21 +1,65 @@
 Metadata-Version: 2.1
 Name: dkist-processing-common
-Version: 10.2.1
-Summary: Common task classes used by the DKIST Science Data Processing pipelines to process DKIST data.
-Home-page: https://bitbucket.org/dkistdc/dkist-processing-common/src/main/
-Author: NSO / AURA
-Author-email: "dkistdc@nso.edu"
-License: MIT
+Version: 10.2.2
+Summary: Common task classes used by the DKIST science data processing pipelines
+Author-email: NSO / AURA <dkistdc@nso.edu>
+License: BSD-3-Clause
+Project-URL: Homepage, https://nso.edu/dkist/data-center/
+Project-URL: Repository, https://bitbucket.org/dkistdc/dkist-processing-common/
 Project-URL: Documentation, https://docs.dkist.nso.edu/projects/common
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portal/5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: astropy>=5.1.1
+Requires-Dist: dkist-fits-specifications<5.0,>=4.0.0
+Requires-Dist: dkist-header-validator<6.0,>=5.0.0
+Requires-Dist: dkist-processing-core==4.2.1
+Requires-Dist: dkist-processing-pac<4.0,>=3.0
+Requires-Dist: dkist-service-configuration<3.0,>=2.0.2
+Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
+Requires-Dist: globus-sdk>=3.12.0
+Requires-Dist: gqlclient==1.1.0
+Requires-Dist: hashids==1.3.1
+Requires-Dist: matplotlib>=3.4
+Requires-Dist: moviepy>=1.0.3
+Requires-Dist: numpy>=1.20.2
+Requires-Dist: object-clerk==0.1.1
+Requires-Dist: pandas>=1.4.2
+Requires-Dist: pillow>=10.2.0
+Requires-Dist: pydantic>=2.0
+Requires-Dist: redis==4.6.0
+Requires-Dist: requests>=2.23
+Requires-Dist: scipy>=1.6.3
+Requires-Dist: sunpy>=3.0.0
+Requires-Dist: talus==1.1.0
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: towncrier; extra == "test"
+Requires-Dist: dkist-data-simulator>=5.0.0; extra == "test"
+Requires-Dist: dkist-processing-common[inventory]; extra == "test"
+Requires-Dist: dkist-processing-common[asdf]; extra == "test"
+Requires-Dist: dkist-processing-common[quality]; extra == "test"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-astropy; extra == "docs"
+Requires-Dist: sphinx-changelog; extra == "docs"
+Requires-Dist: sphinx-autoapi!=3.1.0; extra == "docs"
+Requires-Dist: pytest; extra == "docs"
+Requires-Dist: towncrier<22.12.0; extra == "docs"
+Requires-Dist: dkist-sphinx-theme; extra == "docs"
 Provides-Extra: inventory
+Requires-Dist: dkist-inventory<2.0,>=1.3.1; extra == "inventory"
 Provides-Extra: asdf
+Requires-Dist: dkist-inventory[asdf]<2.0,>=1.3.1; extra == "asdf"
 Provides-Extra: quality
+Requires-Dist: dkist-quality<2.0,>=1.0.4; extra == "quality"
 
 dkist-processing-common
 =======================

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/bitbucket-pipelines.yml

@@ -64,9 +64,9 @@ definitions:
         name: Push
         script:
           - pip install -U pip
-          - python setup.py sdist
-          - pip install twine
-          - twine upload dist/*
+          - pip install build twine
+          - python -m build --outdir wheelhouse .
+          - python -m twine upload --skip-existing wheelhouse/*
     - step: &docs
         name: Test Docs
         caches:

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/dkist_processing_common/tests/test_workflow_task_base.py

@@ -1,6 +1,7 @@
 import json
 import logging
-from configparser import ConfigParser
+import re
+import tomllib
 from dataclasses import asdict
 from io import BytesIO
 from pathlib import Path
@@ -238,17 +239,16 @@ def no_provenance_task(tmp_path, recipe_run_id):
 @pytest.fixture()
 def package_dependencies() -> set:
     """
-    Extract dependencies from setup.cfg and format into a set of package names
+    Extract dependencies from pyproject.toml and format into a set of package names
     """
     module_path = Path(dkist_processing_common.__path__[0])
-    setup_cfg = module_path.parent / "setup.cfg"
-    logger.info(setup_cfg)
-    config = ConfigParser()
-    config.read(setup_cfg)
-    install_requires = [d for d in config["options"]["install_requires"].splitlines() if d]
+    pyproject_toml = module_path.parent / "pyproject.toml"
+    logger.info(pyproject_toml)
+    with open(pyproject_toml, "rb") as f:
+        pyproject_toml_data = tomllib.load(f)
+    install_requires = pyproject_toml_data["project"]["dependencies"]
     requirements = install_requires + ["dkist-processing-common"]
-    dependencies = {pkg.split(" ")[0] for pkg in requirements}
-    dependencies_without_optionals = {d.split("[")[0] for d in dependencies}
+    dependencies_without_optionals = {re.split(r"[!<=> []", pkg)[0] for pkg in requirements}
     return dependencies_without_optionals
 
 

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,21 +1,65 @@
 Metadata-Version: 2.1
 Name: dkist-processing-common
-Version: 10.2.1
-Summary: Common task classes used by the DKIST Science Data Processing pipelines to process DKIST data.
-Home-page: https://bitbucket.org/dkistdc/dkist-processing-common/src/main/
-Author: NSO / AURA
-Author-email: "dkistdc@nso.edu"
-License: MIT
+Version: 10.2.2
+Summary: Common task classes used by the DKIST science data processing pipelines
+Author-email: NSO / AURA <dkistdc@nso.edu>
+License: BSD-3-Clause
+Project-URL: Homepage, https://nso.edu/dkist/data-center/
+Project-URL: Repository, https://bitbucket.org/dkistdc/dkist-processing-common/
 Project-URL: Documentation, https://docs.dkist.nso.edu/projects/common
+Project-URL: Help, https://nso.atlassian.net/servicedesk/customer/portal/5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
+Description-Content-Type: text/x-rst
+Requires-Dist: astropy>=5.1.1
+Requires-Dist: dkist-fits-specifications<5.0,>=4.0.0
+Requires-Dist: dkist-header-validator<6.0,>=5.0.0
+Requires-Dist: dkist-processing-core==4.2.1
+Requires-Dist: dkist-processing-pac<4.0,>=3.0
+Requires-Dist: dkist-service-configuration<3.0,>=2.0.2
+Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
+Requires-Dist: globus-sdk>=3.12.0
+Requires-Dist: gqlclient==1.1.0
+Requires-Dist: hashids==1.3.1
+Requires-Dist: matplotlib>=3.4
+Requires-Dist: moviepy>=1.0.3
+Requires-Dist: numpy>=1.20.2
+Requires-Dist: object-clerk==0.1.1
+Requires-Dist: pandas>=1.4.2
+Requires-Dist: pillow>=10.2.0
+Requires-Dist: pydantic>=2.0
+Requires-Dist: redis==4.6.0
+Requires-Dist: requests>=2.23
+Requires-Dist: scipy>=1.6.3
+Requires-Dist: sunpy>=3.0.0
+Requires-Dist: talus==1.1.0
 Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: towncrier; extra == "test"
+Requires-Dist: dkist-data-simulator>=5.0.0; extra == "test"
+Requires-Dist: dkist-processing-common[inventory]; extra == "test"
+Requires-Dist: dkist-processing-common[asdf]; extra == "test"
+Requires-Dist: dkist-processing-common[quality]; extra == "test"
 Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-astropy; extra == "docs"
+Requires-Dist: sphinx-changelog; extra == "docs"
+Requires-Dist: sphinx-autoapi!=3.1.0; extra == "docs"
+Requires-Dist: pytest; extra == "docs"
+Requires-Dist: towncrier<22.12.0; extra == "docs"
+Requires-Dist: dkist-sphinx-theme; extra == "docs"
 Provides-Extra: inventory
+Requires-Dist: dkist-inventory<2.0,>=1.3.1; extra == "inventory"
 Provides-Extra: asdf
+Requires-Dist: dkist-inventory[asdf]<2.0,>=1.3.1; extra == "asdf"
 Provides-Extra: quality
+Requires-Dist: dkist-quality<2.0,>=1.0.4; extra == "quality"
 
 dkist-processing-common
 =======================

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/dkist_processing_common.egg-info/SOURCES.txt

@@ -6,9 +6,6 @@ README.rst
 bitbucket-pipelines.yml
 check_changelog_updated.sh
 pyproject.toml
-pytest.ini
-setup.cfg
-setup.py
 changelog/.gitempty
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py

{dkist-processing-common-10.2.1 → dkist_processing_common-10.2.2}/dkist_processing_common.egg-info/requires.txt

@@ -47,6 +47,6 @@ pytest-mock
 hypothesis
 towncrier
 dkist-data-simulator>=5.0.0
-dkist-inventory<2.0,>=1.3.1
-dkist-inventory[asdf]<2.0,>=1.3.1
-dkist-quality<2.0,>=1.0.4
+dkist-processing-common[inventory]
+dkist-processing-common[asdf]
+dkist-processing-common[quality]

dkist_processing_common-10.2.2/dkist_processing_common.egg-info/top_level.txt

@@ -0,0 +1,5 @@
+changelog
+dkist_processing_common
+docs
+licenses
+wheelhouse

dkist_processing_common-10.2.2/pyproject.toml

@@ -0,0 +1,132 @@
+[build-system]
+requires = ["setuptools>=64", "setuptools_scm>=8"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages]
+find = {}
+
+[tool.setuptools_scm]
+
+[project]
+dynamic = ["version"]
+name = "dkist-processing-common"
+requires-python = ">=3.11"
+description = "Common task classes used by the DKIST science data processing pipelines"
+readme = "README.rst"
+authors = [ {name = "NSO / AURA", email = "dkistdc@nso.edu"} ]
+license = {text = "BSD-3-Clause"}
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.11",
+]
+dependencies = [
+  "astropy >= 5.1.1",
+  "dkist-fits-specifications >= 4.0.0, <5.0",
+  "dkist-header-validator >= 5.0.0, <6.0",
+  "dkist-processing-core == 4.2.1",
+  "dkist-processing-pac >= 3.0, <4.0",
+  "dkist-service-configuration >= 2.0.2, <3.0",
+  "dkist-spectral-lines >= 3.0.0, <4.0",
+  "globus-sdk >= 3.12.0",
+  "gqlclient == 1.1.0",
+  "hashids == 1.3.1",
+  "matplotlib >= 3.4",
+  "moviepy >= 1.0.3",
+  "numpy >= 1.20.2",
+  "object-clerk == 0.1.1",
+  "pandas >= 1.4.2",
+  "pillow >= 10.2.0",
+  "pydantic >= 2.0",
+  "redis == 4.6.0",
+  "requests >= 2.23",
+  "scipy >= 1.6.3",
+  "sunpy >= 3.0.0",
+  "talus == 1.1.0",
+]
+
+[project.urls]
+Homepage = "https://nso.edu/dkist/data-center/"
+Repository = "https://bitbucket.org/dkistdc/dkist-processing-common/"
+Documentation = "https://docs.dkist.nso.edu/projects/common"
+Help = "https://nso.atlassian.net/servicedesk/customer/portal/5"
+
+[project.optional-dependencies]
+test = [
+  "pytest",
+  "pytest-xdist",
+  "pytest-cov",
+  "pytest-mock",
+  "hypothesis",
+  "towncrier",
+  "dkist-data-simulator >= 5.0.0",
+  "dkist-processing-common[inventory]",
+  "dkist-processing-common[asdf]",
+  "dkist-processing-common[quality]",
+]
+docs = [
+  "sphinx",
+  "sphinx-astropy",
+  "sphinx-changelog",
+  "sphinx-autoapi != 3.1.0",
+  "pytest",
+  "towncrier < 22.12.0",
+  "dkist-sphinx-theme",
+]
+inventory = [
+  "dkist-inventory >= 1.3.1, <2.0",
+]
+asdf = [
+  "dkist-inventory[asdf] >= 1.3.1, <2.0",
+]
+quality = [
+  "dkist-quality >= 1.0.4, <2.0",
+]
+
+[tool.pytest.ini_options]
+markers = [
+  "development: For tests that can only be run while developing with a sidecar proxy (as opposed to in bitbucket pipelines)",
+  "flaky: For tests that sporadically fail",
+]
+
+[tool.coverage.run]
+omit = [
+    "dkist_processing_common/tests/*",
+    "dkist_processing_common/__init__.py",
+]
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.towncrier]
+    package = "dkist_processing_common"
+    filename = "CHANGELOG.rst"
+    directory = "changelog/"
+    issue_format = "`#{issue} <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/{issue}>`__"
+    title_format = "{version} ({project_date})"
+    ignore = [".gitempty"]
+
+[[tool.towncrier.type]]
+      directory = "feature"
+      name = "Features"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "bugfix"
+      name = "Bugfixes"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "removal"
+      name = "Removals"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "misc"
+      name = "Misc"
+      showcontent = true
+
+[[tool.towncrier.type]]
+      directory = "doc"
+      name = "Documentation"
+      showcontent = true

dkist_processing_common-10.2.2/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

dkist-processing-common-10.2.1/dkist_processing_common.egg-info/top_level.txt

@@ -1 +0,0 @@
-dkist_processing_common

dkist-processing-common-10.2.1/pyproject.toml

@@ -1,32 +0,0 @@
-[tool.towncrier]
-    package = "dkist_processing_common"
-    filename = "CHANGELOG.rst"
-    directory = "changelog/"
-    issue_format = "`#{issue} <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/{issue}>`__"
-    title_format = "{version} ({project_date})"
-    ignore = [".gitempty"]
-
-[[tool.towncrier.type]]
-      directory = "feature"
-      name = "Features"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "bugfix"
-      name = "Bugfixes"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "removal"
-      name = "Removals"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "misc"
-      name = "Misc"
-      showcontent = true
-
-[[tool.towncrier.type]]
-      directory = "doc"
-      name = "Documentation"
-      showcontent = true

dkist-processing-common-10.2.1/pytest.ini

@@ -1,3 +0,0 @@
-[pytest]
-markers =
-    flaky: mark test as one which sporadically fails

dkist-processing-common-10.2.1/setup.cfg

@@ -1,93 +0,0 @@
-[metadata]
-name = dkist-processing-common
-description = Common task classes used by the DKIST Science Data Processing pipelines to process DKIST data.
-long_description = file: README.rst
-author = NSO / AURA
-author_email = "dkistdc@nso.edu"
-license = MIT
-url = https://bitbucket.org/dkistdc/dkist-processing-common/src/main/
-project_urls = 
-	Documentation = https://docs.dkist.nso.edu/projects/common
-classifiers = 
-	Programming Language :: Python
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.11
-
-[options]
-python_requires = >=3.11
-setup_requires = setuptools_scm
-packages = find:
-include_package_data = True
-install_requires = 
-	astropy >= 5.1.1
-	dkist-fits-specifications >= 4.0.0, <5.0
-	dkist-header-validator >= 5.0.0, <6.0
-	dkist-processing-core == 4.2.1
-	dkist-processing-pac >= 3.0, <4.0
-	dkist-service-configuration >= 2.0.2, <3.0
-	dkist-spectral-lines >= 3.0.0, <4.0
-	globus-sdk >= 3.12.0
-	gqlclient == 1.1.0
-	hashids == 1.3.1
-	matplotlib >= 3.4
-	moviepy >= 1.0.3
-	numpy >= 1.20.2
-	object-clerk == 0.1.1
-	pandas >= 1.4.2
-	pillow >= 10.2.0
-	pydantic >= 2.0
-	redis == 4.6.0
-	requests >= 2.23
-	scipy >= 1.6.3
-	sunpy >= 3.0.0
-	talus == 1.1.0
-
-[options.extras_require]
-test = 
-	pytest
-	pytest-xdist
-	pytest-cov
-	pytest-mock
-	hypothesis
-	towncrier
-	dkist-data-simulator >= 5.0.0
-	%(inventory)s
-	%(asdf)s
-	%(quality)s
-docs = 
-	sphinx
-	sphinx-astropy
-	sphinx-changelog
-	sphinx-autoapi != 3.1.0
-	pytest
-	towncrier < 22.12.0
-	dkist-sphinx-theme
-inventory = 
-	dkist-inventory >= 1.3.1, <2.0
-asdf = 
-	dkist-inventory[asdf] >= 1.3.1, <2.0
-quality = 
-	dkist-quality >= 1.0.4, <2.0
-
-[build_docs]
-source-dir = docs
-build-dir = docs/_build
-all_files = 1
-
-[upload_docs]
-upload-dir = docs/_build/html
-show-response = 1
-
-[tool:pytest]
-markers = 
-	development: For tests that can only be run while developing with a sidecar proxy (as opposed to in bitbucket pipelines)
-
-[coverage:run]
-omit = 
-	dkist_processing_common/tests/*
-	dkist_processing_common/__init__.py
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

dkist-processing-common-10.2.1/setup.py

@@ -1,4 +0,0 @@
-"""Use setup.cfg to configure packaging."""
-from setuptools import setup
-
-setup(use_scm_version=True)