Skip to content

Commit

Permalink
Merge pull request #38 from WilliamJamieson/bugfix/circular-imports
Browse files Browse the repository at this point in the history
Fix for circular dependencies between asdf packages
  • Loading branch information
WilliamJamieson committed Feb 24, 2022
1 parent 0c930f5 commit f173327
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Install asdf-transform-schemas
run: cd asdf-transform-schemas && pip install .
- name: Install astropy
run: cd astropy && pip install -e .[test]
run: cd astropy && pip install -e .[all,test]
- name: Pip Freeze
run: pip freeze
- name: Run astropy development tests
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- 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)

Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ setup_requires =
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]
Expand Down
2 changes: 1 addition & 1 deletion src/asdf_transform_schemas/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
else:
import importlib.resources as importlib_resources

from asdf.resource import DirectoryResourceMapping
from asdf_standard import DirectoryResourceMapping

import asdf_transform_schemas

Expand Down

0 comments on commit f173327

Please sign in to comment.