Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
version: 2

python:
# Revise build version once more dependencies support python 3.9+
version: 3.8
system_packages: false
install:
- method: pip
path: .
extra_requirements:
- docs
build:
os: "ubuntu-20.04"
tools:
python: "mambaforge-4.10"

conda:
environment: docs/rtd_environment.yaml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to not rely on any conda stuff for CI. Do you plan to have this temporarily, or this is now our solution for docs builds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great question. I did this because it seemed the most direct way to get RTD to build again. I'm totally happy to return to a non-conda approach. I was unable to figure one out - graphviz specifically caused problems.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And did you find out why it stopped working the first place? As grapviz wasn't really causing issues recently

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error started appearing spontaneously:
https://readthedocs.org/projects/astroquery/builds/20444648/
"Could not import extension sphinx.builders.linkcheck (exception: urllib3 v2.0 only supports OpenSSL 1.1.1+, currently the 'ssl' module is compiled with OpenSSL 1.0.2n 7 Dec 2017. See: urllib3/urllib3#2168)"

My best read was that there is a problem caused by using old python3.8. We then had to upgrade to the new RTD configuration system, and then that caused problems with graphviz until I switched to the astropy conda-based version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeap, but graphviz can be installed into the image directly without adding conda into the picture. #2732 should fix it.


sphinx:
fail_on_warning: true
configuration: docs/conf.py
builder: html
configuration: docs/conf.py
fail_on_warning: true

# Install regular dependencies.
# Then, install special pinning for RTD.
python:
system_packages: false
install:
- method: pip
path: .
extra_requirements:
- docs
- all

# Don't build any extra formats
formats: []
2 changes: 1 addition & 1 deletion astroquery/mast/tests/test_mast.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def test_mast_service_request(patch_post):
def test_resolve_object(patch_post):
m103_loc = mast.Mast.resolve_object("M103")
print(m103_loc)
assert m103_loc.separation(SkyCoord("23.34086 60.658", unit='deg')).value == 0
assert round(m103_loc.separation(SkyCoord("23.34086 60.658", unit='deg')).value, 10) == 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this change included in this RTD config PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were simultaneous fixes - #2729 depended on #2730 but both were generically "fix CI" PRs.



def test_login_logout(patch_post):
Expand Down
8 changes: 8 additions & 0 deletions docs/rtd_environment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: rtd311
channels:
- conda-forge
- defaults
dependencies:
- python=3.11
- pip
- graphviz