From 62c7cb42c61c5160b4d4b12a2ce0f2ac2f8e803b Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Wed, 6 Apr 2022 14:57:00 -0400 Subject: [PATCH 1/3] Fix for time-delta warning on develop --- asdf_astropy/converters/time/tests/test_time_delta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asdf_astropy/converters/time/tests/test_time_delta.py b/asdf_astropy/converters/time/tests/test_time_delta.py index 4a81207..328ad91 100644 --- a/asdf_astropy/converters/time/tests/test_time_delta.py +++ b/asdf_astropy/converters/time/tests/test_time_delta.py @@ -15,7 +15,7 @@ def create_time_deltas(): result.append(TimeDelta(Time.now() - Time.now(), format=format)) for scale in list(TimeDelta.SCALES) + [None]: - result.append(TimeDelta(0.125, scale=scale)) + result.append(TimeDelta(0.125 * u.day, scale=scale)) return result From 448ef69143f85cde0b03d964ff4efa264d9f7e70 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Wed, 6 Apr 2022 14:59:26 -0400 Subject: [PATCH 2/3] Update ci to catch warnings in development versions --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index d067187..59b85e6 100644 --- a/tox.ini +++ b/tox.ini @@ -98,6 +98,11 @@ commands= bandit -c bandit.yaml -r . [testenv:warnings] +deps = + git+https://github.com/numpy/numpy + git+https://github.com/astropy/astropy.git#egg=astropy + git+https://github.com/asdf-format/asdf + git+https://github.com/asdf-format/asdf-transform-schemas#egg=asdf_transform_schemas commands= pip freeze pytest --remote-data -W error \ From 4cf31aa10613ccfa68e0b1e9add3b7e8509d98a0 Mon Sep 17 00:00:00 2001 From: William Jamieson Date: Thu, 7 Apr 2022 11:08:59 -0400 Subject: [PATCH 3/3] Update devdeps to use nightly numpy and prevent repeated code --- requirements-dev.txt | 3 +++ tox.ini | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 requirements-dev.txt diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..9fa0a50 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,3 @@ +git+https://github.com/astropy/astropy +git+https://github.com/asdf-format/asdf +git+https://github.com/asdf-format/asdf-transform-schemas diff --git a/tox.ini b/tox.ini index 59b85e6..31911c7 100644 --- a/tox.ini +++ b/tox.ini @@ -43,10 +43,7 @@ deps = numpy119: numpy==1.19.* astropylts: astropy==5.0.* - devdeps: git+https://github.com/numpy/numpy - devdeps: git+https://github.com/astropy/astropy.git#egg=astropy - devdeps: git+https://github.com/asdf-format/asdf - devdeps: git+https://github.com/asdf-format/asdf-transform-schemas#egg=asdf_transform_schemas + devdeps: -rrequirements-dev.txt py310: git+https://github.com/pytest-dev/pytest @@ -56,6 +53,7 @@ extras = alldeps: all commands = + devdeps: pip install -U --pre -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy pip freeze !cov: pytest {posargs} cov: pytest --cov-report xml --cov asdf_astropy {posargs} @@ -99,11 +97,9 @@ commands= [testenv:warnings] deps = - git+https://github.com/numpy/numpy - git+https://github.com/astropy/astropy.git#egg=astropy - git+https://github.com/asdf-format/asdf - git+https://github.com/asdf-format/asdf-transform-schemas#egg=asdf_transform_schemas + -rrequirements-dev.txt commands= + pip install -U --pre -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy pip freeze pytest --remote-data -W error \ -p no:unraisableexception \