Remvoe dependence on v2.7 argparse by including argparse.

This commit is contained in:
Todd Gamblin 2014-08-10 11:48:07 -07:00
parent 17895bd6fd
commit 7714d08e2e
21 changed files with 2401 additions and 20 deletions

View file

@ -28,7 +28,6 @@ if not sys.version_info[:2] >= (2,7):
sys.exit("Spack requires Python 2.7. Version was %s." % sys.version_info) sys.exit("Spack requires Python 2.7. Version was %s." % sys.version_info)
import os import os
import argparse
# Find spack's location and its prefix. # Find spack's location and its prefix.
SPACK_FILE = os.path.realpath(os.path.expanduser(__file__)) SPACK_FILE = os.path.realpath(os.path.expanduser(__file__))
@ -51,6 +50,7 @@ del SPACK_FILE, SPACK_PREFIX, SPACK_LIB_PATH
import llnl.util.tty as tty import llnl.util.tty as tty
import spack import spack
from spack.error import SpackError from spack.error import SpackError
from external import argparse
# Command parsing # Command parsing
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(

2382
lib/spack/external/argparse.py vendored Normal file

File diff suppressed because it is too large Load diff

View file

@ -24,7 +24,7 @@
############################################################################## ##############################################################################
import os import os
import re import re
import argparse from external import argparse
import hashlib import hashlib
from pprint import pprint from pprint import pprint
from subprocess import CalledProcessError from subprocess import CalledProcessError

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify

View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import sys import sys
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -25,7 +25,7 @@
import sys import sys
import os import os
import shutil import shutil
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.lang import partition_list from llnl.util.lang import partition_list

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import spack import spack
import spack.cmd import spack.cmd

View file

@ -24,7 +24,7 @@
############################################################################## ##############################################################################
import sys import sys
import collections import collections
import argparse from external import argparse
from StringIO import StringIO from StringIO import StringIO
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import sys import sys
import argparse from external import argparse
import spack import spack
import spack.cmd import spack.cmd

View file

@ -24,10 +24,10 @@
############################################################################## ##############################################################################
import os import os
import shutil import shutil
import argparse
from datetime import datetime from datetime import datetime
from contextlib import closing from contextlib import closing
from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify
from llnl.util.filesystem import mkdirp, join_path from llnl.util.filesystem import mkdirp, join_path

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import spack.cmd import spack.cmd
import spack import spack

View file

@ -23,7 +23,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import os import os
import argparse from external import argparse
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify

View file

@ -25,7 +25,7 @@
import os import os
import sys import sys
import code import code
import argparse from external import argparse
import platform import platform
from contextlib import closing from contextlib import closing

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import spack.cmd import spack.cmd
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import spack import spack
import spack.cmd import spack.cmd

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import spack.cmd.use import spack.cmd.use
description ="Remove package from environment using dotkit." description ="Remove package from environment using dotkit."

View file

@ -22,7 +22,7 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import argparse from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
import spack import spack

View file

@ -72,7 +72,6 @@ class Mpileaks(Package):
import re import re
import inspect import inspect
import importlib
from llnl.util.lang import * from llnl.util.lang import *