Merge branch 'robshakir:master' into add_reserved_word

robshakir · Jul 21, 2023 · a1b13b0 · a1b13b0
2 parents 6e06ae2 + 23a7a0d
commit a1b13b0
Show file tree

Hide file tree

Showing 19 changed files with 165 additions and 108 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python test and package
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
+    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 dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install -r requirements.txt
+    - name: Install building and testing dependencies
+      run: pip install tox black build
+    - name: Run tox
+      # Run tox using the version of Python in `PATH`
+      run: tox -e py
+      continue-on-error: true
+    - name: Build package
+      run: python -m build
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ To avoid unnecessary discussions about coding style we are currently enforcing i
  * To ease the testing of generated bindings, there is the `tests.base.PyangBindTestCase` class which
  you may subclass in order to automate the process. A simple example of its usage can be seen in
  `tests/strings/run.py`.
- * Tests can be run via the `tox` command, or `setup.py test`.
+ * Tests can be run via the `tox` command, or `python3 -m pytest -q tests`.
 
 ### Other Issues
 

diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 [![#PyangBind][img-pyangbind]][pyangbind-docs]
 
-
-[![Travis][img-travis]][travis]
-[![Codecov][img-codecov]][codecov]
 [![PyPI][img-pypi]][pypi-project]
 [![PyPI - License][img-license]][license]
 [![PyPI - Python Version][img-pyversion]][pypi-project]
@@ -388,14 +385,14 @@ limitations under the License.
   * The managability team at Juniper Networks.
 
 
-[img-pyangbind]: http://rob.sh/img/pyblogo_gh.png
+[img-pyangbind]: https://cdn.rob.sh/img/pyblogo_gh.png
 [img-travis]: https://img.shields.io/travis/robshakir/pyangbind.svg
 [img-codecov]: https://img.shields.io/codecov/c/github/robshakir/pyangbind.svg
 [img-pypi]: https://img.shields.io/pypi/v/pyangbind.svg
 [img-license]: https://img.shields.io/pypi/l/pyangbind.svg
 [img-pyversion]: https://img.shields.io/pypi/pyversions/pyangbind.svg
 
-[pyangbind-docs]: http://pynms.io/pyangbind/
+[pyangbind-docs]: https://github.com/robshakir/pyangbind/tree/master/docs
 [travis]: https://travis-ci.org/robshakir/pyangbind
 [codecov]: https://codecov.io/gh/robshakir/pyangbind
 [pypi-project]: https://pypi.org/project/pyangbind/

diff --git a/pyangbind/__init__.py b/pyangbind/__init__.py
@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"
diff --git a/pyangbind/lib/yangtypes.py b/pyangbind/lib/yangtypes.py
@@ -22,6 +22,7 @@
 from __future__ import unicode_literals
 
 import collections
+from collections import abc
 import copy
 import uuid
 from decimal import Decimal
@@ -416,7 +417,7 @@ def TypedListType(*args, **kwargs):
     if not isinstance(allowed_type, list):
         allowed_type = [allowed_type]
 
-    class TypedList(collections.MutableSequence):
+    class TypedList(abc.MutableSequence):
         _pybind_generated_by = "TypedListType"
         _list = list()
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/requirements.DEVELOPER.txt b/requirements.DEVELOPER.txt
@@ -1,5 +1,7 @@
 black==18.5b0; python_version >= '3.6'
+build
 coverage
+pytest
 requests
 tox
 unittest2; python_version < '3.0'

diff --git a/setup.cfg b/setup.cfg
@@ -10,3 +10,44 @@
 ignore=E111,E114,E121,E126,E127,E128,E131
 exclude=.eggs,.tox,env,pyvirtualenv
 max-line-length=119
+
+[metadata]
+name = pyangbind
+version = attr: pyangbind.__version__
+description = PyangBind is a plugin for pyang which converts YANG data models into a Python class hierarchy, such that Python can be used to manipulate data that conforms with a YANG model.
+long_description_content_type = text/x-rst
+long_description = file: README.rst
+license = Apache License, Version 2.0
+author = Rob Shakir
+author_email = [email protected]
+url = https://github.com/robshakir/pyangbind
+keywords = 
+   yang
+   pyang
+classifiers =
+    Development Status :: 4 - Beta
+    Intended Audience :: Telecommunications Industry
+    Intended Audience :: Developers
+    Topic :: Software Development :: Code Generators
+    License :: OSI Approved :: Apache Software License
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+
+[options]
+python_requires = >=3.7
+install_requires = file: requirements.txt
+packages = find:
+include_package_data = True
+zip_safe=False
+test_suite="tests.test_suite",
+
+[options.packages.find]
+include = 
+    pyangbind
+exclude = 
+    tests
diff --git a/setup.py b/setup.py
diff --git a/tests/integration/openconfig-bgp/run.py b/tests/integration/openconfig-bgp/run.py
@@ -30,6 +30,19 @@ class OpenconfigBGPTests(PyangBindTestCase):
                 "types/openconfig-types.yang",
                 "types/openconfig-inet-types.yang",
                 "types/openconfig-yang-types.yang",
+                "rib/openconfig-rib-bgp.yang",
+                "rib/openconfig-rib-bgp-tables.yang",
+                "rib/openconfig-rib-bgp-shared-attributes.yang",
+                "rib/openconfig-rib-bgp-attributes.yang",
+                "rib/openconfig-rib-bgp-table-attributes.yang",
+                "rib/openconfig-rib-bgp-types.yang",
+                "segment-routing/openconfig-segment-routing-types.yang",
+                "network-instance/openconfig-network-instance-types.yang",
+                "network-instance/openconfig-evpn-types.yang",
+                "mpls/openconfig-mpls-types.yang",
+                "bfd/openconfig-bfd.yang",
+                "optical-transport/openconfig-transport-types.yang",
+                "platform/openconfig-platform-types.yang",
             ],
         },
         {

diff --git a/tests/integration/openconfig-interfaces/run.py b/tests/integration/openconfig-interfaces/run.py
@@ -36,6 +36,8 @@ class OpenconfigInterfacesTests(PyangBindTestCase):
                 "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",
             ],
         },
         {
@@ -45,7 +47,6 @@ class OpenconfigInterfacesTests(PyangBindTestCase):
                 "interfaces/openconfig-if-ip.yang",
                 "interfaces/openconfig-if-ethernet.yang",
                 "interfaces/openconfig-if-aggregate.yang",
-                "interfaces/openconfig-if-types.yang",
                 "interfaces/openconfig-interfaces.yang",
             ],
         },

