8002: Stop backporting PyVCF.

Arvados proper doesn't use it.  We only backported it as a convenience
previously.

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index cb5f833f8d8d2c2f39a3bcf8ed99b7798e3e17cb..5690a29bb292c86abab26a2ad0c36f9ba15ac88f 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -89,7 +89,7 @@ case "$TARGET" in
         PYTHON2_PKG_PREFIX=python
         PYTHON3_PACKAGE=python$PYTHON3_VERSION
         PYTHON3_PKG_PREFIX=python3
-        PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+        PYTHON_BACKPORTS=(python-gflags google-api-python-client==1.4.2 \
             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
             rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
@@ -103,7 +103,7 @@ case "$TARGET" in
         PYTHON2_PKG_PREFIX=python
         PYTHON3_PACKAGE=python$PYTHON3_VERSION
         PYTHON3_PKG_PREFIX=python3
-        PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+        PYTHON_BACKPORTS=(python-gflags google-api-python-client==1.4.2 \
             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
             rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
@@ -117,7 +117,7 @@ case "$TARGET" in
         PYTHON2_PKG_PREFIX=python
         PYTHON3_PACKAGE=python$PYTHON3_VERSION
         PYTHON3_PKG_PREFIX=python3
-        PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+        PYTHON_BACKPORTS=(python-gflags google-api-python-client==1.4.2 \
             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
             rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
@@ -131,7 +131,7 @@ case "$TARGET" in
         PYTHON2_PKG_PREFIX=python
         PYTHON3_PACKAGE=python$PYTHON3_VERSION
         PYTHON3_PKG_PREFIX=python3
-        PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
+        PYTHON_BACKPORTS=(pyasn1==0.1.7 pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
             google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
             rsa 'pycurl<7.21.5' backports.ssl_match_hostname pyyaml 'rdflib>=4.2.0' \
             'rdflib-jsonld>=0.3.0' shellescape mistune)
@@ -143,7 +143,7 @@ case "$TARGET" in
         PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE
         PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
         PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
-        PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client==1.4.2 \
+        PYTHON_BACKPORTS=(python-gflags google-api-python-client==1.4.2 \
             oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
             rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
             ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \

diff --git a/docker/compute/Dockerfile b/docker/compute/Dockerfile
index 948f6c73d4e486973e733c3ea004de3726b4e063..60b5fa4bb6279cf80605d3cfc63343f9ce1e8139 100644 (file)
--- a/docker/compute/Dockerfile
+++ b/docker/compute/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER Ward Vandewege <ward@curoverse.com>
 RUN apt-get update -q
 ## 20150915 nico -- fuse.postint has sporatic failures, spliting this up to see if it helps
 RUN apt-get install -qy fuse
-RUN apt-get install -qy supervisor python-pip python-pyvcf python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse crunchstat python-arvados-fuse cron dnsmasq
+RUN apt-get install -qy supervisor python-pip python-gflags python-google-api-python-client python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse crunchstat python-arvados-fuse cron dnsmasq
 
 ADD fuse.conf /etc/fuse.conf
 RUN chmod 644 /etc/fuse.conf

diff --git a/docker/shell/Dockerfile b/docker/shell/Dockerfile
index 8f0ed41afaefc9ae4aa86daf86097fbcdcad1712..3e6e3e4c6b34e25bdb304f3fbfc3a1780ed69ef3 100644 (file)
--- a/docker/shell/Dockerfile
+++ b/docker/shell/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Ward Vandewege <ward@curoverse.com>
 
 RUN apt-get update -q
 RUN apt-get install -qy \
-    python-pip python-pyvcf python-gflags python-google-api-python-client \
+    python-pip python-gflags python-google-api-python-client \
     python-virtualenv libattr1-dev libfuse-dev python-dev python-llfuse fuse \
     crunchstat python-arvados-fuse cron vim supervisor openssh-server