Merge branch 'version/2.5' into version/2.6

* version/2.5: convert libdbi from apt-get to manual download update requirements.txt for readthedocs compatibility
Ensembl · Sep 9, 2021 · a7bf004 · a7bf004
2 parents 5f83ef2 + 16ece50
commit a7bf004
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinxcontrib-doxylink==1.3
+sphinxcontrib-doxylink
 doxypypy
diff --git a/docs/rtd_upgrade.sh b/docs/rtd_upgrade.sh
@@ -31,7 +31,6 @@ mkdir packages
 cd packages
 # List of extra packages we need
 apt-get download \
-     libdbi-perl \
      libdbd-sqlite3-perl \
      libjson-xs-perl \
      libjson-perl \
@@ -45,6 +44,9 @@ apt-get download \
      doxypy \
      libproc-daemon-perl \
 
+# manual download because rtd hasn't updated apt-cache
+echo http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbi-perl/libdbi-perl_1.640-1_amd64.deb \
+  | xargs -n 1 curl -O
 
 mkdir ../root
 for i in *.deb; do dpkg -x "$i" ../root/; done