diff --git a/tests/serialise/juniper-json-examples/run.py b/tests/serialise/juniper-json-examples/run.py
@@ -32,6 +32,19 @@ class JuniperJSONTests(PyangBindTestCase):
                 "types/openconfig-inet-types.yang",
                 "types/openconfig-yang-types.yang",
                 "bgp/openconfig-bgp-types.yang",
+                "rib/openconfig-rib-bgp.yang",
+                "rib/openconfig-rib-bgp-tables.yang",
+                "rib/openconfig-rib-bgp-shared-attributes.yang",
+                "rib/openconfig-rib-bgp-attributes.yang",
+                "rib/openconfig-rib-bgp-table-attributes.yang",
+                "rib/openconfig-rib-bgp-types.yang",
+                "segment-routing/openconfig-segment-routing-types.yang",
+                "network-instance/openconfig-network-instance-types.yang",
+                "network-instance/openconfig-evpn-types.yang",
+                "mpls/openconfig-mpls-types.yang",
+                "bfd/openconfig-bfd.yang",
+                "optical-transport/openconfig-transport-types.yang",
+                "platform/openconfig-platform-types.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
@@ -14,7 +14,7 @@
                 }, 
                 "config": {
                     "enabled": true, 
-                    "loopback-mode": false,
+                    "loopback-mode": "NONE",
                     "type": "", 
                     "description": "", 
                     "name": "", 
@@ -25,7 +25,10 @@
                     "type": "", 
                     "description": "", 
                     "enabled": true, 
-                    "loopback-mode": false,
+                    "loopback-mode": "NONE",
+                    "cpu": false,
+                    "management": false,
+                    "logical": false,
                     "admin-status": "", 
                     "mtu": 0, 
                     "ifindex": 0, 
@@ -47,7 +50,9 @@
                         "in-broadcast-pkts": 0, 
                         "carrier-transitions": 0, 
                         "in-unknown-protos": 0, 
-                        "in-octets": 0
+                        "in-octets": 0,
+                        "in-pkts": 0,
+                        "out-pkts": 0
                     }
                 }, 
                 "name": "eth0", 

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
@@ -14,7 +14,7 @@
                 }, 
                 "config": {
                     "enabled": false, 
-                    "loopback-mode": false,
+                    "loopback-mode": "",
                     "type": "", 
                     "description": "", 
                     "name": "", 
@@ -25,7 +25,10 @@
                     "type": "", 
                     "description": "", 
                     "enabled": false, 
-                    "loopback-mode": false,
+                    "cpu": false,
+                    "loopback-mode": "",
+                    "logical":false,
+                    "management": false,
                     "admin-status": "", 
                     "mtu": 0, 
                     "ifindex": 0, 
@@ -47,7 +50,9 @@
                         "in-broadcast-pkts": "0", 
                         "carrier-transitions": "0", 
                         "in-unknown-protos": "0", 
-                        "in-octets": "0"
+                        "in-octets": "0",
+                        "in-pkts": "0",
+                        "out-pkts": "0"
                     }
                 }, 
                 "name": "eth0"