Merge "Cleanup py27 support"

openstack/networking-bgpvpn

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2020年05月05日 15:43:33 +00:00

committed by Gerrit Code Review

parent ca9ddb1b83 845dac747f

commit 2dd4066dd0

7 changed files with 10 additions and 30 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5
doc/requirements.txt

View File

@@ -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

2
doc/source/conf.py

View File

@@ -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

3
lower-constraints.txt

View File

@@ -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

4
releasenotes/source/conf.py

View File

@@ -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

11
setup.cfg

View File

@@ -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

9
setup.py

View File

@@ -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)

6
test-requirements.txt

View File

@@ -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.