Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-asdf-transform-schemas for openSUSE:Factory checked in at 2022-03-16 21:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-asdf-transform-schemas (Old) and /work/SRC/openSUSE:Factory/.python-asdf-transform-schemas.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-asdf-transform-schemas" Wed Mar 16 21:15:27 2022 rev:2 rq:961494 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-asdf-transform-schemas/python-asdf-transform-schemas.changes 2021-12-30 15:56:10.472689424 +0100 +++ /work/SRC/openSUSE:Factory/.python-asdf-transform-schemas.new.25692/python-asdf-transform-schemas.changes 2022-03-16 21:15:30.770853547 +0100 @@ -1,0 +2,12 @@ +Sun Mar 13 09:04:01 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to v0.2.2 + * Add inputs and outputs to base transform schema to properly + document them. [#33] + * Add spline1d schema. [#41] + * Add cosine, tangent, arcsine, arccosine, and arctangent + schemas. [#40] + * Fix circular build dependencies for asdf. [#38] +- Make _multibuild in order to avoid build cycles + +------------------------------------------------------------------- Old: ---- asdf_transform_schemas-0.2.0.tar.gz New: ---- _multibuild asdf_transform_schemas-0.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-asdf-transform-schemas.spec ++++++ --- /var/tmp/diff_new_pack.bk0TOo/_old 2022-03-16 21:15:32.386854433 +0100 +++ /var/tmp/diff_new_pack.bk0TOo/_new 2022-03-16 21:15:32.390854434 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-asdf_transform_schemas +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,37 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif + %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -%define skip_python36 1 -Name: python-asdf-transform-schemas -Version: 0.2.0 +Name: python-asdf-transform-schemas%{psuffix} +Version: 0.2.2 Release: 0 Summary: ASDF schemas for transforms License: BSD-3-Clause URL: https://github.com/asdf-format/asdf-transform-schemas Source: https://files.pythonhosted.org/packages/source/a/asdf-transform-schemas/asdf_transform_schemas-%{version}.tar.gz -BuildRequires: python-rpm-macros -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools_scm} -BuildRequires: %{python_module asdf >= 2.8.0} -BuildRequires: %{python_module importlib_resources >= 3 if %python-base < 3.9} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes -Requires: python-asdf >= 2.8.0 +BuildRequires: python-rpm-macros +Requires: python-asdf-standard >= 1.0.1 %if 0%{?python_version_nodots} < 39 Requires: python-importlib_resources >= 3 %endif -# SECTION test requirements +%if %{with test} +BuildRequires: %{python_module asdf-transform-schemas = %{version}} +BuildRequires: %{python_module asdf} BuildRequires: %{python_module pytest} -# /SECTION +%endif BuildArch: noarch %python_subpackages @@ -51,15 +59,21 @@ %build %python_build +%if !%{with test} %install %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif +%if %{with test} %check %pytest +%endif +%if !%{with test} %files %{python_files} %{python_sitelib}/asdf_transform_schemas %{python_sitelib}/asdf_transform_schemas-%{version}*-info +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ asdf_transform_schemas-0.2.0.tar.gz -> asdf_transform_schemas-0.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.gitattributes new/asdf_transform_schemas-0.2.2/.gitattributes --- old/asdf_transform_schemas-0.2.0/.gitattributes 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.gitattributes 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,5 @@ +* text eol=lf + +# Don't mess with these files +*.asdf binary +*.png binary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.github/workflows/changelog.yml new/asdf_transform_schemas-0.2.2/.github/workflows/changelog.yml --- old/asdf_transform_schemas-0.2.0/.github/workflows/changelog.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.github/workflows/changelog.yml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,19 @@ +name: Changelog + +on: + pull_request: + types: [labeled, unlabeled, opened, synchronize, reopened] + +jobs: + changelog: + name: Confirm changelog entry + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + - name: Grep for PR number in CHANGES.rst + run: grep -P '\[[^\]]*#${{github.event.number}}[,\]]' CHANGES.rst + if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog-entry-needed') }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.github/workflows/ci.yml new/asdf_transform_schemas-0.2.2/.github/workflows/ci.yml --- old/asdf_transform_schemas-0.2.0/.github/workflows/ci.yml 2021-03-25 20:31:16.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.github/workflows/ci.yml 2022-02-25 00:20:14.000000000 +0100 @@ -1,6 +1,7 @@ name: CI on: + workflow_dispatch: push: branches: - master @@ -16,20 +17,45 @@ strategy: matrix: include: - - name: Schema validation tests + - name: Python 3.10 Schema validation tests + python-version: '3.10' + os: ubuntu-latest + toxenv: py310 + + - name: Python 3.9 Schema validation tests python-version: 3.9 os: ubuntu-latest toxenv: py39 - - name: Check Python files with black autoformatter + - name: Python 3.8 Schema validation tests + python-version: 3.8 + os: ubuntu-latest + toxenv: py38 + + - name: Python 3.7 Schema validation tests + python-version: 3.7 + os: ubuntu-latest + toxenv: py37 + + - name: Twine check python-version: 3.9 os: ubuntu-latest - toxenv: black + toxenv: twine - - name: Check Python files with flake8 + - name: Code style checks python-version: 3.9 os: ubuntu-latest - toxenv: flake8 + toxenv: codestyle + + - name: macOS + python-version: 3.9 + os: macos-latest + toxenv: py39 + + - name: Windows + python-version: 3.9 + os: windows-latest + toxenv: py39 steps: - name: Checkout code @@ -46,3 +72,61 @@ python -m pip install tox - name: Run tox run: tox -e ${{ matrix.toxenv }} + + asdf-astropy-dev: + name: Run asdf-astropy development tests + runs-on: ubuntu-latest + steps: + - name: Checkout asdf-transform-schemas + uses: actions/checkout@v2 + with: + fetch-depth: 0 + path: asdf-transform-schemas + - name: Checkout asdf-astropy dev + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: astropy/asdf-astropy + ref: main + path: asdf-astropy + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install asdf-transform-schemas + run: cd asdf-transform-schemas && pip install . + - name: Install asdf-astropy + run: cd asdf-astropy && pip install -e .[test] + - name: Pip Freeze + run: pip freeze + - name: Run asdf-astropy development tests + run: cd asdf-astropy && pytest + + astropy-dev: + name: Run astropy development tests + runs-on: ubuntu-latest + steps: + - name: Checkout asdf-transform-schemas + uses: actions/checkout@v2 + with: + fetch-depth: 0 + path: asdf-transform-schemas + - name: Checkout astropy dev + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: astropy/astropy + ref: main + path: astropy + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install asdf-transform-schemas + run: cd asdf-transform-schemas && pip install . + - name: Install astropy + run: cd astropy && pip install -e .[all,test] + - name: Pip Freeze + run: pip freeze + - name: Run astropy development tests + run: cd astropy && pytest astropy/io/misc/asdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.github/workflows/downstream.yml new/asdf_transform_schemas-0.2.2/.github/workflows/downstream.yml --- old/asdf_transform_schemas-0.2.0/.github/workflows/downstream.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.github/workflows/downstream.yml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,108 @@ +name: Downstream + +on: + workflow_dispatch: + schedule: + # Run every Monday at 6am UTC + - cron: '0 6 * * 1' + +env: + CRDS_SERVER_URL: https://jwst-crds.stsci.edu + CRDS_PATH: ~/crds_cache + CRDS_CLIENT_RETRY_COUNT: 3 + CRDS_CLIENT_RETRY_DELAY_SECONDS: 20 + +jobs: + common: + name: ${{ matrix.package_name }}@${{ matrix.ref }} unit tests + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - package_name: astropy + repository: astropy/astropy + ref: main + install_command: pip install -e .[test] + test_command: pytest + - package_name: gwcs + repository: spacetelescope/gwcs + ref: master + install_command: pip install -e .[test] + test_command: pytest + - package_name: jwst + repository: spacetelescope/jwst + ref: master + install_command: pip install -e .[test] + test_command: pytest + - package_name: specutils + repository: astropy/specutils + ref: main + install_command: pip install -e .[test] + test_command: pytest + - package_name: weldx + repository: BAMWelDX/weldx + ref: master + install_command: pip install -e .[test] + test_command: pytest weldx/tests/asdf_tests weldx/schemas --asdf-tests + - package_name: sunpy + repository: sunpy/sunpy + ref: main + install_command: pip install -e .[tests,all] + test_command: pytest sunpy/io/ + - package_name: dkist + repository: DKISTDC/dkist + ref: main + install_command: pip install -e .[tests] + test_command: pytest + - package_name: asdf-astropy + repository: astropy/asdf-astropy + ref: main + install_command: pip install -e .[test] + test_command: pytest + - package_name: asdf-standard + repository: asdf-format/asdf-standard + ref: master + install_command: pip install -e .[test] + test_command: pytest + - package_name: asdf-transform-schemas + repository: asdf-format/asdf-transform-schemas + ref: master + install_command: pip install -e .[test] + test_command: pytest + - package_name: asdf-wcs-schemas + repository: asdf-format/asdf-wcs-schemas + ref: main + install_command: pip install -e .[test] + test_command: pytest + - package_name: asdf-coordinates-schemas + repository: asdf-format/asdf-coordinates-schemas + ref: main + install_command: pip install -e .[test] + test_command: pytest + steps: + - name: Checkout asdf-transform-schemas + uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + path: asdf-transform-schemas + - name: Checkout ${{ matrix.package_name }} + uses: actions/checkout@v2 + with: + fetch-depth: 0 + repository: ${{ matrix.repository }} + ref: ${{ matrix.ref }} + path: target + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install asdf-transform-schemas + run: cd asdf-transform-schemas && pip install . + - name: Install remaining ${{ matrix.package_name }} dependencies + run: cd target && ${{ matrix.install_command }} + - name: Pip Freeze + run: pip freeze + - name: Run ${{ matrix.package_name}} tests + run: cd target && ${{ matrix.test_command }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.github/workflows/publish-to-pypi.yml new/asdf_transform_schemas-0.2.2/.github/workflows/publish-to-pypi.yml --- old/asdf_transform_schemas-0.2.0/.github/workflows/publish-to-pypi.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.github/workflows/publish-to-pypi.yml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,16 @@ +name: Publish to PyPI + +on: + release: + types: [released] + +jobs: + publish: + uses: spacetelescope/action-publish_to_pypi/.github/workflows/workflow.yml@master + with: + test: false + build_platform_wheels: false # Set to true if your package contains a C extension + secrets: + user: ${{ secrets.PYPI_USERNAME_ASDF_MAINTAINER }} + password: ${{ secrets.PYPI_PASSWORD_ASDF_MAINTAINER }} # WARNING: Do not hardcode secret values here! If you want to use a different user or password, you can override this secret by creating one with the same name in your Github repository settings. + test_password: ${{ secrets.PYPI_PASSWORD_ASDF_MAINTAINER_TEST }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/.pre-commit-config.yaml new/asdf_transform_schemas-0.2.2/.pre-commit-config.yaml --- old/asdf_transform_schemas-0.2.0/.pre-commit-config.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/.pre-commit-config.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,33 @@ +repos: + +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.1.0 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-yaml + args: ["--unsafe"] + - id: debug-statements + - id: end-of-file-fixer + - id: trailing-whitespace + +- repo: https://github.com/pycqa/isort + rev: 5.10.1 + hooks: + - id: isort + +- repo: https://github.com/psf/black + rev: 22.1.0 + hooks: + - id: black + +- repo: https://gitlab.com/pycqa/flake8 + rev: 4.0.1 + hooks: + - id: flake8 + +- repo: https://github.com/PyCQA/bandit + rev: 1.7.2 + hooks: + - id: bandit + args: ["-c", "bandit.yaml"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/CHANGES.rst new/asdf_transform_schemas-0.2.2/CHANGES.rst --- old/asdf_transform_schemas-0.2.0/CHANGES.rst 2021-12-13 22:27:39.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/CHANGES.rst 2022-02-25 00:20:14.000000000 +0100 @@ -1,4 +1,13 @@ +0.2.2 (2022-02-24) +------------------ + +- Add inputs and outputs to base transform schema to properly document them. [#33] +- Add spline1d schema. [#41] +- Add cosine, tangent, arcsine, arccosine, and arctangent schemas. [#40] +- Fix circular build dependencies for asdf. [#38] + 0.2.0 (2021-12-13) +------------------ - Remove generic-1.x.0 schemas and examples. [#30] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/PKG-INFO new/asdf_transform_schemas-0.2.2/PKG-INFO --- old/asdf_transform_schemas-0.2.0/PKG-INFO 2021-12-13 22:29:45.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/PKG-INFO 2022-02-25 00:20:30.788784300 +0100 @@ -1,20 +1,26 @@ Metadata-Version: 2.1 Name: asdf_transform_schemas -Version: 0.2.0 +Version: 0.2.2 Summary: ASDF schemas for transforms Home-page: https://github.com/asdf-format/asdf-transform-schemas Author: The ASDF Developers Author-email: h...@stsci.edu License: BSD-3-Clause -Description: # asdf-transform-schemas - - This package provides ASDF schemas for validating transform tags. Users should not - need to install this directly; instead, install an implementation package such - as asdf-astropy, which includes asdf-transform-schemas as a dependency. - - ![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) - Platform: UNKNOWN Requires-Python: >=3.6 Description-Content-Type: text/markdown Provides-Extra: test +License-File: LICENSE + +# asdf-transform-schemas +![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) +![Downstream](https://github.com/asdf-format/asdf-transform-schemas/workflows/Downstream/badge.svg) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/) + +This package provides ASDF schemas for validating transform tags. Users should not +need to install this directly; instead, install an implementation package such +as asdf-astropy, which includes asdf-transform-schemas as a dependency. + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/README.md new/asdf_transform_schemas-0.2.2/README.md --- old/asdf_transform_schemas-0.2.0/README.md 2021-11-24 16:41:20.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/README.md 2022-02-25 00:20:14.000000000 +0100 @@ -1,7 +1,10 @@ # asdf-transform-schemas +![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) +![Downstream](https://github.com/asdf-format/asdf-transform-schemas/workflows/Downstream/badge.svg) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/) This package provides ASDF schemas for validating transform tags. Users should not need to install this directly; instead, install an implementation package such as asdf-astropy, which includes asdf-transform-schemas as a dependency. - -![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/bandit.yaml new/asdf_transform_schemas-0.2.2/bandit.yaml --- old/asdf_transform_schemas-0.2.0/bandit.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/bandit.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,11 @@ +exclude_dirs: + - .eggs + - .git + - .pytest_cache + - .tox + - reference_files + - tests + - build + - dist + - docs + - __pycache__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/pyproject.toml new/asdf_transform_schemas-0.2.2/pyproject.toml --- old/asdf_transform_schemas-0.2.0/pyproject.toml 2020-06-17 20:10:15.000000000 +0200 +++ new/asdf_transform_schemas-0.2.2/pyproject.toml 2022-02-25 00:20:14.000000000 +0100 @@ -1,3 +1,23 @@ [build-system] requires = ["setuptools", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" + +[tool.black] +line-length = 120 +force-exclude = ''' +^/( + ( + \.eggs + | \.git + | \.pytest_cache + | \.tox + | build + | dist + )/ +) +''' + +[tool.isort] +profile = "black" +filter_files = true +line_length = 120 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/asdf-format.org/manifests/transform-1.5.0.yaml new/asdf_transform_schemas-0.2.2/resources/asdf-format.org/manifests/transform-1.5.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/asdf-format.org/manifests/transform-1.5.0.yaml 2021-12-13 22:26:57.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/asdf-format.org/manifests/transform-1.5.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -556,6 +556,13 @@ $$P = \sum_{i, j=0}^{i+j=n}c_{ij} * x^{i} * y^{j}$$ Invertibility: This transform is not automatically invertible. +- tag_uri: tag:stsci.edu:asdf/transform/spline1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/spline1d-1.0.0 + title: A spline1d model. + description: |- + A spline1d model represented by an array of its knots, an array of its + coefficients, and its degree. In addition the bounding endpoints + of the spline can be represented as well - tag_uri: tag:stsci.edu:asdf/transform/power-1.2.0 schema_uri: http://stsci.edu/schemas/asdf/transform/power-1.2.0 title: Perform a list of subtransforms in parallel and then raise each result to @@ -673,6 +680,31 @@ title: One dimensional sine model. description: |- One dimensional sine. +- tag_uri: tag:stsci.edu:asdf/transform/cosine1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/cosine1d-1.0.0 + title: One dimensional cosine model. + description: |- + One dimensional cosine. +- tag_uri: tag:stsci.edu:asdf/transform/tangent1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/tangent1d-1.0.0 + title: One dimensional tangent model. + description: |- + One dimensional tangent. +- tag_uri: tag:stsci.edu:asdf/transform/arcsine1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/arcsine1d-1.0.0 + title: One dimensional arcsine model. + description: |- + One dimensional arcsine. +- tag_uri: tag:stsci.edu:asdf/transform/arccosine1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/arccosine1d-1.0.0 + title: One dimensional arccosine model. + description: |- + One dimensional arccosine. +- tag_uri: tag:stsci.edu:asdf/transform/arctangent1d-1.0.0 + schema_uri: http://stsci.edu/schemas/asdf/transform/arctangent1d-1.0.0 + title: One dimensional arctangent model. + description: |- + One dimensional arctangent. - tag_uri: tag:stsci.edu:asdf/transform/slant_orthographic-1.2.0 schema_uri: http://stsci.edu/schemas/asdf/transform/slant_orthographic-1.2.0 title: The slant orthographic projection. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/airy_disk2d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/airy_disk2d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/airy_disk2d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/airy_disk2d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -11,7 +11,7 @@ examples: - - - $f(r)=43.8[\frac{2J_1(\frac{\pi\sqrt{(x-0.5)^2+(y-1.5)^2}}{10.2/R_z})}{\frac{\pi\sqrt{(x-0.5)^2+(y-1.5)^2}}{10.2/R_z}}]^2$, where $J_1$ is the first order Bessel function and $R_z=1.2196698912665045$ + - $f(r)=43.8[\frac{2J_1(\frac{\pi\sqrt{(x-0.5)^2+(y-1.5)^2}}{10.2/R_z})}{\frac{\pi\sqrt{(x-0.5)^2+(y-1.5)^2}}{10.2/R_z}}]^2$, where $J_1$ is the first order Bessel function and $R_z=1.2196698912665045$ - | !transform/airy_disk2d-1.0.0 {amplitude: 43.8, radius: 10.2, x_0: 0.5, y_0: 1.5} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,39 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/arccosine1d-1.0.0" +tag: "tag:stsci.edu:asdf/transform/arccosine1d-1.0.0" +title: > + One dimensional arccosine model. + +description: > + One dimensional arccosine. + +examples: + - + - $$f(x)=((arccos(x/10.0) / 2\pi) - 1.0) / 0.5$$ + - | + !transform/arccosine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0} + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + amplitude: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation amplitude. + frequency: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation frequency. + phase: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation phase. + + required: ['amplitude', 'frequency', 'phase'] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,39 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/arcsine1d-1.0.0" +tag: "tag:stsci.edu:asdf/transform/arcsine1d-1.0.0" +title: > + One dimensional arcsine model. + +description: > + One dimensional arcsine. + +examples: + - + - $$f(x)=((arcsin(x/10.0) / 2\pi) - 1.0) / 0.5$$ + - | + !transform/arcsine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0} + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + amplitude: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation amplitude. + frequency: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation frequency. + phase: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation phase. + + required: ['amplitude', 'frequency', 'phase'] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,39 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/arctangent1d-1.0.0" +tag: "tag:stsci.edu:asdf/transform/arctangent1d-1.0.0" +title: > + One dimensional arctangent model. + +description: > + One dimensional arctangent. + +examples: + - + - $$f(x)=((arctan(x/10.0) / 2\pi) - 1.0) / 0.5$$ + - | + !transform/arctangent1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0} + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + amplitude: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation amplitude. + frequency: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation frequency. + phase: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation phase. + + required: ['amplitude', 'frequency', 'phase'] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/blackbody-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/blackbody-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/blackbody-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/blackbody-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -30,7 +30,7 @@ description: Scale factor. temperature: $ref: "../unit/quantity-1.1.0" - description: Blackbody temperature. + description: Blackbody temperature. required: ['scale', 'temperature'] ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/box1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/box1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/box1d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/box1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -11,7 +11,7 @@ examples: - - - A 1D box of width 4.0, amplitude 10.0, centered at x=1.5. + - A 1D box of width 4.0, amplitude 10.0, centered at x=1.5. - | !transform/box1d-1.0.0 amplitude: 10.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/conic-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/conic-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/conic-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/conic-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -36,7 +36,7 @@ description: | $(\theta_1 + \theta_2) / 2$ where $\theta_1$ and $\theta_2$ are the latitudes of the standard parallels, in degrees. This - parameter is also referred to as `theta_A`. + parameter is also referred to as `theta_A`. delta: type: number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/cosine1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/cosine1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/cosine1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/cosine1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,39 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/cosine1d-1.0.0" +tag: "tag:stsci.edu:asdf/transform/cosine1d-1.0.0" +title: > + One dimensional cosine model. + +description: > + One dimensional cosine. + +examples: + - + - $$f(x)=10.0cos(2\pi *0.5x+2\pi*1.0)$$ + - | + !transform/cosine1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0} + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + amplitude: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation amplitude. + frequency: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation frequency. + phase: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation phase. + + required: ['amplitude', 'frequency', 'phase'] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/exponential1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/exponential1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/exponential1d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/exponential1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -28,7 +28,7 @@ anyOf: - $ref: "../unit/quantity-1.1.0" - type: number - description: Denominator in exponent. + description: Denominator in exponent. required: ['amplitude', 'tau'] ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/gaussian2d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/gaussian2d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/gaussian2d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/gaussian2d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -7,7 +7,7 @@ A 2D Gaussian model. description: > - A 2D gaussian distribution. + A 2D gaussian distribution. examples: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/logarithmic1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/logarithmic1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/logarithmic1d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/logarithmic1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -28,7 +28,7 @@ anyOf: - $ref: "../unit/quantity-1.1.0" - type: number - description: Denominator in log. + description: Denominator in log. required: ['amplitude', 'tau'] ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/remap_axes-1.3.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/remap_axes-1.3.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/remap_axes-1.3.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/remap_axes-1.3.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -17,7 +17,7 @@ If an object with `mapping` and `n_inputs` properties is provided, the number of input axes is explicitly set by the `n_inputs` value. If only a list is provided, the number of input axes is - automatically determined from the maximum index in the list. + automatically determined from the maximum index in the list. Invertibility: This transform does not have a general analytical inverse. In some well defined cases it is possible to invert automatically diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.0.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -51,4 +51,3 @@ required: [phi, theta, psi, direction] ... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.1.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.1.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.1.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.1.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -51,4 +51,3 @@ required: [phi, theta, psi, direction] ... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.2.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.2.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/rotate3d-1.2.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/rotate3d-1.2.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -57,4 +57,3 @@ required: [phi, theta, psi, direction] ... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/spline1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/spline1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/spline1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/spline1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,49 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/spline1d-1.0.0" +title: > + A spline1d model. + +description: | + A spline1d model represented by an array of its knots, an array of its + coefficients, and its degree. In addition the bounding endpoints + of the spline can be represented as well + +examples: + - + - Non-bounded spline + - | + !transform/spline1d-1.0.0 + knots: !core/ndarray-1.0.0 + [0.0, 0.5, 1] + coefficients: !core/ndarray-1.0.0 + [1.2, 0.3, 56.1] + degree: 3 + +definitions: + coeffs: + tag: tag:stsci.edu:asdf/core/ndarray-1.0.0 + ndim: 1 + datatype: float64 + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + knots: + description: | + The spline knots + $ref: "#/definitions/coeffs" + coefficients: + description: | + The spline coefficients + $ref: "#/definitions/coeffs" + degree: + description: | + The spline degree + type: integer + minimum: 1 + maximum: 5 + required: [knots, coefficients, degree] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/tangent1d-1.0.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/tangent1d-1.0.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/tangent1d-1.0.0.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/tangent1d-1.0.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -0,0 +1,39 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "http://stsci.edu/schemas/asdf/transform/tangent1d-1.0.0" +tag: "tag:stsci.edu:asdf/transform/tangent1d-1.0.0" +title: > + One dimensional tangent model. + +description: > + One dimensional tangent. + +examples: + - + - $$f(x)=10.0tan(2\pi *0.5x+2\pi*1.0)$$ + - | + !transform/tangent1d-1.0.0 {amplitude: 10.0, frequency: 0.5, phase: 1.0} + +allOf: + - $ref: "transform-1.2.0" + - type: object + properties: + amplitude: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation amplitude. + frequency: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation frequency. + phase: + anyOf: + - $ref: "../unit/quantity-1.1.0" + - type: number + description: Oscillation phase. + + required: ['amplitude', 'frequency', 'phase'] +... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/transform-1.2.0.yaml new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/transform-1.2.0.yaml --- old/asdf_transform_schemas-0.2.0/resources/stsci.edu/schemas/transform-1.2.0.yaml 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/resources/stsci.edu/schemas/transform-1.2.0.yaml 2022-02-25 00:20:14.000000000 +0100 @@ -26,5 +26,19 @@ can provide it automatically. $ref: "transform-1.2.0" + + inputs: + description: | + The names of the model's evaluation input variables. + type: array + items: + type: string + + outputs: + description: | + The names of the model's evaluation output variables. + type: array + items: + type: string additionalProperties: true ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/scripts/generate_manifest.py new/asdf_transform_schemas-0.2.2/scripts/generate_manifest.py --- old/asdf_transform_schemas-0.2.0/scripts/generate_manifest.py 2021-11-24 16:36:43.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/scripts/generate_manifest.py 2022-02-25 00:20:14.000000000 +0100 @@ -5,8 +5,8 @@ """ import argparse -import yaml import asdf +import yaml def parse_args(): @@ -28,33 +28,23 @@ args = parse_args() -asdf_standard_version = ( - args.version_map_path.split("/")[-1].rsplit(".", 1)[0].split("-")[-1] -) +asdf_standard_version = args.version_map_path.split("/")[-1].rsplit(".", 1)[0].split("-")[-1] with open(args.version_map_path) as f: version_map = yaml.safe_load(f.read()) manifest = {} -manifest[ - "id" -] = f"http://stsci.edu/asdf/extensions/transform/manifests/transform-{asdf_standard_version}" -manifest[ - "extension_uri" -] = f"http://stsci.edu/asdf/extensions/transform-{asdf_standard_version}" +manifest["id"] = f"http://stsci.edu/asdf/extensions/transform/manifests/transform-{asdf_standard_version}" +manifest["extension_uri"] = f"http://stsci.edu/asdf/extensions/transform-{asdf_standard_version}" manifest["title"] = f"Transform extension {asdf_standard_version}" -manifest["description"] = MultilineString( - "A set of tags for serializing data transforms." -) +manifest["description"] = MultilineString("A set of tags for serializing data transforms.") manifest["tags"] = [] for tag_base, tag_version in version_map["tags"].items(): if tag_base.startswith("tag:stsci.edu:asdf/transform/"): tag_uri = f"{tag_base}-{tag_version}" - schema_uri = tag_uri.replace( - "tag:stsci.edu:asdf/transform/", "http://stsci.edu/schemas/asdf/transform/" - ) + schema_uri = tag_uri.replace("tag:stsci.edu:asdf/transform/", "http://stsci.edu/schemas/asdf/transform/") schema = asdf.schema.load_schema(schema_uri) manifest["tags"].append( { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/scripts/import_transforms.py new/asdf_transform_schemas-0.2.2/scripts/import_transforms.py --- old/asdf_transform_schemas-0.2.0/scripts/import_transforms.py 2020-06-17 20:10:15.000000000 +0200 +++ new/asdf_transform_schemas-0.2.2/scripts/import_transforms.py 2022-02-25 00:20:14.000000000 +0100 @@ -3,12 +3,12 @@ This file can be removed once the format of the new schemas is finalized. """ +import argparse import glob import os import re -import argparse -import pkg_resources +import pkg_resources TAG_PATTERN = re.compile(r"^tag: .*?\n", re.MULTILINE | re.DOTALL) ID_PATTERN = re.compile(r"^id: .*?/([^/-]+)-.*?\n", re.MULTILINE | re.DOTALL) @@ -60,9 +60,7 @@ latest_paths = [] for name, name_paths in paths_by_name.items(): - latest_paths.append( - sorted(name_paths, key=lambda p: pkg_resources.parse_version(p[-1]))[-1][0] - ) + latest_paths.append(sorted(name_paths, key=lambda p: pkg_resources.parse_version(p[-1]))[-1][0]) for path in latest_paths: @@ -83,9 +81,7 @@ content = METASCHEMA_PATTERN.sub(f"$schema: {METASCHEMA}\n", content) - content = EXTERNAL_REF_PATTERN.sub( - r"$ref: http://stsci.edu/schemas/asdf/\1", content - ) + content = EXTERNAL_REF_PATTERN.sub(r"$ref: http://stsci.edu/schemas/asdf/\1", content) content = INTERNAL_REF_PATTERN.sub(rf"$ref: \1-{VERSION}", content) content = BANG_TRANSFORM.sub(rf"!<{URI_PREFIX}/\1-{VERSION}>", content) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/setup.cfg new/asdf_transform_schemas-0.2.2/setup.cfg --- old/asdf_transform_schemas-0.2.0/setup.cfg 2021-12-13 22:29:45.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/setup.cfg 2022-02-25 00:20:30.788784300 +0100 @@ -16,11 +16,12 @@ setuptools setuptools_scm install_requires = - asdf>=2.8.0 + asdf-standard>=1.0.1 importlib_resources>=3;python_version<"3.9" [options.extras_require] test = + asdf>=2.8.0 pytest [options.entry_points] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/setup.py new/asdf_transform_schemas-0.2.2/setup.py --- old/asdf_transform_schemas-0.2.0/setup.py 2021-03-22 14:03:35.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/setup.py 2022-02-25 00:20:14.000000000 +0100 @@ -1,6 +1,7 @@ #!/usr/bin/env python -from setuptools import setup, find_packages +from pathlib import Path +from setuptools import find_packages, setup packages = find_packages(where="src") packages.append("asdf_transform_schemas.resources") @@ -10,9 +11,13 @@ "asdf_transform_schemas.resources": "resources", } -package_data = { - "asdf_transform_schemas.resources": ["*.yaml", "**/*.yaml", "**/**/*.yaml"], -} + +def package_yaml_files(directory): + paths = sorted(Path(directory).rglob("*.yaml")) + return [str(p.relative_to(directory)) for p in paths] + + +package_data = {"asdf_transform_schemas.resources": package_yaml_files("resources")} setup( use_scm_version=True, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas/integration.py new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas/integration.py --- old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas/integration.py 2021-06-04 19:41:08.000000000 +0200 +++ new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas/integration.py 2022-02-25 00:20:14.000000000 +0100 @@ -1,12 +1,12 @@ -from pathlib import Path import sys +from pathlib import Path if sys.version_info < (3, 9): import importlib_resources else: import importlib.resources as importlib_resources -from asdf.resource import DirectoryResourceMapping +from asdf_standard import DirectoryResourceMapping import asdf_transform_schemas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/PKG-INFO new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/PKG-INFO --- old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/PKG-INFO 2021-12-13 22:29:44.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/PKG-INFO 2022-02-25 00:20:30.000000000 +0100 @@ -1,20 +1,26 @@ Metadata-Version: 2.1 Name: asdf-transform-schemas -Version: 0.2.0 +Version: 0.2.2 Summary: ASDF schemas for transforms Home-page: https://github.com/asdf-format/asdf-transform-schemas Author: The ASDF Developers Author-email: h...@stsci.edu License: BSD-3-Clause -Description: # asdf-transform-schemas - - This package provides ASDF schemas for validating transform tags. Users should not - need to install this directly; instead, install an implementation package such - as asdf-astropy, which includes asdf-transform-schemas as a dependency. - - ![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) - Platform: UNKNOWN Requires-Python: >=3.6 Description-Content-Type: text/markdown Provides-Extra: test +License-File: LICENSE + +# asdf-transform-schemas +![CI](https://github.com/asdf-format/asdf-transform-schemas/workflows/CI/badge.svg) +![Downstream](https://github.com/asdf-format/asdf-transform-schemas/workflows/Downstream/badge.svg) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/) + +This package provides ASDF schemas for validating transform tags. Users should not +need to install this directly; instead, install an implementation package such +as asdf-astropy, which includes asdf-transform-schemas as a dependency. + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/SOURCES.txt new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/SOURCES.txt --- old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/SOURCES.txt 2021-12-13 22:29:45.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/SOURCES.txt 2022-02-25 00:20:30.000000000 +0100 @@ -1,12 +1,18 @@ +.gitattributes .gitignore +.pre-commit-config.yaml CHANGES.rst LICENSE README.md +bandit.yaml pyproject.toml setup.cfg setup.py tox.ini +.github/workflows/changelog.yml .github/workflows/ci.yml +.github/workflows/downstream.yml +.github/workflows/publish-to-pypi.yml resources/asdf-format.org/manifests/transform-1.0.0.yaml resources/asdf-format.org/manifests/transform-1.1.0.yaml resources/asdf-format.org/manifests/transform-1.2.0.yaml @@ -24,6 +30,9 @@ resources/stsci.edu/schemas/airy-1.1.0.yaml resources/stsci.edu/schemas/airy-1.2.0.yaml resources/stsci.edu/schemas/airy_disk2d-1.0.0.yaml +resources/stsci.edu/schemas/arccosine1d-1.0.0.yaml +resources/stsci.edu/schemas/arcsine1d-1.0.0.yaml +resources/stsci.edu/schemas/arctangent1d-1.0.0.yaml resources/stsci.edu/schemas/blackbody-1.0.0.yaml resources/stsci.edu/schemas/bonne_equal_area-1.0.0.yaml resources/stsci.edu/schemas/bonne_equal_area-1.1.0.yaml @@ -66,6 +75,7 @@ resources/stsci.edu/schemas/constant-1.2.0.yaml resources/stsci.edu/schemas/constant-1.3.0.yaml resources/stsci.edu/schemas/constant-1.4.0.yaml +resources/stsci.edu/schemas/cosine1d-1.0.0.yaml resources/stsci.edu/schemas/cylindrical-1.0.0.yaml resources/stsci.edu/schemas/cylindrical-1.1.0.yaml resources/stsci.edu/schemas/cylindrical-1.2.0.yaml @@ -196,6 +206,7 @@ resources/stsci.edu/schemas/slant_zenithal_perspective-1.1.0.yaml resources/stsci.edu/schemas/slant_zenithal_perspective-1.2.0.yaml resources/stsci.edu/schemas/smoothly_broken_power_law1d-1.0.0.yaml +resources/stsci.edu/schemas/spline1d-1.0.0.yaml resources/stsci.edu/schemas/stereographic-1.0.0.yaml resources/stsci.edu/schemas/stereographic-1.1.0.yaml resources/stsci.edu/schemas/stereographic-1.2.0.yaml @@ -205,6 +216,7 @@ resources/stsci.edu/schemas/tabular-1.0.0.yaml resources/stsci.edu/schemas/tabular-1.1.0.yaml resources/stsci.edu/schemas/tabular-1.2.0.yaml +resources/stsci.edu/schemas/tangent1d-1.0.0.yaml resources/stsci.edu/schemas/tangential_spherical_cube-1.0.0.yaml resources/stsci.edu/schemas/tangential_spherical_cube-1.1.0.yaml resources/stsci.edu/schemas/tangential_spherical_cube-1.2.0.yaml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/entry_points.txt new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/entry_points.txt --- old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/entry_points.txt 2021-12-13 22:29:44.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/entry_points.txt 2022-02-25 00:20:30.000000000 +0100 @@ -1,3 +1,2 @@ [asdf.resource_mappings] asdf_transform_schemas = asdf_transform_schemas.integration:get_resource_mappings - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/requires.txt new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/requires.txt --- old/asdf_transform_schemas-0.2.0/src/asdf_transform_schemas.egg-info/requires.txt 2021-12-13 22:29:44.000000000 +0100 +++ new/asdf_transform_schemas-0.2.2/src/asdf_transform_schemas.egg-info/requires.txt 2022-02-25 00:20:30.000000000 +0100 @@ -1,7 +1,8 @@ -asdf>=2.8.0 +asdf-standard>=1.0.1 [:python_version < "3.9"] importlib_resources>=3 [test] +asdf>=2.8.0 pytest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/tests/test_integration.py new/asdf_transform_schemas-0.2.2/tests/test_integration.py --- old/asdf_transform_schemas-0.2.0/tests/test_integration.py 2021-06-04 19:41:08.000000000 +0200 +++ new/asdf_transform_schemas-0.2.2/tests/test_integration.py 2022-02-25 00:20:14.000000000 +0100 @@ -1,39 +1,54 @@ from pathlib import Path import asdf +import pytest import yaml -def test_resources(): +def get_resources(): resources_root = Path(__file__).parent.parent / "resources" + + return {str(path.relative_to(resources_root)): path for path in resources_root.glob("**/*.yaml")} + + +RESOURCES = get_resources() + + +@pytest.mark.parametrize("resource", RESOURCES) +def test_resource(resource): + resource_path = RESOURCES[resource] resource_manager = asdf.get_config().resource_manager - for resource_path in resources_root.glob("**/*.yaml"): - with resource_path.open("rb") as f: - resource_content = f.read() - resource = yaml.safe_load(resource_content) - resource_uri = resource["id"] - assert resource_manager[resource_uri] == resource_content + with resource_path.open("rb") as f: + resource_content = f.read() + resource = yaml.safe_load(resource_content) + resource_uri = resource["id"] + assert resource_manager[resource_uri] == resource_content + + +def get_manifests(): + manifests_root = Path(__file__).parent.parent / "resources" / "asdf-format.org" / "manifests" + + return {str(path.relative_to(manifests_root)): path for path in manifests_root.glob("*.yaml")} + + +MANIFESTS = get_manifests() -def test_manifests(): - manifests_root = ( - Path(__file__).parent.parent / "resources" / "asdf-format.org" / "manifests" - ) +@pytest.mark.parametrize("manifest", MANIFESTS) +def test_manifest(manifest): + manifest_path = MANIFESTS[manifest] resource_manager = asdf.get_config().resource_manager - for manifest_path in manifests_root.glob("*.yaml"): - with manifest_path.open("rb") as f: - manifest_content = f.read() - manifest = yaml.safe_load(manifest_content) - - manifest_schema = asdf.schema.load_schema( - "asdf://asdf-format.org/core/schemas/extension_manifest-1.0.0" - ) - - # The manifest must be valid against its own schema: - asdf.schema.validate(manifest, schema=manifest_schema) - - for tag_definition in manifest["tags"]: - # The tag's schema must be available: - assert tag_definition["schema_uri"] in resource_manager + with manifest_path.open("rb") as f: + manifest_content = f.read() + manifest = yaml.safe_load(manifest_content) + + manifest_schema = asdf.schema.load_schema("asdf://asdf-format.org/core/schemas/extension_manifest-1.0.0") + + # The manifest must be valid against its own schema: + asdf.schema.validate(manifest, schema=manifest_schema) + + for tag_definition in manifest["tags"]: + # The tag's schema must be available: + assert tag_definition["schema_uri"] in resource_manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asdf_transform_schemas-0.2.0/tox.ini new/asdf_transform_schemas-0.2.2/tox.ini --- old/asdf_transform_schemas-0.2.0/tox.ini 2021-05-19 18:25:08.000000000 +0200 +++ new/asdf_transform_schemas-0.2.2/tox.ini 2022-02-25 00:20:14.000000000 +0100 @@ -1,10 +1,11 @@ [tox] -envlist = py38, black, flake8 +envlist = py39, black, flake8 [testenv] extras = test commands = + pip freeze pytest [testenv:black] @@ -18,3 +19,18 @@ flake8 commands = flake8 --count + +[testenv:twine] +deps= + twine +commands= + twine check {distdir}/* + +[testenv:codestyle] +skip_install = true +description = Run all style and file checks with pre-commit +deps = + pre-commit +commands = + pre-commit install-hooks + pre-commit run {posargs:--color always --all-files --show-diff-on-failure}