airship
/
berth
Code Issues Proposed changes

Sync Sphinx requirement 

1. Sync sphinx dependency with global requirements. It caps python 2 since
sphinx 2.0 no longer supports Python 2.7.
2. Update some URLs to latest

Change-Id: I470963ded53ddbf83015ba6698ab31e8aa5ef997
This commit is contained in:
ljhuang 2019-06-11 09:26:13 +00:00
parent 408273e5af
commit 0b17466577
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/requirements.txt
View File

@ -1,7 +1,8 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD
sphinx_rtd_theme>=0.2.4
reno>=2.5.0 # Apache-2.0

2
examples/cirros-test.yaml
View File

@ -6,7 +6,7 @@ vmlist:
vcpu: 1
ram_mb: 256
rootfs:
sourceurl: http://stupidest.org/vm/cirros-0.3.5-x86_64-disk.img
sourceurl: https://stupidest.org/vm/cirros-0.3.5-x86_64-disk.img
localtarget: cirros-vm.qcow2
pvc_size: 128Mi
netconfig:

2
examples/demo-ub14-apache.yaml
View File

@ -6,7 +6,7 @@ vmlist:
vcpu: 1
ram_mb: 1024
rootfs:
sourceurl: http://stupidest.org/vm/ubuntu-14.04-amd64.img
sourceurl: https://stupidest.org/vm/ubuntu-14.04-amd64.img
localtarget: ubuntu-14.04-amd64.qcow2
pvc_size: 5Gi
pvc_class: managed

2
examples/ub16-smp-test.yaml
View File

@ -6,7 +6,7 @@ vmlist:
vcpu: 2
ram_mb: 2048
rootfs:
sourceurl: http://stupidest.org/vm/cw-ub16-test-3a.qcow2
sourceurl: https://stupidest.org/vm/cw-ub16-test-3a.qcow2
localtarget: cw-ub16-test.qcow2
pvc_size: 7Gi
netconfig:

3
test-requirements.txt
View File

@ -2,5 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=1.6.2
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
sphinx_rtd_theme==0.2.4