Move SOAP::WSDL requirement into UK cpanfile feature.

Note how we'd like to do the same with SOAP::Lite.

4 files changed, 189 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index ac971bbfa..3b362419f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,6 @@ before_install:
   - 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
-# 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 de_CH.UTF-8
 install:
   - carton install --deployment
diff --git a/bin/install_perl_modules b/bin/install_perl_modules
index d7378c697..883ced235 100755
--- a/bin/install_perl_modules
+++ b/bin/install_perl_modules
@@ -9,7 +9,7 @@ $DIR/bin/cpanm -l $DIR/local-carton Carton
 export PATH=$DIR/local-carton/bin:$PATH
 export PERL5LIB=$DIR/local-carton/lib/perl5
 
-carton install --deployment
+carton install --deployment --without uk
 
 if ! perl -MImage::Magick -e 'exit()' >/dev/null 2>&1
 then
diff --git a/cpanfile b/cpanfile
index 1167436f7..388e9f12b 100644
--- a/cpanfile
+++ b/cpanfile
@@ -67,8 +67,6 @@ requires 'Readonly';
 requires 'Regexp::Common';
 requires 'Scalar::Util';
 requires 'SOAP::Lite';
-# 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';
@@ -79,6 +77,21 @@ requires 'XML::RSS';
 requires 'XML::Simple';
 requires 'YAML';
 
+# SOAP::Lite isn't needed by all cobrands, but it would require
+# code changes to only be imported when installed.
+
+feature 'uk', 'FixMyStreet.com specific requirements' => sub {
+#    # East Hampshire
+#    requires 'SOAP::Lite';
+    # Barnet
+    requires 'SOAP::WSDL';
+};
+
+#feature 'zurich', 'Zueri wie neu specific requirements' => sub {
+#    # Geocoder
+#    requires 'SOAP::Lite';
+#};
+
 # Modules used by the test suite
 requires 'CGI::Simple';
 requires 'HTTP::Headers';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index a8e3121e1..0d57aaea2 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -754,6 +754,26 @@ DISTRIBUTIONS
       Class::Singleton 1.4
     requirements:
       ExtUtils::MakeMaker 0
+  Class-Std-0.011
+    pathname: D/DC/DCONWAY/Class-Std-0.011.tar.gz
+    provides:
+      Class::Std 0.011
+      Class::Std::SCR 0.011
+    requirements:
+      Data::Dumper 0
+      Scalar::Util 0
+      Test::More 0
+  Class-Std-Fast-v0.0.8
+    pathname: A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz
+    provides:
+      Class::Std::Fast 0.000008
+      Class::Std::Fast::Storable 0.000008
+    requirements:
+      Class::Std v0.0.8
+      Data::Dumper 0
+      Scalar::Util 0
+      Test::More 0
+      version 0
   Class-Unload-0.07
     pathname: I/IL/ILMARI/Class-Unload-0.07.tar.gz
     provides:
@@ -4792,6 +4812,152 @@ DISTRIBUTIONS
       XML::Parser 2.23
       constant 0
       perl 5.006
