Conflicts

Author: sodn

connector/Makefile

@@ -32,6 +32,10 @@ PYTHON        = python3
 TESTCMD       = cd tests; runAll
 DISTDIR       = $(BUILDDIR)/dist
 
+DEPENDENCIES = "paramiko >= 1.15.1" "lxml >= 3.3.0" \
+				"ncclient >= 0.6.6" grpcio protobuf
+
+
 .PHONY: clean package distribute distribute_staging distribute_staging_external\
         develop undevelop populate_dist_dir help docs distribute_docs test
 
@@ -85,7 +89,8 @@ develop:
 	@echo ""
 
 	@pip3 uninstall -y yang.connector || true
-	@$(PYTHON) setup.py develop -q
+	@pip install $(DEPENDENCIES)
+	@pip install -e . --no-deps
 
 	@echo "Completed building and installing: $@"
 	@echo ""
@@ -98,7 +103,7 @@ undevelop:
 	@echo "Uninstalling $(PKG_NAME) development distributable: $@"
 	@echo ""
 
-	@$(PYTHON) setup.py develop -q --uninstall
+	@pip uninstall $(PKG_NAME) -y
 
 	@echo "Completed uninstalling: $@"
 	@echo ""

connector/docs/changelog/2025/january.rst

@@ -0,0 +1,51 @@
+January 2025
+==========
+
+ - Yang v25.1 
+------------------------
+
+
+
+.. csv-table:: New Module Versions
+    :header: "Modules", "Version"
+
+    ``yang.connector``, v25.1 
+    ``yang.ncdiff``, v25.1 
+
+
+
+
+Changelogs
+^^^^^^^^^^
+
+yang.connector
+""""""""""""""
+--------------------------------------------------------------------------------
+                                      New                                       
+--------------------------------------------------------------------------------
+
+* yang.connector
+    * Added support for GRPC_MAX_RECEIVE_MESSAGE_LENGTH and GRPC_MAX_SEND_MESSAGE_LENGTH attributes to pick up from testbed settings.
+
+
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* yang.connector
+    * Deprecated python3 setup.py
+    * Fix syntax warning
+
+
+
+yang.ncdiff
+"""""""""""
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* yang.ncdiff
+    * Deprecated python3 setup.py
+    * Fix syntax warning
+
+

connector/docs/changelog/index.rst

@@ -4,6 +4,7 @@ Changelog
 .. toctree::
    :maxdepth: 2
 
+   2025/january
    2024/november
    2024/october
    2024/September

connector/docs/changelog/undistributed/changelog_add_grcp.rst

@@ -7,7 +7,7 @@
 """
 
 # metadata
-__version__ = '24.11'
+__version__ = '25.1'
 __author__ = (
     'Jonathan Yang <[email protected]>',
     'Siming Yuan <[email protected]',

connector/src/yang/connector/__init__.py

@@ -32,6 +32,10 @@ PYTHON        = python3
 TESTCMD       = cd tests; runAll
 DISTDIR       = $(BUILDDIR)/dist
 
+DEPENDENCIES = "pyang >= 1.7.3" "ncclient >= 0.6.3" \
+				"requests >= 2.18.4" "xmljson >= 0.1.9" \
+				"yang.connector >= 3.0.0"
+
 .PHONY: clean package distribute distribute_staging distribute_staging_external\
         develop undevelop populate_dist_dir help docs distribute_docs test
 
@@ -84,7 +88,8 @@ develop:
 	@echo ""
 
 	@pip3 uninstall -y yang.ncdiff || true
-	@$(PYTHON) setup.py develop -q
+	@pip install $(DEPENDENCIES)
+	@pip install -e . --no-deps
 
 	@echo "Completed building and installing: $@"
 	@echo ""
@@ -97,7 +102,7 @@ undevelop:
 	@echo "Uninstalling $(PKG_NAME) development distributable: $@"
 	@echo ""
 
-	@$(PYTHON) setup.py develop -q --uninstall
+	@pip uninstall $(PKG_NAME) -y
 
 	@echo "Completed uninstalling: $@"
 	@echo ""
@@ -157,4 +162,4 @@ changelogs:
 	@echo "yang.ncdiff changelog created..."
 	@echo ""
 	@echo "Done."
-	@echo ""
+	@echo ""

ncdiff/Makefile

@@ -4,7 +4,7 @@
 edit-config message."""
 
 # metadata
-__version__ = '24.11'
+__version__ = '25.1'
 __author__ = 'Jonathan Yang <[email protected]>'
 __contact__ = '[email protected]'
 __copyright__ = 'Cisco Systems, Inc.'

ncdiff/src/yang/ncdiff/__init__.py

@@ -362,7 +362,7 @@ def parse_square_bracket(self, to_node=None):
                             self.cut(start_idx+1, end_idx-2, tag, 2)
                         start_idx = None
                     else:
-                        if re.search('^\[[1-9][0-9]*\]$', substring):
+                        if re.search(r'^\[[1-9][0-9]*\]$', substring):
                             numbers = substring[1:-1]
                             self.cut(start_idx+1, end_idx-1, numbers, 2)
                         else: