Merge pull request #619 from acullenn/requirements_subscribe_fix

If user declares their requirements.txt in Puppet, don't skip pip installation in python::requirements

Author: bastelfreak

REFERENCE.md

@@ -1163,7 +1163,7 @@ Alias of `Enum['debug', 'info', 'warning', 'error', 'critical']`
 
 Match all valid package ensures for python
 
-Alias of `Enum['absent', 'present', 'latest']`
+Alias of `Enum['absent', 'present', 'installed', 'latest']`
 
 ### <a name="Python--Provider"></a>`Python::Provider`
 

manifests/requirements.pp

@@ -89,6 +89,8 @@
       content => '# Puppet will install and/or update pip packages listed here',
     }
 
+    $local_subscribe = File[$requirements]
+  } elsif File[$requirements] and $manage_requirements == true {
     $local_subscribe = File[$requirements]
   } else {
     $local_subscribe = undef

spec/acceptance/declared_requirements_install_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper_acceptance'
+
+describe 'requirements' do
+  it 'checks declared requirements file is installed to venv' do
+    pp = <<-EOS
+    file { '/tmp/requirements.txt':
+      ensure  => 'present',
+      content => 'requests',
+    }
+
+    python::pyvenv { '/tmp/pyvenv':
+      ensure  => 'present',
+    }
+
+    python::requirements { '/tmp/requirements.txt':
+      virtualenv => '/tmp/pyvenv'
+    }
+    EOS
+
+    apply_manifest(pp, catch_failures: true)
+
+    expect(shell('/tmp/pyvenv/bin/pip3 list --no-index | grep requests').stdout).to match(%r{requests +\d+.\d+.\d+})
+  end
+end

types/package/ensure.pp

@@ -1,3 +1,3 @@
 # @summary Match all valid package ensures for python
 #
-type Python::Package::Ensure = Enum['absent', 'present', 'latest']
+type Python::Package::Ensure = Enum['absent', 'present', 'installed', 'latest']