Skip to content

Commit

Permalink
Hotfix (#1190)
Browse files Browse the repository at this point in the history
This PR fix two bugs in current version :
- #1189 
- #1182
  • Loading branch information
jychp authored Jun 23, 2023
1 parent 80d764a commit e8c5581
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions cartography/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,9 @@ def main(self, argv: str) -> int:
)
config.duo_api_key = os.environ.get(config.duo_api_key_env_var)
config.duo_api_secret = os.environ.get(config.duo_api_secret_env_var)
else:
config.duo_api_key = None
config.duo_api_secret = None

# Run cartography
try:
Expand Down
5 changes: 2 additions & 3 deletions cartography/intel/github/repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,14 +312,13 @@ def _transform_python_requirements(
continue
try:
req = Requirement(stripped_line)
parsed_list.append(req)
except InvalidRequirement:
# INFO and not WARN/ERROR as we intentionally don't support all ways to specify Python requirements
logger.info(
f"Failed to parse line \"{line}\" in repo {repo_url}'s requirements.txt; skipping line.",
exc_info=True,
)
continue
parsed_list.append(req)

for req in parsed_list:
pinned_version = None
Expand Down Expand Up @@ -563,5 +562,5 @@ def sync(
logger.info("Syncing GitHub repos")
repos_json = get(github_api_key, github_url, organization)
repo_data = transform(repos_json)
load(neo4j_session, repo_data, common_job_parameters['UPDATE_TAG'])
load(neo4j_session, common_job_parameters, repo_data)
run_cleanup_job('github_repos_cleanup.json', neo4j_session, common_job_parameters)

0 comments on commit e8c5581

Please sign in to comment.