diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-02-20 20:09:03 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-02-20 18:09:03 -0800 |
| commit | d2a52d6dd6232abc0a22ef3413b970b790837dd5 (patch) | |
| tree | a3a6cebd8ba0f5babf8f4844b35f34ff79493ad6 /var/spack/repos/builtin/packages/py-pyparsing | |
| parent | fbbcf456e9f8e14509ac0adc62ba0c8711018b5e (diff) | |
| download | spack-d2a52d6dd6232abc0a22ef3413b970b790837dd5.tar.gz spack-d2a52d6dd6232abc0a22ef3413b970b790837dd5.tar.bz2 spack-d2a52d6dd6232abc0a22ef3413b970b790837dd5.tar.xz spack-d2a52d6dd6232abc0a22ef3413b970b790837dd5.zip | |
Fix setuptools bootstrapping now that dependencies are no longer vendored (#3198)
* Fix setuptools bootstrapping now that dependencies are no longer vendored
* Reorder patch and comments
* Use exact same patch as https://github.com/ActiveState/appdirs/pull/84
* Use exact same patch as https://sourceforge.net/p/pyparsing/patches/10/
Diffstat (limited to 'var/spack/repos/builtin/packages/py-pyparsing')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyparsing/package.py | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pyparsing/setuptools-import.patch | 20 |
2 files changed, 32 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyparsing/package.py b/var/spack/repos/builtin/packages/py-pyparsing/package.py index cb158a76d6..936295a132 100644 --- a/var/spack/repos/builtin/packages/py-pyparsing/package.py +++ b/var/spack/repos/builtin/packages/py-pyparsing/package.py @@ -28,6 +28,16 @@ from spack import * class PyPyparsing(PythonPackage): """A Python Parsing Module.""" homepage = "https://pypi.python.org/pypi/pyparsing" - url = "https://pypi.python.org/packages/source/p/pyparsing/pyparsing-2.0.3.tar.gz" + url = "https://pypi.io/packages/source/p/pyparsing/pyparsing-2.0.3.tar.gz" - version('2.0.3', '0fe479be09fc2cf005f753d3acc35939') + version('2.1.10', '065908b92904e0d3634eb156f44cc80e') + version('2.0.3', '0fe479be09fc2cf005f753d3acc35939') + + patch('setuptools-import.patch', when='@:2.1.10') + + # Newer versions of setuptools require pyparsing. Although setuptools is an + # optional dependency of pyparsing, if it is not found, setup.py will + # fallback on distutils.core instead. Don't add a setuptools dependency + # or we won't be able to bootstrap setuptools. + + # depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pyparsing/setuptools-import.patch b/var/spack/repos/builtin/packages/py-pyparsing/setuptools-import.patch new file mode 100644 index 0000000000..a4ba828c23 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyparsing/setuptools-import.patch @@ -0,0 +1,20 @@ +diff --git a/setup.py b/setup.py +index 82061c6..ff342af 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,13 @@ + #!/usr/bin/env python
+
+ """Setup script for the pyparsing module distribution."""
+-from setuptools import setup
++
++# Setuptools depends on pyparsing (via packaging) as of version 34, so allow
++# installing without it to avoid bootstrap problems.
++try:
++ from setuptools import setup
++except ImportError:
++ from distutils.core import setup
+
+ import sys
+ import os
+
|