diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/ChangeLog networking-arista-2021.2.0+git2022011308.8b1273a/ChangeLog --- networking-arista-2021.1.0+git2021090912.f26e45b/ChangeLog 2021-09-09 16:46:16.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/ChangeLog 2022-01-13 13:37:36.000000000 +0000 @@ -1,6 +1,8 @@ CHANGES ======= +* Make unit tests backwards compatible with the latest pyPI Neutron +* Fix unit tests and lower-constraints * Use new callback payloads for PORT AFTER\_UPDATE and AFTER\_DELETE * Handle new payload format for SUBNETs, SG and SG\_RULES * Temporary fix to make code work with SQLAlchemy 1.4.18 @@ -261,8 +263,8 @@ * Ensuring that the response contains 'errors' key * Use requests library instead of jsonrpclib -2015.2 ------- +2015.2.0 +-------- * Adding database migration scripts * Use auth\_uri in when set diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/debian/changelog networking-arista-2021.2.0+git2022011308.8b1273a/debian/changelog --- networking-arista-2021.1.0+git2021090912.f26e45b/debian/changelog 2021-09-09 16:46:50.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/debian/changelog 2022-01-13 13:35:01.000000000 +0000 @@ -1,3 +1,13 @@ +networking-arista (2021.2.0+git2022011308.8b1273a-0ubuntu1) jammy; urgency=medium + + * New upstream snapshot for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. + * d/control: Bump debhelper compat to 13. + * d/p/revert-sqlalchemy-1.4.18.patch: Dropped. No longer needed with latest + sqlalchemy. + + -- Corey Bryant Thu, 13 Jan 2022 08:35:01 -0500 + networking-arista (2021.1.0+git2021090912.f26e45b-0ubuntu1) impish; urgency=medium * New upstream snapshot for OpenStack Xena. diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/debian/control networking-arista-2021.2.0+git2022011308.8b1273a/debian/control --- networking-arista-2021.1.0+git2021090912.f26e45b/debian/control 2021-09-09 16:46:50.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/debian/control 2022-01-13 13:35:01.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Thomas Goirand , Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, @@ -15,22 +15,22 @@ python3-sphinx (>= 1.6.5), Build-Depends-Indep: alembic (>= 0.8.10), - python3-alembic (>= 0.8.10), + python3-alembic (>= 1.6.5), python3-coverage (>= 4.0), python3-hacking (>= 1.1.0), python3-mock (>= 3.0.0), - python3-neutron (>= 2:16.0.0), - python3-neutron-lib (>= 2.0.0), - python3-oslo.config (>= 1:5.2.0), - python3-oslo.i18n (>= 3.15.3), - python3-oslo.log (>= 3.36.0), - python3-oslo.service (>= 1.24.0), - python3-oslo.utils (>= 3.33.0), + python3-neutron (>= 2:19.0.0), + python3-neutron-lib (>= 2.16.0), + python3-oslo.config (>= 1:8.0.0), + python3-oslo.i18n (>= 3.20.0), + python3-oslo.log (>= 4.5.0), + python3-oslo.service (>= 1.31.0), + python3-oslo.utils (>= 4.5.0), python3-oslosphinx (>= 4.7.0), python3-oslotest (>= 1:3.2.0), - python3-requests (>= 2.14.2), + python3-requests (>= 2.18.0), python3-six (>= 1.10.0), - python3-sqlalchemy (>= 1.2.0), + python3-sqlalchemy (>= 1.4.23), python3-stestr (>= 1.0.0), python3-subunit (>= 1.0.0), python3-testresources (>= 2.0.0), @@ -48,18 +48,18 @@ Section: python Depends: alembic (>= 0.8.10), - python3-alembic (>= 0.8.10), - python3-neutron (>= 2:16.0.0), - python3-neutron-lib (>= 2.0.0), - python3-oslo.config (>= 1:5.2.0), - python3-oslo.i18n (>= 3.15.3), - python3-oslo.log (>= 3.36.0), - python3-oslo.service (>= 1.24.0), - python3-oslo.utils (>= 3.33.0), + python3-alembic (>= 1.6.5), + python3-neutron (>= 2:19.0.0), + python3-neutron-lib (>= 2.16.0), + python3-oslo.config (>= 1:8.0.0), + python3-oslo.i18n (>= 3.20.0), + python3-oslo.log (>= 4.5.0), + python3-oslo.service (>= 1.31.0), + python3-oslo.utils (>= 4.5.0), python3-pbr (>= 4.0.0), - python3-requests (>= 2.14.2), + python3-requests (>= 2.18.0), python3-six (>= 1.10.0), - python3-sqlalchemy (>= 1.2.0), + python3-sqlalchemy (>= 1.4.23), ${misc:Depends}, ${python3:Depends}, Recommends: diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/debian/patches/revert-sqlalchemy-1.4.18.patch networking-arista-2021.2.0+git2022011308.8b1273a/debian/patches/revert-sqlalchemy-1.4.18.patch --- networking-arista-2021.1.0+git2021090912.f26e45b/debian/patches/revert-sqlalchemy-1.4.18.patch 2021-09-09 16:46:50.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/debian/patches/revert-sqlalchemy-1.4.18.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -Description: Revert "Temporary fix to make code work with SQLAlchemy 1.4.18" - This reverts commit e69c12447174f07b226faba6045afc4cd3b1c74d, which - patched networking-arista to work with SQLAlchemy 1.4.18. Currently - Ubuntu Impish has sqlalchemy 1.3.22. -Author: Corey Bryant -Forwarded: No - ---- - networking_arista/common/db_lib.py | 19 ++++++------------- - .../ml2/type_drivers/driver_helpers.py | 4 ++-- - 2 files changed, 8 insertions(+), 15 deletions(-) - -diff --git a/networking_arista/common/db_lib.py b/networking_arista/common/db_lib.py -index d5219d6..4ee74b2 100644 ---- a/networking_arista/common/db_lib.py -+++ b/networking_arista/common/db_lib.py -@@ -15,13 +15,11 @@ - - import collections - --from contextlib import suppress - from oslo_config import cfg - from oslo_log import log as logging - from sqlalchemy import and_, or_ - from sqlalchemy import func - from sqlalchemy.orm import immediateload, Query, aliased --from sqlalchemy.sql import visitors - - from neutron_lib.api.definitions import portbindings - from neutron_lib import constants as n_const -@@ -42,25 +40,20 @@ from networking_arista.common import utils - LOG = logging.getLogger(__name__) - - --def has_table(query, table): -- for visitor in visitors.iterate(query.statement): -- if visitor.__visit_name__ == 'table': -- with suppress(TypeError): -- if table == visitor.entity_namespace: -- return True -- return False -- -- - def join_if_necessary(query, *args, **kwargs): - table = args[0] -- if has_table(query, table): -+ if table in [t.entity for t in query._join_entities]: -+ return query -+ elif table in query._primary_entity.entities: - return query - return query.join(*args, **kwargs) - - - def outerjoin_if_necessary(query, *args, **kwargs): - table = args[0] -- if has_table(query, table): -+ if table in [t.entity for t in query._join_entities]: -+ return query -+ elif table in query._primary_entity.entities: - return query - return query.outerjoin(*args, **kwargs) - -diff --git a/networking_arista/ml2/type_drivers/driver_helpers.py b/networking_arista/ml2/type_drivers/driver_helpers.py -index 546a551..6e62a5a 100644 ---- a/networking_arista/ml2/type_drivers/driver_helpers.py -+++ b/networking_arista/ml2/type_drivers/driver_helpers.py -@@ -121,8 +121,8 @@ class VlanSyncService(object): - session = db_api.get_writer_session() - with session.begin(subtransactions=True): - allocs = ( -- session.query(vlanallocation.VlanAllocation).with_for_update() -- ) -+ session.query(vlanallocation.VlanAllocation).with_lockmode( -+ 'update')) - - for alloc in allocs: - if alloc.physical_network != 'default': --- -2.31.1 - diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/debian/patches/series networking-arista-2021.2.0+git2022011308.8b1273a/debian/patches/series --- networking-arista-2021.1.0+git2021090912.f26e45b/debian/patches/series 2021-09-09 16:46:50.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/debian/patches/series 2022-01-13 13:35:01.000000000 +0000 @@ -1,2 +1 @@ skip-tests.patch -revert-sqlalchemy-1.4.18.patch diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/lower-constraints.txt networking-arista-2021.2.0+git2022011308.8b1273a/lower-constraints.txt --- networking-arista-2021.1.0+git2021090912.f26e45b/lower-constraints.txt 2021-07-22 16:26:09.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/lower-constraints.txt 2021-12-08 21:38:50.000000000 +0000 @@ -1,6 +1,6 @@ alabaster==0.7.10 -alembic==0.8.10 -amqp==2.1.1 +alembic==1.6.5 +amqp==2.5.0 appdirs==1.4.3 astroid==2.1.0 Babel==2.3.4 @@ -8,19 +8,19 @@ bashate==0.5.1 beautifulsoup4==4.6.0 cachetools==2.0.0 -cffi!=1.11.3,>=1.8 +cffi==1.13.2 cliff==2.8.0 cmd2==0.8.0 contextlib2==0.4.0 coverage==4.0 ddt==1.0.1 -debtcollector>=1.19.0 -decorator==3.4.0 +debtcollector==1.19.0 +decorator==4.1.0 deprecation==1.0 docutils==0.11 -dogpile.cache==0.6.2 +dogpile.cache==0.6.5 dulwich==0.15.0 -eventlet==0.18.2 +eventlet==0.25.1 extras==1.0.0 fasteners==0.7.0 fixtures==3.0.0 @@ -40,14 +40,14 @@ jsonpatch==1.16 jsonpointer==1.13 jsonschema==2.6.0 -keystoneauth1>=3.14.0 -keystonemiddleware==4.17.0 -kombu==4.0.0 +keystoneauth1==3.14.0 +keystonemiddleware==5.1.0 +kombu==4.6.1 linecache2==1.0.0 logilab-common==1.4.1 logutils==0.3.5 -Mako==0.4.0 -MarkupSafe==1.0 +Mako==1.0.7 +MarkupSafe==1.1.1 mccabe==0.2.1 mock==3.0.0 monotonic==0.6;python_version<'3.3' @@ -56,36 +56,36 @@ munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -neutron-lib==2.0.0 +neutron-lib==2.16.0 openstackdocstheme==1.30.0 openstacksdk==0.31.2 os-client-config==1.28.0 -os-service-types>=1.7.0 +os-service-types==1.7.0 os-xenapi==0.3.1 osc-lib==1.8.0 oslo.cache==1.26.0 oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.db==4.37.0 -oslo.i18n==3.15.3 -oslo.log==3.36.0 -oslo.messaging==5.29.0 +oslo.config==8.0.0 +oslo.context==2.22.0 +oslo.db==4.44.0 +oslo.i18n==3.20.0 +oslo.log==4.5.0 +oslo.messaging==7.0.0 oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.privsep==1.32.0 +oslo.policy==3.7.0 +oslo.privsep==2.3.0 oslo.reports==1.18.0 oslo.rootwrap==5.8.0 -oslo.serialization==2.18.0 -oslo.service==1.24.0 -oslo.upgradecheck==0.1.0 -oslo.utils==3.33.0 +oslo.serialization==2.25.0 +oslo.service==1.31.0 +oslo.upgradecheck==1.3.0 +oslo.utils==4.5.0 oslo.versionedobjects==1.35.1 oslosphinx==4.7.0 oslotest==3.2.0 osprofiler==2.3.0 -ovs==2.8.0 -ovsdbapp==1.0.0 +ovs==2.10.0 +ovsdbapp==1.11.0 Paste==2.0.2 PasteDeploy==1.5.0 pbr==4.0.0 @@ -95,7 +95,7 @@ pika==0.10.0 positional==1.2.1 prettytable==0.7.2 -psutil==3.2.2 +psutil==5.3.0 pycadf==1.1.0 pycodestyle<2.1,>=2.0 pycparser==2.18 @@ -106,8 +106,8 @@ PyMySQL==0.7.6 pyparsing==2.1.0 pyperclip==1.5.27 -pyroute2==0.5.7 -python-dateutil==2.5.3 +pyroute2==0.6.4 +python-dateutil==2.7.0 python-designateclient==2.7.0 python-editor==1.0.3 python-keystoneclient==3.8.0 @@ -116,12 +116,11 @@ python-novaclient==9.1.0 python-subunit==1.0.0 pytz==2013.6 -PyYAML==3.12 +PyYAML==5.3.1 reno==2.5.0 repoze.lru==0.7 -requests==2.14.2 +requests==2.18.0 requestsexceptions==1.2.0 -rfc3986==0.3.1 Routes==2.3.1 ryu==4.24 simplejson==3.5.1 @@ -132,13 +131,13 @@ sphinxcontrib-fulltoc==1.2.0 sphinxcontrib-websupport==1.0.1 sqlalchemy-migrate==0.11.0 -SQLAlchemy==1.2.0 +SQLAlchemy==1.4.23 sqlparse==0.2.2 statsd==3.2.1 stestr==1.0.0 stevedore==1.20.0 Tempita==0.5.2 -tenacity==4.4.0 +tenacity==6.0.0 testrepository==0.0.18 testresources==2.0.0 testscenarios==0.4 @@ -151,4 +150,4 @@ weakrefmethod==1.0.2 WebOb==1.8.2 WebTest==2.0.27 -wrapt==1.7.0 +wrapt==1.12.0 diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista/tests/unit/ml2/test_mechanism_arista.py networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista/tests/unit/ml2/test_mechanism_arista.py --- networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista/tests/unit/ml2/test_mechanism_arista.py 2021-07-22 16:26:09.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista/tests/unit/ml2/test_mechanism_arista.py 2022-01-13 13:37:35.000000000 +0000 @@ -496,6 +496,7 @@ 'device_owner': ''} subport, _ = self.create_port(subport_dict) trunk_dict = {'trunk': {'port_id': trunkport['id'], + 'project_id': port_tenant, 'tenant_id': port_tenant, 'sub_ports': [{'port_id': subport['id'], 'segmentation_type': 'vlan', @@ -566,6 +567,7 @@ 'device_owner': ''} subport, _ = self.create_port(subport_dict) trunk_dict = {'trunk': {'port_id': trunkport['id'], + 'project_id': port_tenant, 'tenant_id': port_tenant, 'sub_ports': [{'port_id': subport['id'], 'segmentation_type': 'vlan', @@ -655,6 +657,7 @@ 'device_owner': ''} subport, _ = self.create_port(subport_dict) trunk_dict = {'trunk': {'port_id': trunkport['id'], + 'project_id': port_tenant, 'tenant_id': port_tenant, 'sub_ports': [{'port_id': subport['id'], 'segmentation_type': 'inherit', @@ -726,6 +729,7 @@ 'device_owner': ''} subport, _ = self.create_port(subport_dict) trunk_dict = {'trunk': {'port_id': trunkport['id'], + 'project_id': port_tenant, 'tenant_id': port_tenant, 'sub_ports': [{'port_id': subport['id'], 'segmentation_type': 'inherit', @@ -813,6 +817,7 @@ 'device_owner': ''} subport, _ = self.create_port(subport_dict) trunk_dict = {'trunk': {'port_id': trunkport['id'], + 'project_id': port_tenant, 'tenant_id': port_tenant, 'sub_ports': [{'port_id': subport['id'], 'segmentation_type': 'inherit', diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/pbr.json networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/pbr.json --- networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/pbr.json 2021-09-09 16:46:16.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/pbr.json 2021-12-09 20:59:56.000000000 +0000 @@ -1 +1 @@ -{"git_version": "f26e45b", "is_release": false} \ No newline at end of file +{"git_version": "2766d4e", "is_release": false} \ No newline at end of file diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/PKG-INFO networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/PKG-INFO --- networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/PKG-INFO 2021-09-09 16:46:16.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/PKG-INFO 2022-01-13 13:37:36.000000000 +0000 @@ -1,22 +1,11 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: networking-arista -Version: 2017.2.1.dev165 +Version: 2017.2.1.dev167 Summary: Arista Networking drivers -Home-page: https://github.com/openstack/networking-arista/ +Home-page: https://opendev.org/x/networking-arista/ Author: Arista Networks Author-email: openstack-dev@arista.com License: UNKNOWN -Description: =============================== - networking-arista - =============================== - - Arista Networking drivers - - * Free software: Apache license - * Source: https://opendev.org/x/networking-arista - * Bug: https://bugs.launchpad.net/networking-arista - - Platform: UNKNOWN Classifier: Environment :: OpenStack Classifier: Intended Audience :: Information Technology @@ -24,7 +13,23 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 +License-File: LICENSE +License-File: AUTHORS + +=============================== +networking-arista +=============================== + +Arista Networking drivers + +* Free software: Apache license +* Source: https://opendev.org/x/networking-arista +* Bug: https://bugs.launchpad.net/networking-arista + + + diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/requires.txt networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/requires.txt --- networking-arista-2021.1.0+git2021090912.f26e45b/networking_arista.egg-info/requires.txt 2021-09-09 16:46:16.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/networking_arista.egg-info/requires.txt 2022-01-13 13:37:36.000000000 +0000 @@ -1,12 +1,12 @@ -SQLAlchemy>=1.2.0 -alembic>=0.8.10 +SQLAlchemy>=1.4.23 +alembic>=1.6.5 neutron -neutron-lib>=2.0.0 -oslo.config>=5.2.0 -oslo.i18n>=3.15.3 -oslo.log>=3.36.0 -oslo.service!=1.28.1,>=1.24.0 -oslo.utils>=3.33.0 +neutron-lib>=2.16.0 +oslo.config>=8.0.0 +oslo.i18n>=3.20.0 +oslo.log>=4.5.0 +oslo.service>=1.31.0 +oslo.utils>=4.5.0 pbr>=4.0.0 -requests>=2.14.2 +requests>=2.18.0 six>=1.10.0 diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/PKG-INFO networking-arista-2021.2.0+git2022011308.8b1273a/PKG-INFO --- networking-arista-2021.1.0+git2021090912.f26e45b/PKG-INFO 2021-09-09 16:46:18.877729200 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/PKG-INFO 2022-01-13 13:37:40.791413300 +0000 @@ -1,22 +1,11 @@ -Metadata-Version: 1.1 +Metadata-Version: 2.1 Name: networking_arista -Version: 2017.2.1.dev165 +Version: 2017.2.1.dev167 Summary: Arista Networking drivers -Home-page: https://github.com/openstack/networking-arista/ +Home-page: https://opendev.org/x/networking-arista/ Author: Arista Networks Author-email: openstack-dev@arista.com License: UNKNOWN -Description: =============================== - networking-arista - =============================== - - Arista Networking drivers - - * Free software: Apache license - * Source: https://opendev.org/x/networking-arista - * Bug: https://bugs.launchpad.net/networking-arista - - Platform: UNKNOWN Classifier: Environment :: OpenStack Classifier: Intended Audience :: Information Technology @@ -24,7 +13,23 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.6 +License-File: LICENSE +License-File: AUTHORS + +=============================== +networking-arista +=============================== + +Arista Networking drivers + +* Free software: Apache license +* Source: https://opendev.org/x/networking-arista +* Bug: https://bugs.launchpad.net/networking-arista + + + diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/requirements.txt networking-arista-2021.2.0+git2022011308.8b1273a/requirements.txt --- networking-arista-2021.1.0+git2021090912.f26e45b/requirements.txt 2021-07-22 16:26:09.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/requirements.txt 2021-12-08 21:38:50.000000000 +0000 @@ -3,16 +3,16 @@ # process, which may cause wedges in the gate later. pbr>=4.0.0 # Apache-2.0 -alembic>=0.8.10 # MIT -neutron-lib>=2.0.0 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 -oslo.log>=3.36.0 # Apache-2.0 -oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 -oslo.utils>=3.33.0 # Apache-2.0 -requests>=2.14.2 # Apache-2.0 +alembic>=1.6.5 # MIT +neutron-lib>=2.16.0 # Apache-2.0 +oslo.i18n>=3.20.0 # Apache-2.0 +oslo.config>=8.0.0 # Apache-2.0 +oslo.log>=4.5.0 # Apache-2.0 +oslo.service>=1.31.0 # Apache-2.0 +oslo.utils>=4.5.0 # Apache-2.0 +requests>=2.18.0 # Apache-2.0 six>=1.10.0 # MIT -SQLAlchemy>=1.2.0 # MIT +SQLAlchemy>=1.4.23 # MIT # These repos are installed from git in OpenStack CI if the job # configures them as required-projects diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/setup.cfg networking-arista-2021.2.0+git2022011308.8b1273a/setup.cfg --- networking-arista-2021.1.0+git2021090912.f26e45b/setup.cfg 2021-09-09 16:46:18.881729100 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/setup.cfg 2022-01-13 13:37:40.791413300 +0000 @@ -5,7 +5,8 @@ README.rst author = Arista Networks author-email = openstack-dev@arista.com -home-page = https://github.com/openstack/networking-arista/ +home-page = https://opendev.org/x/networking-arista/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,10 +14,10 @@ License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = diff -Nru networking-arista-2021.1.0+git2021090912.f26e45b/tox.ini networking-arista-2021.2.0+git2022011308.8b1273a/tox.ini --- networking-arista-2021.1.0+git2021090912.f26e45b/tox.ini 2021-07-22 16:26:09.000000000 +0000 +++ networking-arista-2021.2.0+git2022011308.8b1273a/tox.ini 2021-12-08 21:38:50.000000000 +0000 @@ -1,9 +1,11 @@ [tox] -envlist = py3-dev,pep8-dev -minversion = 2.0 +envlist = py3-dev,pep8-dev,lower-constraints-dev +minversion = 3.18.0 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning @@ -24,27 +26,23 @@ pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron" [testenv:py3-dev] -basepython = python3 commands = {[testenv:dev]commands} pip freeze stestr run {posargs} [testenv:debug] -basepython = python3 commands = {[testenv:dev]commands} pip freeze oslo_debug_helper {posargs} [testenv:pep8] -basepython = python3 commands = flake8 neutron-db-manage --subproject networking-arista check_migration [testenv:pep8-dev] -basepython = python3 commands = {[testenv:dev]commands} pip freeze @@ -52,11 +50,9 @@ neutron-db-manage --subproject networking-arista check_migration [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = find networking_arista -type f -name "*.pyc" -delete stestr run {posargs} @@ -65,7 +61,6 @@ coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [flake8] @@ -81,9 +76,19 @@ import_exceptions = networking_arista._i18n [testenv:lower-constraints] -basepython = python3 setenv = OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:60} deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt + +[testenv:lower-constraints-dev] +setenv = OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:60} +deps = + -c{toxinidir}/lower-constraints.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt +commands = + {[testenv:dev]commands} + pip freeze + stestr run {posargs}