stop vendoring dependencies

AspenWeb/salon#4
AspenWeb · Mar 8, 2016 · 6d9c723 · 6d9c723
1 parent d2b681a
commit 6d9c723
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 75 deletions.
diff --git a/build.py b/build.py
@@ -7,8 +7,6 @@
 
 # Core Executables
 # ================
-# We satisfy dependencies using local tarballs, to ensure that we can build
-# without a network connection. They're kept in our repo in ./vendor.
 
 ASPEN_DEPS = [
     'python-mimeparse>=0.1.4',
@@ -26,14 +24,9 @@
     'pytest-cov>=1.6',
     ]
 
-INSTALL_DIR = './vendor/install'
-TEST_DIR = './vendor/test'
-BOOTSTRAP_DIR = './vendor/bootstrap'
-
 ENV_ARGS = [
-    './vendor/virtualenv-13.0.3.py',
+    '-m', 'virtualenv',
     '--prompt=[aspen]',
-    '--extra-search-dir=' + BOOTSTRAP_DIR,
     ]
 
 
@@ -85,17 +78,15 @@ def _deps(envdir='env'):
     if b"found" in v:
         return envdir
     for dep in ASPEN_DEPS:
-        run(_virt('pip', envdir), 'install', '--no-index',
-            '--find-links=' + INSTALL_DIR, dep)
+        run(_virt('pip', envdir), 'install', dep)
     run(_virt('python', envdir), 'setup.py', 'develop')
     return envdir
 
 
 def _dev_deps(envdir='env'):
     envdir = _deps(envdir)
     for dep in TEST_DEPS:
-        run(_virt('pip', envdir), 'install', '--no-index',
-            '--find-links=' + TEST_DIR, dep)
+        run(_virt('pip', envdir), 'install', dep)
     return envdir
 
 def dev():
@@ -228,7 +219,7 @@ def clean_build():
 
 def _jython_home():
     if not os.path.exists('jython_home'):
-        local_jython = os.path.join('vendor', 'jython-installer.jar')
+        local_jython = 'jython-installer.jar'
         run('wget', JYTHON_URL, '-qO', local_jython)
         run('java', '-jar', local_jython, '-s', '-d', 'jython_home')
 
@@ -242,13 +233,13 @@ def _jenv():
 def clean_jenv():
     """clean up the jython environment"""
     shell('find', '.', '-name', '*.class', '-delete')
-    shell('rm', '-rf', 'jenv', 'vendor/jython-installer.jar', 'jython_home')
+    shell('rm', '-rf', 'jenv', 'jython_home')
 
 def jython_test():
     """install jython and run tests with coverage (requires java)"""
     _jenv()
     for dep in TEST_DEPS:
-        run(_virt('pip', 'jenv'), 'install', os.path.join('vendor', dep))
+        run(_virt('pip', 'jenv'), 'install', dep)
     run(_virt('jython', 'jenv'), 'setup.py', 'develop')
     run(_virt('jython', 'jenv'), _virt('py.test', 'jenv'),
             '--junitxml=jython-testresults.xml', 'tests',

diff --git a/vendor/bootstrap/pip-7.0.3-py2.py3-none-any.whl b/vendor/bootstrap/pip-7.0.3-py2.py3-none-any.whl
diff --git a/vendor/bootstrap/setuptools-17.1.1-py2.py3-none-any.whl b/vendor/bootstrap/setuptools-17.1.1-py2.py3-none-any.whl
diff --git a/vendor/bootstrap/wheel-0.24.0-py2.py3-none-any.whl b/vendor/bootstrap/wheel-0.24.0-py2.py3-none-any.whl
diff --git a/vendor/install/algorithm-1.0.0.tar.gz b/vendor/install/algorithm-1.0.0.tar.gz
diff --git a/vendor/install/dependency_injection-1.1.0.tar.gz b/vendor/install/dependency_injection-1.1.0.tar.gz
diff --git a/vendor/install/filesystem_tree-1.0.1.tar.gz b/vendor/install/filesystem_tree-1.0.1.tar.gz
diff --git a/vendor/install/first-2.0.1-py2.py3-none-any.whl b/vendor/install/first-2.0.1-py2.py3-none-any.whl
diff --git a/vendor/install/python-mimeparse-0.1.4.tar.gz b/vendor/install/python-mimeparse-0.1.4.tar.gz
diff --git a/vendor/test/argparse-1.1.zip b/vendor/test/argparse-1.1.zip
diff --git a/vendor/test/cov-core-1.7.tar.gz b/vendor/test/cov-core-1.7.tar.gz
diff --git a/vendor/test/coverage-3.7.1.tar.gz b/vendor/test/coverage-3.7.1.tar.gz
diff --git a/vendor/test/py-1.4.20.tar.gz b/vendor/test/py-1.4.20.tar.gz
diff --git a/vendor/test/pytest-2.5.2.tar.gz b/vendor/test/pytest-2.5.2.tar.gz
diff --git a/vendor/test/pytest-cov-1.6.tar.gz b/vendor/test/pytest-cov-1.6.tar.gz
diff --git a/vendor/virtualenv-13.0.3.py b/vendor/virtualenv-13.0.3.py