diff --git a/lower-constraints.txt b/lower-constraints.txt index d234aec3..3dc3ca16 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -33,7 +33,6 @@ greenlet==0.4.13 hacking==0.12.0 idna==2.6 imagesize==1.0.0 -ipaddress==1.0.17 iso8601==0.1.12 itsdangerous==0.24 Jinja2==2.10 diff --git a/requirements.txt b/requirements.txt index 941760dd..fb6f1813 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ Babel!=2.4.0,>=2.3.4 # BSD Flask!=0.11,>=0.10 # BSD -ipaddress>=1.0.17;python_version<'3.3' # PSF jsonschema>=2.6.0 # MIT kuryr-lib>=0.5.0 # Apache-2.0 neutron-lib>=1.13.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 99e2d4c2..a484f463 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/kuryr-libnetwork/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,13 +14,12 @@ 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 -[bdist_wheel] -universal = 1 - [entry_points] oslo.config.opts = kuryr_libnetwork = kuryr_libnetwork.opts:list_kuryr_libnetwork_opts @@ -33,15 +33,6 @@ packages = data_files = /usr/lib/docker/plugins/kuryr = etc/kuryr.spec -[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 = kuryr_libnetwork/locale domain = kuryr_libnetwork 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)