Fixes to module installation.

* Upgrade ExtUtils::MakeMaker, and remove old workaround.
* DIME::Tools won't install without --force (needed by SOAP::Lite in travis).
* Remove SOAP::WSDL from cpanfile, as it won't install and nothing
  needs it apart from Barnet (UK specific).

5 files changed, 53 insertions, 40 deletions

diff --git a/.travis.yml b/.travis.yml
index 64f536a22..709342dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,12 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq jhead libgmp-dev
 # A couple of other modules that normally come from packages, but no system stuff here
-  - cpanm -q Carton Locale::gettext Math::BigInt::GMP SOAP::Lite
+  - cpanm -q Carton Locale::gettext Math::BigInt::GMP
+# This is because of a bug in its test (it's empty), and SOAP::Lite depends on it.
+# Would be good to not have SOAP::Lite as a dependency at all really.
+  - cpanm -q DIME::Tools --force
+# And let's install the same version the carton.lock file currently has.
+  - cpanm -q MKUTTER/SOAP-Lite-0.715.tar.gz
   - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8
 install:
   - carton install --deployment
diff --git a/bin/install_perl_modules b/bin/install_perl_modules
index def44529d..2311ae5f1 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -4,10 +4,6 @@ set -e
 
 DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )"
 
-# Before anything else is installed, install the carton.lock version of
-# ExtUtils::MakeMaker to work around a dependency bug only just fixed, sigh
-$DIR/bin/cpanm -l $DIR/local MSCHWERN/ExtUtils-MakeMaker-6.64.tar.gz
-
 $DIR/bin/cpanm -l $DIR/local Carton
 
 export PATH=$DIR/local/bin:$PATH
diff --git a/carton.lock b/carton.lock
index 42508e0f7..1b9f955e2 100644
--- a/carton.lock
+++ b/carton.lock
@@ -14909,14 +14909,15 @@
          "version" : "0.280205"
       },
       "ExtUtils::MakeMaker" : {
-         "dist" : "ExtUtils-MakeMaker-6.64",
+         "dist" : "ExtUtils-MakeMaker-6.72",
+         "module" : "ExtUtils::MakeMaker",
          "mymeta" : {
             "abstract" : "Create a module Makefile",
             "author" : [
                "Michael G Schwern <schwern@pobox.com>"
             ],
             "dynamic_config" : 0,
-            "generated_by" : "ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.112621, CPAN::Meta::Converter version 2.120921",
+            "generated_by" : "ExtUtils::MakeMaker version 6.72, CPAN::Meta::Converter version 2.120351, CPAN::Meta::Converter version 2.131560",
             "license" : [
                "perl_5"
             ],
@@ -14970,117 +14971,129 @@
                },
                "x_MailingList" : "makemaker@perl.org"
             },
-            "version" : "6.64"
+            "version" : "6.72"
          },
          "name" : "ExtUtils::MakeMaker",
