diff options
author | wbond <will@wbond.net> | 2018-04-18 07:03:35 -0400 |
---|---|---|
committer | wbond <will@wbond.net> | 2018-04-18 07:03:35 -0400 |
commit | 7671300eb9dc2ee63e5e6137c8825276396a899c (patch) | |
tree | b94b8a11162311ab6075b1c315f3799160667d6a /dev/deps.py | |
parent | 6bac6b6abd34d7903128e737325a315ae5b2a8a4 (diff) | |
download | asn1crypto-7671300eb9dc2ee63e5e6137c8825276396a899c.tar.gz |
Remove modularcrypto package list from deps.py and coverage.py
Diffstat (limited to 'dev/deps.py')
-rw-r--r-- | dev/deps.py | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/dev/deps.py b/dev/deps.py index 8b06fc7..7f3c933 100644 --- a/dev/deps.py +++ b/dev/deps.py @@ -26,16 +26,6 @@ else: str_cls = str -OTHER_PACKAGES = [ - 'https://github.com/wbond/oscrypto.git', - 'https://github.com/wbond/certbuilder.git', - 'https://github.com/wbond/certvalidator.git', - 'https://github.com/wbond/crlbuilder.git', - 'https://github.com/wbond/csrbuilder.git', - 'https://github.com/wbond/ocspbuilder.git', -] - - def run(): """ Installs required development dependencies. Uses git to checkout other @@ -50,21 +40,23 @@ def run(): shutil.rmtree(deps_dir, ignore_errors=True) os.mkdir(deps_dir) + with open(os.path.join(os.path.dirname(__file__), 'modularcrypto.json'), 'rb') as f: + modularcrypto_packages = json.loads(f.read().decode('utf-8')) + try: print("Staging ci dependencies") _stage_requirements(deps_dir, os.path.join(package_root, 'requires', 'ci')) - if OTHER_PACKAGES: - print("Checking out modularcrypto packages for coverage") - for pkg_url in OTHER_PACKAGES: - pkg_name = os.path.basename(pkg_url).replace('.git', '') - pkg_dir = os.path.join(build_root, pkg_name) - if os.path.exists(pkg_dir): - print("%s is already present" % pkg_name) - continue - print("Cloning %s" % pkg_url) - _execute(['git', 'clone', pkg_url], build_root) - print() + print("Checking out modularcrypto packages for coverage") + for pkg_name in modularcrypto_packages: + pkg_url = 'https://github.com/wbond/%s.git' % pkg_name + pkg_dir = os.path.join(build_root, pkg_name) + if os.path.exists(pkg_dir): + print("%s is already present" % pkg_name) + continue + print("Cloning %s" % pkg_url) + _execute(['git', 'clone', pkg_url], build_root) + print() except (Exception): if os.path.exists(deps_dir): |