diff --git a/doc/requirements.txt b/doc/requirements.txt index 03db7bce..e84dd2b8 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,9 +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,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 sphinxcontrib-blockdiag>=1.5.4 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index a681fc4f..12ca639f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -76,8 +76,6 @@ blockdiag_html_image_format = "svg" html_static_path = ['_static'] html_theme = 'openstackdocs' -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # -- Options for LaTeX output ------------------------------------------------- # Grouping the document tree into LaTeX files. List of tuples diff --git a/lower-constraints.txt b/lower-constraints.txt index 06937046..f2fb4208 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -121,6 +121,7 @@ pyparsing==2.1.0 pyperclip==1.5.27 pyroute2==0.5.7 pyScss==1.3.7 +pytest==5.3.5 python-cinderclient==5.0.0 python-dateutil==2.5.3 python-designateclient==2.7.0 @@ -147,7 +148,7 @@ seqdiag==0.9.5 simplejson==3.5.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.2 +Sphinx==2.0.0 SQLAlchemy==1.2.0 sqlalchemy-migrate==0.11.0 sqlparse==0.2.2 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 5af2bcb7..c15db7a6 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -146,10 +146,6 @@ html_static_path = ['_static'] # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True diff --git a/setup.cfg b/setup.cfg index 6cb86963..5364762f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -56,15 +58,6 @@ oslo.policy.policies = neutron.policies = networking-bgpvpn = networking_bgpvpn.policies:list_rules -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = networking_bgpvpn/locale domain = networking_bgpvpn diff --git a/setup.py b/setup.py index 566d8443..cd35c3c3 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 06b246b1..3c44fd6d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,13 +10,15 @@ psycopg2>=2.7.7 # LGPL/ZPL PyMySQL>=0.7.6 # MIT License WebOb>=1.8.2 # MIT oslotest>=3.2.0 # Apache-2.0 -astroid==2.1.0;python_version>="3.0" # LGPLv2.1 -pylint==2.2.0;python_version>="3.0" # GPLv2 +astroid==2.1.0 # LGPLv2.1 +pylint==2.2.0 # GPLv2 +pytest>=5.3.5 # MIT stestr>=1.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT tempest>=17.1.0 # Apache-2.0 +mock>=2.0.0 # BSD # OpenStack CI will install the following projects from git # if they are in the required-projects list for a job.

AltStyle によって変換されたページ (->オリジナル) /