From 4f4a60cba3d46ba656a31a93710b1e069c2e04fb Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 3 Aug 2018 13:51:20 -0400 Subject: Reimplement RELIC with latest standard method (#7) --- .gitignore | 1 + .gitmodules | 3 --- MANIFEST.in | 3 +++ relic | 1 - setup.py | 23 +++++++++++++++++++++-- 5 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 .gitmodules delete mode 160000 relic diff --git a/.gitignore b/.gitignore index f520061..aa5af58 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ RELIC-INFO */version.py build/ dist/ +relic/ *.EGG-INFO __pycache__ diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6d623ae..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "relic"] - path = relic - url = https://github.com/jhunkeler/relic.git diff --git a/MANIFEST.in b/MANIFEST.in index db2348e..5fd3a4a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,4 @@ include RELIC-INFO +exclude verhawk/version.py +prune .git +prune relic diff --git a/relic b/relic deleted file mode 160000 index 0e534ef..0000000 --- a/relic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0e534ef44ad30d8e2be5e8fa8ab7392e001cb7b0 diff --git a/setup.py b/setup.py index 9ce4444..96c14b2 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,25 @@ -from setuptools import setup, find_packages +import os +import pkgutil import sys -sys.path.insert(1, 'relic') +from setuptools import setup, find_packages +from subprocess import check_call, CalledProcessError + + +if not pkgutil.find_loader('relic'): + relic_local = os.path.exists('relic') + relic_submodule = (relic_local and + os.path.exists('.gitmodules') and + not os.listdir('relic')) + try: + if relic_submodule: + check_call(['git', 'submodule', 'update', '--init', '--recursive']) + elif not relic_local: + check_call(['git', 'clone', 'https://github.com/spacetelescope/relic.git']) + + sys.path.insert(1, 'relic') + except CalledProcessError as e: + print(e) + exit(1) import relic.release -- cgit