summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.rst4
-rw-r--r--README.rst6
-rw-r--r--doc/source/audit_maps.rst4
-rw-r--r--doc/source/index.rst4
-rw-r--r--doc/source/middleware.rst2
-rw-r--r--setup.cfg3
-rw-r--r--test-requirements.txt2
7 files changed, 12 insertions, 13 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4c3dcf4..f4b6951 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,12 +1,12 @@
If you would like to contribute to the development of OpenStack,
you must follow the steps documented at:
- http://docs.openstack.org/infra/manual/developers.html#development-workflow
+ https://docs.openstack.org/infra/manual/developers.html#development-workflow
Once those steps have been completed, changes to OpenStack should be submitted
for review via the Gerrit tool, following the workflow documented at:
- http://docs.openstack.org/infra/manual/developers.html#development-workflow
+ https://docs.openstack.org/infra/manual/developers.html#development-workflow
Pull requests submitted through GitHub will be ignored.
diff --git a/README.rst b/README.rst
index 1ac20b2..b202b05 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
Team and repository tags
========================
-.. image:: http://governance.openstack.org/badges/pycadf.svg
- :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/badges/pycadf.svg
+ :target: https://governance.openstack.org/reference/tags/index.html
.. Change things from this point on
@@ -32,7 +32,7 @@ auditors can expect from audit notifications.
* `Source`_
.. _PyPi: https://pypi.python.org/pypi/pycadf
-.. _Online Documentation: http://docs.openstack.org/developer/pycadf/
+.. _Online Documentation: https://docs.openstack.org/developer/pycadf/
.. _Launchpad project: https://launchpad.net/pycadf
.. _Blueprints: https://blueprints.launchpad.net/pycadf
.. _Bugs: https://bugs.launchpad.net/pycadf
diff --git a/doc/source/audit_maps.rst b/doc/source/audit_maps.rst
index 08d07ce..5a3faee 100644
--- a/doc/source/audit_maps.rst
+++ b/doc/source/audit_maps.rst
@@ -34,8 +34,8 @@ These files are hosted under the `etc/pycadf`_ directory of pyCADF. For more
information on how to use these mapping files, refer to the `Audit middleware`_
section of the `keystonemiddleware`_ project.
-.. _Audit middleware: http://docs.openstack.org/developer/keystonemiddleware/audit.html
-.. _keystonemiddleware: http://docs.openstack.org/developer/keystonemiddleware
+.. _Audit middleware: https://docs.openstack.org/developer/keystonemiddleware/audit.html
+.. _keystonemiddleware: https://docs.openstack.org/developer/keystonemiddleware
.. _`etc/pycadf`: https://github.com/openstack/pycadf/tree/master/etc/pycadf
.. _`cinder_api_audit_map.conf`: https://github.com/openstack/pycadf/blob/master/etc/pycadf/cinder_api_audit_map.conf
.. _`glance_api_audit_map.conf`: https://github.com/openstack/pycadf/blob/master/etc/pycadf/glance_api_audit_map.conf
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 79dc8d8..2e5af26 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -55,11 +55,11 @@ using `Gerrit`_.
.. _`on OpenStack's Git server`: https://git.openstack.org/cgit/openstack/pycadf/tree
.. _Launchpad: https://launchpad.net/pycadf
-.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
+.. _Gerrit: https://docs.openstack.org/infra/manual/developers.html#development-workflow
.. _Bug reports: https://bugs.launchpad.net/pycadf/+bugs
.. _blueprints: https://blueprints.launchpad.net/pycadf
.. _PyPi: https://pypi.python.org/pypi/pycadf
-.. _tarball: http://tarballs.openstack.org/pycadf
+.. _tarball: https://tarballs.openstack.org/pycadf
Code Documentation
==================
diff --git a/doc/source/middleware.rst b/doc/source/middleware.rst
index fe8f748..3beb737 100644
--- a/doc/source/middleware.rst
+++ b/doc/source/middleware.rst
@@ -23,4 +23,4 @@ pyCADF's version of the audit middleware has been deprecated as of pyCADF
0.8.0. For continued support, the middleware is now maintained under the
Identity (Keystone) umbrella. Related documentation can be found here_.
-.. _here: http://docs.openstack.org/developer/keystonemiddleware/audit.html
+.. _here: https://docs.openstack.org/developer/keystonemiddleware/audit.html
diff --git a/setup.cfg b/setup.cfg
index a471315..51cf8b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ author-email = openstack-dev@lists.openstack.org
summary = CADF Library
description-file =
README.rst
-home-page = http://docs.openstack.org/developer/pycadf/
+home-page = https://docs.openstack.org/developer/pycadf/
classifier =
Development Status :: 3 - Alpha
Environment :: OpenStack
@@ -47,4 +47,3 @@ upload-dir = doc/build/html
warnerrors = True
#autodoc_tree_index_modules = True
#autodoc_tree_root = ./pycadf
-
diff --git a/test-requirements.txt b/test-requirements.txt
index 2ba9087..f2c8d6d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,4 @@ testtools>=1.4.0 # MIT
# this is required for the docs build jobs
oslosphinx>=4.7.0 # Apache-2.0
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinx>=1.5.1 # BSD