From f43650ca3429235ea02848432f88483decae5b09 Mon Sep 17 00:00:00 2001 From: c-w-m Date: Fri, 20 Jan 2023 15:15:27 -0700 Subject: [PATCH] str(CA_BUNDLE environment variable) --- pipreqs/pipreqs.py | 6 +++++- requirements-dev.txt | 2 +- tests/.env.test.example | 4 ++-- tests/_data_ignore/requirements.txt | 26 ++++++++++++++------------ tests/settings.py | 5 +++-- tests/test_pipreqs.py | 4 ++++ 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/pipreqs/pipreqs.py b/pipreqs/pipreqs.py index 285a523..1884b85 100644 --- a/pipreqs/pipreqs.py +++ b/pipreqs/pipreqs.py @@ -49,6 +49,7 @@ import re import sys import traceback from contextlib import contextmanager +from pathlib import Path import requests from docopt import docopt @@ -63,6 +64,9 @@ REGEXP = [ ] CA_BUNDLE = os.environ.get("CA_BUNDLE") +if CA_BUNDLE is not None: + CA_BUNDLE = str(Path(CA_BUNDLE)) + @contextmanager def _open(filename=None, mode='r'): @@ -445,7 +449,7 @@ def init(args): candidates = get_pkg_names(candidates) logging.debug("Found imports: " + ", ".join(candidates)) pypi_server = "https://pypi.python.org/pypi/" - verify = None + verify = CA_BUNDLE proxy = None if args["--pypi-server"]: pypi_server = args["--pypi-server"] diff --git a/requirements-dev.txt b/requirements-dev.txt index 2c8fdbd..23cd4a8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ # # activate (.env38) virtual environment # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# upgrade pip +# upgrade pip (21.1.1 -> 22.3.1) # (.env38)> python.exe -m pip install --upgrade pip # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/.env.test.example b/tests/.env.test.example index 5e9f357..1a4a9ed 100644 --- a/tests/.env.test.example +++ b/tests/.env.test.example @@ -4,5 +4,5 @@ CA_BUNDLE=C:\your\path\and\certificates.pem # alternatively you can set this value as an environment variable -# $ set CA_BUNDLE="C:\your\path\and\certificates.pem" # for win OS -# $ export CA_BUNDLE="C:\your\path\and\certificates.pem" # for nix OS +# $ set CA_BUNDLE=C:\your\path\and\certificates.pem # for win OS +# $ export CA_BUNDLE=C:\your\path\and\certificates.pem # for nix OS diff --git a/tests/_data_ignore/requirements.txt b/tests/_data_ignore/requirements.txt index b7f100d..ba40751 100644 --- a/tests/_data_ignore/requirements.txt +++ b/tests/_data_ignore/requirements.txt @@ -1,12 +1,14 @@ -asposestorage==1.0.2 -beautifulsoup4==4.11.1 -boto==2.49.0 -docopt==0.6.2 -Flask==2.2.2 -ipython==8.8.0 -nose==1.3.7 -peewee==3.15.4 -pyflakes==3.0.1 -requests==2.28.2 -SQLAlchemy==1.4.46 -ujson==5.7.0 +asposestorage +beautifulsoup4 +boto +click +docopt +Flask +ipython +nose +pattern +peewee +pyflakes +requests +SQLAlchemy +ujson diff --git a/tests/settings.py b/tests/settings.py index c870b64..68634b4 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -12,13 +12,12 @@ See ./env.test.example for details. import importlib import os +from pathlib import Path CA_BUNDLE = os.environ.get("CA_BUNDLE") if CA_BUNDLE is None and importlib.find_loader("dotenv"): # optional loading of values from .env.test file - from pathlib import Path - import dotenv env_test_path = Path(os.path.dirname(__file__) + "/.env.test") @@ -26,3 +25,5 @@ if CA_BUNDLE is None and importlib.find_loader("dotenv"): if config is not None: CA_BUNDLE = config["CA_BUNDLE"] +elif CA_BUNDLE is not None: + CA_BUNDLE = str(Path(CA_BUNDLE)) diff --git a/tests/test_pipreqs.py b/tests/test_pipreqs.py index 3b2c49c..4e55c7c 100644 --- a/tests/test_pipreqs.py +++ b/tests/test_pipreqs.py @@ -17,13 +17,17 @@ import os import unittest import requests +from pathlib import Path from pipreqs import pipreqs CA_BUNDLE = os.environ.get("CA_BUNDLE") + if CA_BUNDLE is None: from tests.settings import CA_BUNDLE +else: + CA_BUNDLE = str(Path(CA_BUNDLE)) class TestPipreqs(unittest.TestCase):