-         "pathname" : "M/MS/MSCHWERN/ExtUtils-MakeMaker-6.64.tar.gz",
+         "pathname" : "B/BI/BINGOS/ExtUtils-MakeMaker-6.72.tar.gz",
          "provides" : {
             "DynaLoader" : {
                "file" : "ExtUtils/Mkbootstrap.pm"
             },
             "ExtUtils::Command::MM" : {
                "file" : "ExtUtils/Command/MM.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::Liblist" : {
                "file" : "ExtUtils/Liblist.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::Liblist::Kid" : {
                "file" : "ExtUtils/Liblist/Kid.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM" : {
                "file" : "ExtUtils/MM.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_AIX" : {
                "file" : "ExtUtils/MM_AIX.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Any" : {
                "file" : "ExtUtils/MM_Any.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_BeOS" : {
                "file" : "ExtUtils/MM_BeOS.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Cygwin" : {
                "file" : "ExtUtils/MM_Cygwin.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_DOS" : {
                "file" : "ExtUtils/MM_DOS.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Darwin" : {
                "file" : "ExtUtils/MM_Darwin.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_MacOS" : {
                "file" : "ExtUtils/MM_MacOS.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_NW5" : {
                "file" : "ExtUtils/MM_NW5.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_OS2" : {
                "file" : "ExtUtils/MM_OS2.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_QNX" : {
                "file" : "ExtUtils/MM_QNX.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_UWIN" : {
                "file" : "ExtUtils/MM_UWIN.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Unix" : {
                "file" : "ExtUtils/MM_Unix.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_VMS" : {
                "file" : "ExtUtils/MM_VMS.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_VOS" : {
                "file" : "ExtUtils/MM_VOS.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Win32" : {
                "file" : "ExtUtils/MM_Win32.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MM_Win95" : {
                "file" : "ExtUtils/MM_Win95.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MY" : {
                "file" : "ExtUtils/MY.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MakeMaker" : {
                "file" : "ExtUtils/MakeMaker.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::MakeMaker::Config" : {
                "file" : "ExtUtils/MakeMaker/Config.pm",
-               "version" : "6.64"
+               "version" : "6.72"
+            },
+            "ExtUtils::Manifest" : {
+               "file" : "ExtUtils/Manifest.pm",
+               "version" : "1.60"
             },
             "ExtUtils::Mkbootstrap" : {
                "file" : "ExtUtils/Mkbootstrap.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::Mksymlists" : {
                "file" : "ExtUtils/Mksymlists.pm",
-               "version" : "6.64"
+               "version" : "6.72"
             },
             "ExtUtils::testlib" : {
                "file" : "ExtUtils/testlib.pm",
-               "version" : "6.64"
+               "version" : "6.72"
+            },
+            "File::Copy::Recursive" : {
+               "file" : "File/Copy/Recursive.pm",
+               "version" : "0.38"
+            },
+            "JSON::PP::Compat5006" : {
+               "file" : "JSON/PP/Compat5006.pm",
+               "version" : "1.09"
             },
             "MM" : {
                "file" : "ExtUtils/MM.pm"
@@ -15089,8 +15102,7 @@
                "file" : "ExtUtils/MakeMaker.pm"
             }
          },
-         "target" : "File::Copy::Recursive",
-         "version" : "6.64"
+         "version" : "6.72"
       },
       "ExtUtils::ParseXS" : {
          "dist" : "ExtUtils-ParseXS-3.18",
diff --git a/cpanfile b/cpanfile
index d0a52d6e9..9494a4b9f 100644
--- a/cpanfile
+++ b/cpanfile
@@ -20,7 +20,6 @@ requires 'Catalyst::View::TT';
 requires 'Cache::Memcached';
 requires 'Carp';
 requires 'CGI';
-requires 'Class::Std::Fast::Storable';
 requires 'Crypt::Eksblowfish::Bcrypt';
 requires 'DateTime';
 requires 'DateTime::Format::HTTP';
@@ -67,7 +66,8 @@ requires 'Readonly';
 requires 'Regexp::Common';
 requires 'Scalar::Util';
 requires 'SOAP::Lite';
-requires 'SOAP::WSDL';
+# Required by Barnet sending, currently fails to install, no-one else needs it.
+# requires 'SOAP::WSDL';
 requires 'Statistics::Distributions';
 requires 'Storable';
 requires 'Template::Plugin::Comma';
diff --git a/perllib/FixMyStreet/SendReport/Barnet.pm b/perllib/FixMyStreet/SendReport/Barnet.pm
index 68bc8d6dc..07adb4c33 100644
--- a/perllib/FixMyStreet/SendReport/Barnet.pm
+++ b/perllib/FixMyStreet/SendReport/Barnet.pm
@@ -4,7 +4,6 @@ use Moose;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
-use BarnetInterfaces::service::ZLBB_SERVICE_ORDER;
 use Encode;
 use Utils;
 use mySociety::Config;
@@ -45,6 +44,7 @@ sub send {
 
     my $geo_code = "$h{easting} $h{northing}"; 
 
+    require BarnetInterfaces::service::ZLBB_SERVICE_ORDER;
     my $interface = BarnetInterfaces::service::ZLBB_SERVICE_ORDER->new();
     
     my ($nearest_postcode, $nearest_street) = ('', '');