Merge pull request #270 from model-driven-devops/semantic_fix

fix: reenable pypi release push with enhanced pyproject.toml
model-driven-devops · Feb 2, 2024 · 954bd52 · 954bd52
2 parents f9189b3 + ffcdd8d
commit 954bd52
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 47 deletions.
diff --git a/.releaserc b/.releaserc
@@ -13,6 +13,9 @@
     ["@semantic-release/git", {
       "assets": "mdd/package-meta-data.xml",
       "message": "chore(release): Update NSO package version to ${nextRelease.version} [skip ci]"
+    }],
+    ["semantic-release-pypi", {
+      "repoUrl": "https://upload.pypi.org/legacy/"
     }]
   ]
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,34 @@
 [build-system]
-requires = ["setuptools","packaging"]
+requires = ["setuptools", "packaging"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "nso-oc"
 description = "Cisco NSO OpenConfig Tools"
-dynamic = ["version"]
+readme = "./package_nso_to_oc/README.md"
+license = {file = "LICENSE"}
+dependencies = ["urllib3"]
+classifiers = [
+    "License :: Other/Proprietary License",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3",
+]
+
+[project.scripts]
+"nso-oc" = "package_nso_to_oc.main:main"
+
+[project.urls]
+"homepage" = "https://github.com/model-driven-devops/nso-oc-services"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["package_nso_to_oc", "package_nso_to_oc.*"]
+
+[tool.setuptools.package-dir]
+package_nso_to_oc = "package_nso_to_oc"
+
+# TODO: setuptools claims the [tool.distutils] table is experimental and likely to change
+# Place the <package>.egg-info directory at the root of the bundle to match prior behavior
+[tool.distutils.egg_info]
+egg_base = "."
+
diff --git a/setup.py b/setup.py
diff --git a/test/inventory_nx/nso.yml b/test/inventory_nx/nso.yml
@@ -1,12 +1,12 @@
 all:
   vars:
     mdd_model_repos:
-    nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
+    nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
     nso_ned_files:
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
     nso_default_ned: cisco-ios-cli-6.93
     nso_ned_dict:
       ios: "cisco-ios-cli-6.93"

diff --git a/test/inventory_xe/nso.yml b/test/inventory_xe/nso.yml
@@ -1,12 +1,12 @@
 all:
   vars:
     mdd_model_repos:
-    nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
+    nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
     nso_ned_files:
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
     nso_default_ned: cisco-ios-cli-6.93
     nso_ned_dict:
       ios: "cisco-ios-cli-6.93"

diff --git a/test/inventory_xr/nso.yml b/test/inventory_xr/nso.yml
@@ -1,12 +1,12 @@
 all:
   vars:
     mdd_model_repos:
-    nso_installer_file: https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
+    nso_installer_file: https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/nso-6.1.linux.x86_64.signed.bin
     nso_ned_files:
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
-      - https://colabucket.s3.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1.2-cisco-ios-6.93.3.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-nx-5.23.13.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.1-cisco-iosxr-7.49.2.signed.bin
+      - https://colabucket.s3.dualstack.us-east-1.amazonaws.com/sw/cisco/nso/6.1/ncs-6.0.3-cisco-asa-6.18.3.signed.bin
     nso_default_ned: cisco-ios-cli-6.93
     nso_ned_dict:
       ios: "cisco-ios-cli-6.93"