summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuwei <liuw147@chinaunicom.cn>2019-04-29 11:05:40 +0800
committerStephen Finucane <stephenfin@redhat.com>2019-05-22 09:51:19 +0100
commit5965747909f3439be18d5cb8b4d4c4ce3cca6a2f (patch)
tree703c070b699c77e462f3e590d7b11ed0d2bf2b56
parentbf0ebe6127100e252768e86e78e4d411a4bdd193 (diff)
downloadtaskflow-5965747909f3439be18d5cb8b4d4c4ce3cca6a2f.tar.gz
update git.openstack.org to opendev3.7.0
Change-Id: Ie9f1ca14eed287f3c25553d029d4a4b2ca5274d0
-rw-r--r--README.rst2
-rw-r--r--doc/source/conf.py29
-rw-r--r--doc/source/user/examples.rst4
-rw-r--r--tox.ini2
4 files changed, 7 insertions, 30 deletions
diff --git a/README.rst b/README.rst
index 2403fad..0aa5022 100644
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,7 @@ projects.
* Free software: Apache license
* Documentation: https://docs.openstack.org/taskflow/latest/
-* Source: https://git.openstack.org/cgit/openstack/taskflow
+* Source: https://opendev.org/openstack/taskflow
* Bugs: https://bugs.launchpad.net/taskflow/
* Release notes: https://docs.openstack.org/releasenotes/taskflow/
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6522da3..aebfde7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,12 +1,7 @@
# -*- coding: utf-8 -*-
import datetime
-import os
-import subprocess
-import sys
-import warnings
-sys.path.insert(0, os.path.abspath('../..'))
# -- General configuration ----------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be
@@ -24,11 +19,6 @@ extensions = [
repository_name = 'openstack/taskflow'
bug_project = 'taskflow'
bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-# autodoc generation is a bit aggressive and a nuisance when doing heavy
-# text edit cycles.
-# execute "export SPHINX_DEBUG=1" in your terminal to disable
# Add any paths that contain templates here, relative to this directory.
templates_path = ['templates']
@@ -46,7 +36,6 @@ exclude_patterns = ['_build']
# General information about the project.
project = u'TaskFlow'
copyright = u'%s, OpenStack Foundation' % datetime.date.today().year
-source_tree = 'https://git.openstack.org/cgit/openstack/taskflow/tree'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
@@ -62,31 +51,20 @@ pygments_style = 'sphinx'
modindex_common_prefix = ['taskflow.']
# Shortened external links.
+source_tree = 'https://opendev.org/openstack/taskflow/src/branch/master/'
extlinks = {
'example': (source_tree + '/taskflow/examples/%s.py', ''),
'pybug': ('http://bugs.python.org/issue%s', ''),
}
+
# -- Options for HTML output --------------------------------------------------
# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
# html_theme_path = ["."]
html_theme = 'openstackdocs'
-# html_static_path = ['static']
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass
-# [howto/manual]).
-latex_documents = [
- ('index',
- '%s.tex' % project,
- '%s Documentation' % project,
- 'OpenStack Foundation', 'manual'),
-]
+
# -- Options for autoddoc ----------------------------------------------------
@@ -95,4 +73,3 @@ autodoc_member_order = 'bysource'
# Always include members
autodoc_default_options = {'members': None, 'show-inheritance': None}
-
diff --git a/doc/source/user/examples.rst b/doc/source/user/examples.rst
index 8345224..8e09aab 100644
--- a/doc/source/user/examples.rst
+++ b/doc/source/user/examples.rst
@@ -16,8 +16,8 @@ in the TaskFlow `source tree`_.
improve them. The higher the quality and the clearer the examples are the
better and more useful they are for everyone.
-.. _examples: http://git.openstack.org/cgit/openstack/taskflow/tree/taskflow/examples
-.. _source tree: http://git.openstack.org/cgit/openstack/taskflow/
+.. _examples: https://opendev.org/openstack/taskflow/src/branch/master/taskflow/examples
+.. _source tree: https://opendev.org/openstack/taskflow/
Hello world
===========
diff --git a/tox.ini b/tox.ini
index d24d52d..8e6a246 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
# We need to install a bit more than just `test' because those drivers have
# custom tests that we always run
deps =
- -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =