diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 0134c01..dac0d3a 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version: "3.12" - name: Install building dependencies run: pip -q install build - name: Build package diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index 8a18912..cb806dd 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -25,16 +25,15 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - cache: 'pip' # caching pip dependencies - name: Install testing dependencies run: pip install tox - name: Run tox for ${{ matrix.python-version }} # Run tox using the version of Python in `PATH` - run: tox -e py \ No newline at end of file + run: tox -e py diff --git a/requirements.DEVELOPER.txt b/requirements.DEVELOPER.txt index 7e38a8d..f5f70b9 100644 --- a/requirements.DEVELOPER.txt +++ b/requirements.DEVELOPER.txt @@ -3,6 +3,6 @@ build coverage pytest requests -setuptools +setuptools<80.9 tox wheel diff --git a/setup.cfg b/setup.cfg index 9ebb721..d9dbe35 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,12 +30,12 @@ classifiers = Intended Audience :: Developers Topic :: Software Development :: Code Generators License :: OSI Approved :: Apache Software License - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy diff --git a/tests/integration/openconfig-interfaces/run.py b/tests/integration/openconfig-interfaces/run.py index 2875308..570a9dd 100755 --- a/tests/integration/openconfig-interfaces/run.py +++ b/tests/integration/openconfig-interfaces/run.py @@ -9,8 +9,7 @@ class OpenconfigInterfacesTests(PyangBindTestCase): yang_files = [ - os.path.join("openconfig", "%s.yang" % fname) - for fname in ["openconfig-interfaces", "openconfig-if-aggregate", "openconfig-if-ip"] + os.path.join("openconfig", "%s.yang" % fname) for fname in ["openconfig-interfaces", "openconfig-if-aggregate"] ] pyang_flags = [ "-p %s" % os.path.join(os.path.dirname(__file__), "include"), @@ -32,9 +31,6 @@ class OpenconfigInterfacesTests(PyangBindTestCase): "files": [ "openconfig-extensions.yang", "types/openconfig-types.yang", - "vlan/openconfig-vlan.yang", - "vlan/openconfig-vlan-types.yang", - "types/openconfig-inet-types.yang", "types/openconfig-yang-types.yang", "optical-transport/openconfig-transport-types.yang", "platform/openconfig-platform-types.yang", @@ -44,7 +40,6 @@ class OpenconfigInterfacesTests(PyangBindTestCase): "local_path": "openconfig", "remote_prefix": "https://raw.githubusercontent.com/openconfig/public/master/release/models/", "files": [ - "interfaces/openconfig-if-ip.yang", "interfaces/openconfig-if-ethernet.yang", "interfaces/openconfig-if-aggregate.yang", "interfaces/openconfig-interfaces.yang", diff --git a/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.default.json b/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.default.json index 73f9eb0..55f136b 100644 --- a/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.default.json +++ b/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.default.json @@ -64,7 +64,9 @@ "out-unicast-pkts": 0, "out-discards": 0, "in-broadcast-pkts": 0, - "carrier-transitions": 0, + "carrier-transitions": 0, + "interface-transitions": 0, + "link-transitions": 0, "in-unknown-protos": 0, "in-octets": 0, "in-pkts": 0, diff --git a/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.ietf.json b/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.ietf.json index e526583..e949ffc 100644 --- a/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.ietf.json +++ b/tests/serialise/openconfig-serialise/json/interfaces_ph.False-flt.False-m.ietf.json @@ -64,7 +64,9 @@ "out-unicast-pkts": "0", "out-discards": "0", "in-broadcast-pkts": "0", - "carrier-transitions": "0", + "carrier-transitions": "0", + "interface-transitions": "0", + "link-transitions": "0", "in-unknown-protos": "0", "in-octets": "0", "in-pkts": "0", diff --git a/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.default.json b/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.default.json index 1d276d6..e1c2997 100644 --- a/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.default.json +++ b/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.default.json @@ -64,7 +64,9 @@ "out-unicast-pkts": 0, "out-discards": 0, "in-broadcast-pkts": 0, - "carrier-transitions": 0, + "carrier-transitions": 0, + "interface-transitions": 0, + "link-transitions": 0, "in-unknown-protos": 0, "in-octets": 0, "in-pkts":0, diff --git a/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.ietf.json b/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.ietf.json index 2fa559b..ba3fdea 100644 --- a/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.ietf.json +++ b/tests/serialise/openconfig-serialise/json/interfaces_ph.True-flt.False-m.ietf.json @@ -64,7 +64,9 @@ "out-unicast-pkts": "0", "out-discards": "0", "in-broadcast-pkts": "0", - "carrier-transitions": "0", + "carrier-transitions": "0", + "interface-transitions": "0", + "link-transitions": "0", "in-unknown-protos": "0", "in-octets": "0", "in-pkts": "0", diff --git a/tox.ini b/tox.ini index 4b49245..d37c946 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310,311,312},py,black +envlist = py{38,39,310,311,312,313},py,black skip_missing_interpreters = True [testenv]