Merge pull request #122 from nexB/ignore_comments_from_netrc

Support comments in netrc file #107

Author: TG1999

CHANGELOG.rst

@@ -2,6 +2,14 @@ Changelog
 =========
 
 
+v0.9.5
+-------------
+
+- Update readme with test instructions.
+- Fail gracefully at parsing setup.py with no deps.
+- Support comments in netrc file #107.
+
+
 v0.9.4
 ------
 

requirements.txt

@@ -21,7 +21,6 @@ resolvelib==0.8.1
 saneyaml==0.5.2
 soupsieve==2.3.2.post1
 text-unidecode==1.3
-tinynetrc==1.3.1
 toml==0.10.2
 urllib3==1.26.11
 zipp==3.8.1

requirements_builder.ABOUT

@@ -66,7 +66,6 @@ install_requires =
     requests >= 2.18.0
     resolvelib >= 0.8.1
     saneyaml >= 0.5.2
-    tinynetrc >= 1.3.1
     toml >= 0.10.0
     mock >= 3.0.5
 

setup.cfg

@@ -66,7 +66,6 @@ install_requires =
     requests >= 2.18.0
     resolvelib >= 0.8.1
     saneyaml >= 0.5.2
-    tinynetrc >= 1.3.1
     toml >= 0.10.0
     mock >= 3.0.5
     packvers >= 21.5

src/python_inspector/api.py

@@ -10,6 +10,7 @@
 #
 
 import os
+from netrc import netrc
 from typing import Dict
 from typing import List
 from typing import NamedTuple
@@ -19,7 +20,6 @@
 from packvers.requirements import Requirement
 from resolvelib import BaseReporter
 from resolvelib import Resolver
-from tinynetrc import Netrc
 
 from _packagedcode.models import DependentPackage
 from _packagedcode.models import PackageData
@@ -128,9 +128,9 @@ def resolve_dependencies(
     if netrc_file:
         if verbose:
             printer(f"Using netrc file {netrc_file}")
-        netrc = Netrc(file=netrc_file)
+        parsed_netrc = netrc(netrc_file)
     else:
-        netrc = None
+        parsed_netrc = None
 
     # TODO: deduplicate me
     direct_dependencies = []
@@ -233,8 +233,8 @@ def resolve_dependencies(
                 repos.append(existing)
             else:
                 credentials = None
-                if netrc:
-                    login, password = utils.get_netrc_auth(index_url, netrc)
+                if parsed_netrc:
+                    login, password = utils.get_netrc_auth(index_url, parsed_netrc)
                     credentials = (
                         dict(login=login, password=password) if login and password else None
                     )

src/python_inspector/utils.py

@@ -11,6 +11,7 @@
 
 import json
 import os
+import tempfile
 from typing import Dict
 from typing import List
 from typing import NamedTuple
@@ -23,8 +24,11 @@ def get_netrc_auth(url, netrc):
     Return login and password if url is in netrc
     else return login and password as None
     """
-    if netrc.get(url):
-        return (netrc[url].get("login"), netrc[url].get("password"))
+    hosts = netrc.hosts
+    if url in hosts:
+        url_auth = hosts.get(url)
+        # netrc returns a tuple of (login, account, password)
+        return (url_auth[0], url_auth[2])
     return (None, None)
 
 

tests/data/azure-devops.req-310-expected.json

@@ -57,7 +57,6 @@ SecretStorage==3.3.2
 six==1.16.0
 soupsieve==2.3.2.post1
 text-unidecode==1.3
-tinynetrc==1.3.1
 toml==0.10.2
 tomli==1.2.3
 tqdm==4.64.0