Skip to content

Remove Repo init from __init__ #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 8, 2023
Merged

Remove Repo init from __init__ #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403b75a
Remove Repo init from __init__
p-rintz Mar 7, 2023
5d5d916
Implemented fix that will allow for running script from any directory
danner26 Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gitcmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def __init__(self, args, repo_path):
self.url = args.url
self.repo_path = repo_path
self.branch = args.branch
self.repo = Repo()
# self.repo = Repo()
self.cwd = os.getcwd()

if os.path.isdir(self.repo_path):
Expand Down Expand Up @@ -43,4 +43,3 @@ def clone_repo(self):
settings.handle.exception("GitCommandError", self.url, git_error)
except Exception as git_error:
settings.handle.exception("Exception", 'Git Repository Error', git_error)

4 changes: 2 additions & 2 deletions nb-dt-import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def getFiles(vendors=None):

files = []
discoveredVendors = []
base_path = './repo/device-types/'
base_path = f'{settings.REPO_PATH}/device-types/'
if vendors:
for r, d, f in os.walk(base_path):
for folder in d:
Expand Down Expand Up @@ -88,7 +88,7 @@ def get_files_modules(vendors=None):

files = []
discoveredVendors = []
base_path = './repo/module-types/'
base_path = f'{settings.REPO_PATH}/module-types/'
if vendors:
for r, d, f in os.walk(base_path):
for folder in d:
Expand Down
2 changes: 1 addition & 1 deletion settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
NETBOX_URL = os.getenv("NETBOX_URL")
NETBOX_TOKEN = os.getenv("NETBOX_TOKEN")
IGNORE_SSL_ERRORS = (os.getenv("IGNORE_SSL_ERRORS", default="False") == "True")
REPO_PATH = "./repo"
REPO_PATH = f"{os.path.dirname(os.path.realpath(__file__))}/repo"

# optionally load vendors through a comma separated list as env var
VENDORS = list(filter(None, os.getenv("VENDORS", "").split(",")))
Expand Down