From f1288e08bccb2e2c1917579cd39af22bbd9633fd Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:38:50 -0500 Subject: [PATCH 1/7] TST: Fix CI failures --- .github/workflows/ci_workflows.yml | 2 +- setup.cfg | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 41902826..77d622a3 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -9,7 +9,7 @@ on: - cron: '0 6 * * 2' env: - jref: "https://ssb.stsci.edu/cdbs/jref" + jref: "https://ssb.stsci.edu/trds_open/jref" jobs: initial_checks: diff --git a/setup.cfg b/setup.cfg index 94b2d807..6b38f075 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,6 +71,9 @@ testpaths = "acstools" "doc" norecursedirs = build doc/build astropy_header = true xfail_strict = true +filterwarnings = + error + ignore:distutils Version classes are deprecated:DeprecationWarning [flake8] # Ignoring these for now: From c2d61c20b26293a2818ee4d88f630b81dd0f839f Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:46:13 -0500 Subject: [PATCH 2/7] TST: Ignore ndarray warning --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 6b38f075..7be22b96 100644 --- a/setup.cfg +++ b/setup.cfg @@ -73,6 +73,7 @@ astropy_header = true xfail_strict = true filterwarnings = error + ignore:numpy\.ndarray size changed:RuntimeWarning ignore:distutils Version classes are deprecated:DeprecationWarning [flake8] From 2f203a50f02e06913ed91ca29fa56020de7a73f6 Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:57:13 -0500 Subject: [PATCH 3/7] TST: Use dev ci-watson for remote-data job --- .github/workflows/ci_workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 77d622a3..a2e325e7 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -95,6 +95,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel pip install git+https://github.com/astropy/astropy.git#egg=astropy --upgrade --no-deps + pip install git+https://github.com/spacetelescope/ci_watson.git --upgrade --no-deps python -m pip install -e .[test,all] - name: Test run: pytest --remote-data -v From 9baa88c56095072e985442bda13f101aefa4b016 Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:59:47 -0500 Subject: [PATCH 4/7] DOC: Update RTD specs --- .readthedocs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 469bcc4d..aee168bf 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -9,8 +9,7 @@ sphinx: # Set the version of Python and requirements required to build your docs python: - version: 3.7 - system_packages: true + version: 3.8 install: - method: pip path: . From a121e1a747b0d058bc8d17ccebabfa1fffdf8f7e Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 10:08:09 -0500 Subject: [PATCH 5/7] Moar fixes --- .github/workflows/ci_workflows.yml | 1 + doc/source/conf.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index a2e325e7..811fb028 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -74,6 +74,7 @@ jobs: - name: Install and build run: | python -m pip install --upgrade pip setuptools wheel + pip install git+https://github.com/spacetelescope/ci_watson.git --upgrade --no-deps python -m pip install -e .[test,all] - name: Test run: pytest --remote-data -v diff --git a/doc/source/conf.py b/doc/source/conf.py index f23160af..4bc2ae8f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,8 +10,7 @@ # # All configuration values have a default; values that are commented out # serve to show the default. - -from pkg_resources import get_distribution +from importlib import metadata # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -53,7 +52,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = get_distribution('acstools').version +release = metadata.version('acstools') # The short X.Y version. version = '.'.join(release.split('.')[:2]) From c0dc4d1e9065c155ed8c034d95686144cd6b85af Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 10:15:07 -0500 Subject: [PATCH 6/7] one more try before yolo --- doc/source/conf.py | 4 ++-- setup.cfg | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 4bc2ae8f..61d5050a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,7 +10,7 @@ # # All configuration values have a default; values that are commented out # serve to show the default. -from importlib import metadata +from acstools import __version__ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -52,7 +52,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = metadata.version('acstools') +release = __version__ # The short X.Y version. version = '.'.join(release.split('.')[:2]) diff --git a/setup.cfg b/setup.cfg index 7be22b96..2d4c64b5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,6 +52,7 @@ test = ci-watson docs = sphinx-automodapi + sphinx-rtd-theme [options.package_data] acstools = data/* From 79bc8a1c076c16fa9b0a90361a4d013146d65d98 Mon Sep 17 00:00:00 2001 From: "Pey Lian Lim (Github)" <2090236+pllim@users.noreply.github.com> Date: Tue, 21 Dec 2021 10:32:20 -0500 Subject: [PATCH 7/7] TST: Ignore ResourceWarning --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 2d4c64b5..5d75e318 100644 --- a/setup.cfg +++ b/setup.cfg @@ -75,6 +75,7 @@ xfail_strict = true filterwarnings = error ignore:numpy\.ndarray size changed:RuntimeWarning + ignore:unclosed file:ResourceWarning ignore:distutils Version classes are deprecated:DeprecationWarning [flake8]