+  SOAP-WSDL-2.00.10
+    pathname: M/MK/MKUTTER/SOAP-WSDL-2.00.10.tar.gz
+    provides:
+      SOAP::WSDL 2.000010
+      SOAP::WSDL::Base 2.000010
+      SOAP::WSDL::Binding 2.000010
+      SOAP::WSDL::Client 2.000010
+      SOAP::WSDL::Client::Base 2.000010
+      SOAP::WSDL::Definitions 2.000010
+      SOAP::WSDL::Deserializer::Hash 2.000010
+      SOAP::WSDL::Deserializer::SOM 2.000010
+      SOAP::WSDL::Deserializer::XSD 2.000010
+      SOAP::WSDL::Expat::Base 2.000010
+      SOAP::WSDL::Expat::Message2Hash 2.000010
+      SOAP::WSDL::Expat::MessageParser 2.000010
+      SOAP::WSDL::Expat::MessageStreamParser 2.000010
+      SOAP::WSDL::Expat::WSDLParser 2.000010
+      SOAP::WSDL::Factory::Deserializer 2.000010
+      SOAP::WSDL::Factory::Generator 2.000010
+      SOAP::WSDL::Factory::Serializer 2.000010
+      SOAP::WSDL::Factory::Transport 2.000010
+      SOAP::WSDL::Generator::Iterator::WSDL11 2.000010
+      SOAP::WSDL::Generator::PrefixResolver 2.000010
+      SOAP::WSDL::Generator::Template 2.000010
+      SOAP::WSDL::Generator::Template::Plugin::XSD 2.000010
+      SOAP::WSDL::Generator::Template::XSD 2.000010
+      SOAP::WSDL::Generator::Visitor 2.000010
+      SOAP::WSDL::Generator::Visitor::Typemap 2.000010
+      SOAP::WSDL::Message 2.000010
+      SOAP::WSDL::OpMessage 2.000010
+      SOAP::WSDL::Operation 2.000010
+      SOAP::WSDL::Part 2.000010
+      SOAP::WSDL::Port 2.000010
+      SOAP::WSDL::PortType 2.000010
+      SOAP::WSDL::SOAP::Address 2.000010
+      SOAP::WSDL::SOAP::Body 2.000010
+      SOAP::WSDL::SOAP::Header 2.000010
+      SOAP::WSDL::SOAP::HeaderFault 2.000010
+      SOAP::WSDL::SOAP::Operation 2.000010
+      SOAP::WSDL::SOAP::Typelib::Fault 2.000010
+      SOAP::WSDL::SOAP::Typelib::Fault11 2.000010
+      SOAP::WSDL::Serializer::XSD 2.000010
+      SOAP::WSDL::Server 2.000010
+      SOAP::WSDL::Server::CGI 2.000010
+      SOAP::WSDL::Server::Mod_Perl2 2.000010
+      SOAP::WSDL::Server::Simple 2.000010
+      SOAP::WSDL::Service 2.000010
+      SOAP::WSDL::Transport::HTTP 2.000010
+      SOAP::WSDL::Transport::Loopback 2.000010
+      SOAP::WSDL::Transport::Test 2.000010
+      SOAP::WSDL::TypeLookup 2.000010
+      SOAP::WSDL::Types 2.000010
+      SOAP::WSDL::XSD::Annotation 2.000010
+      SOAP::WSDL::XSD::Attribute 2.000010
+      SOAP::WSDL::XSD::AttributeGroup 2.000010
+      SOAP::WSDL::XSD::Builtin 2.000010
+      SOAP::WSDL::XSD::ComplexType 2.000010
+      SOAP::WSDL::XSD::Element 2.000010
+      SOAP::WSDL::XSD::Enumeration 2.000010
+      SOAP::WSDL::XSD::FractionDigits 2.000010
+      SOAP::WSDL::XSD::Group 2.000010
+      SOAP::WSDL::XSD::Length 2.000010
+      SOAP::WSDL::XSD::MaxExclusive 2.000010
+      SOAP::WSDL::XSD::MaxInclusive 2.000010
+      SOAP::WSDL::XSD::MaxLength 2.000010
+      SOAP::WSDL::XSD::MinExclusive 2.000010
+      SOAP::WSDL::XSD::MinInclusive 2.000010
+      SOAP::WSDL::XSD::MinLength 2.000010
+      SOAP::WSDL::XSD::Pattern 2.000010
+      SOAP::WSDL::XSD::Schema 2.000010
+      SOAP::WSDL::XSD::Schema::Builtin 2.000010
+      SOAP::WSDL::XSD::SimpleType 2.000010
+      SOAP::WSDL::XSD::TotalDigits 2.000010
+      SOAP::WSDL::XSD::Typelib::Attribute 2.000010
+      SOAP::WSDL::XSD::Typelib::AttributeSet 2.000010
+      SOAP::WSDL::XSD::Typelib::Builtin 2.000010
+      SOAP::WSDL::XSD::Typelib::Builtin::ENTITY undef
+      SOAP::WSDL::XSD::Typelib::Builtin::ID undef
+      SOAP::WSDL::XSD::Typelib::Builtin::IDREF undef
+      SOAP::WSDL::XSD::Typelib::Builtin::IDREFS undef
+      SOAP::WSDL::XSD::Typelib::Builtin::NCName undef
+      SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN undef
+      SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS undef
+      SOAP::WSDL::XSD::Typelib::Builtin::NOTATION undef
+      SOAP::WSDL::XSD::Typelib::Builtin::Name undef
+      SOAP::WSDL::XSD::Typelib::Builtin::QName undef
+      SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType undef
+      SOAP::WSDL::XSD::Typelib::Builtin::anyType 2.000010
+      SOAP::WSDL::XSD::Typelib::Builtin::anyURI undef
+      SOAP::WSDL::XSD::Typelib::Builtin::base64Binary undef
+      SOAP::WSDL::XSD::Typelib::Builtin::boolean 2.000010
+      SOAP::WSDL::XSD::Typelib::Builtin::byte undef
+      SOAP::WSDL::XSD::Typelib::Builtin::date undef
+      SOAP::WSDL::XSD::Typelib::Builtin::dateTime undef
+      SOAP::WSDL::XSD::Typelib::Builtin::decimal undef
+      SOAP::WSDL::XSD::Typelib::Builtin::double undef
+      SOAP::WSDL::XSD::Typelib::Builtin::duration undef
+      SOAP::WSDL::XSD::Typelib::Builtin::float undef
+      SOAP::WSDL::XSD::Typelib::Builtin::gDay undef
+      SOAP::WSDL::XSD::Typelib::Builtin::gMonth undef
+      SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay undef
+      SOAP::WSDL::XSD::Typelib::Builtin::gYear undef
+      SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth undef
+      SOAP::WSDL::XSD::Typelib::Builtin::hexBinary undef
+      SOAP::WSDL::XSD::Typelib::Builtin::int undef
+      SOAP::WSDL::XSD::Typelib::Builtin::integer undef
+      SOAP::WSDL::XSD::Typelib::Builtin::language undef
+      SOAP::WSDL::XSD::Typelib::Builtin::list undef
+      SOAP::WSDL::XSD::Typelib::Builtin::long undef
+      SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger undef
+      SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger undef
+      SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger undef
+      SOAP::WSDL::XSD::Typelib::Builtin::normalizedString undef
+      SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger undef
+      SOAP::WSDL::XSD::Typelib::Builtin::short undef
+      SOAP::WSDL::XSD::Typelib::Builtin::string undef
+      SOAP::WSDL::XSD::Typelib::Builtin::time 2.000010
+      SOAP::WSDL::XSD::Typelib::Builtin::token undef
+      SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte undef
+      SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt undef
+      SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong undef
+      SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort undef
+      SOAP::WSDL::XSD::Typelib::ComplexType 2.000010
+      SOAP::WSDL::XSD::Typelib::Element 2.000010
+      SOAP::WSDL::XSD::Typelib::SimpleType 2.000010
+      SOAP::WSDL::XSD::WhiteSpace 2.000010
+    requirements:
+      Class::Std::Fast v0.0.5
+      Cwd 0
+      Data::Dumper 0
+      Date::Format 0
+      Date::Parse 0
+      File::Basename 0
+      File::Path 0
+      File::Spec 0
+      Getopt::Long 0
+      LWP::UserAgent 0
+      List::Util 0
+      Module::Build 0
+      Storable 0
+      Template 2.18
+      Term::ReadKey 0
+      Test::More 0
+      URI 0
+      XML::Parser::Expat 0
+      perl v5.8.0
   SQL-Abstract-1.73
     pathname: F/FR/FREW/SQL-Abstract-1.73.tar.gz
     provides:
@@ -5091,6 +5257,13 @@ DISTRIBUTIONS
       File::Spec 0.8
       File::Temp 0.12
       Scalar::Util 0
+  TermReadKey-2.31
+    pathname: J/JS/JSTOWE/TermReadKey-2.31.tar.gz
+    provides:
+      Configure undef
+      Term::ReadKey 2.31
+    requirements:
+      ExtUtils::MakeMaker 0
   Test-Base-0.60
     pathname: I/IN/INGY/Test-Base-0.60.tar.gz
     provides: