Merge pull request #147 from netdevops/issue-145-v2

Addresses Issue 145 for V2
netdevops · Jan 14, 2025 · 60afcf8 · 60afcf8
2 parents ca7cbcd + 19ac3c3
commit 60afcf8
Show file tree

Hide file tree

Showing 5 changed files with 433 additions and 371 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -2,17 +2,17 @@ name: hier_config build and test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ 2.3-lts ]
   pull_request:
-    branches: [ master ]
+    branches: [ 2.3-lts ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, 3.11]
+        python-version: [3.9, 3.11]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/deploy-pypi.yml b/.github/workflows/deploy-pypi.yml
@@ -6,20 +6,20 @@ on:
 
 jobs:
   deploy:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.8'
+        python-version: '3.9'
     - name: Install poetry
-      uses: snok/[email protected]
-    - name: Build and publish to Pypi
+      uses: snok/install-poetry@v1
+      with:
+        version: 1.5.1
+    - name: Build and publish to PyPI
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        TWINE_API_KEY: ${{ secrets.TWINE_API_KEY }}
       run: |
-        poetry publish --build -u ${TWINE_USERNAME} -p ${TWINE_PASSWORD}
+        poetry config pypi-token.pypi $TWINE_API_KEY
+        poetry publish --build
diff --git a/hier_config/options.py b/hier_config/options.py
@@ -142,7 +142,6 @@
         },
         {"lineage": [{"startswith": ["hostname"]}]},
         {"lineage": [{"contains": ["source-interface", "trap-source"]}]},
-        {"lineage": [{"startswith": ["snmp-server community"]}]},
         {"lineage": [{"startswith": ["mac address-table aging-time"]}]},
         {"lineage": [{"startswith": ["aaa authentication"]}]},
         {"lineage": [{"startswith": ["aaa authorization"]}]},
@@ -301,7 +300,6 @@
         {"lineage": [{"startswith": "hostname"}]},
         {"lineage": [{"startswith": "logging source-interface"}]},
         {"lineage": [{"startswith": "interface"}, {"startswith": "ipv4 address"}]},
-        {"lineage": [{"startswith": "snmp-server community"}]},
         {"lineage": [{"startswith": "snmp-server location"}]},
         {"lineage": [{"equals": "line console"}, {"startswith": "exec-timeout"}]},
         {
@@ -463,7 +461,6 @@
                 {
                     "startswith": [
                         "mac address-table aging-time",
-                        "snmp-server community",
                         "snmp-server location",
                     ]
                 }