merge fix for #12

Conflicts: CHANGELOG spec/classes/install_spec.rb
rauchrob · Jul 22, 2015 · 0b19448 · 0b19448
2 parents 9ae82a7 + 65fb1ab
commit 0b19448
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,11 @@
 Upcoming Release 0.3.0
 - add $manage_git parameter
-- Support for Fedora 19 and 20
 - Support for Debian 8
-- Improve acceptance tests
-- Fix #9
+
+2015-07-22 Release 0.2.8
+- Support for Fedora 19 and 20
+- Improve spec and acceptance tests
+- Fix #9 and #12
 
 2015-07-07 Release 0.2.7
 - Support for EL6

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -63,14 +63,16 @@
       dev        => true,
       pip        => $::kallithea::params::install_pip,
       virtualenv => true,
-      before     => Python::Virtualenv[$venv],
     }
   }
 
   python::virtualenv { $venv:
     systempkgs => false,
     owner      => $app_user,
     group      => $app_user,
+    # Workaround for https://github.com/stankevich/puppet-python/issues/215
+    # Can be removed when support for stankevich/python <= 1.9.5 is dropped
+    before     => Anchor['python::end'],
     require    => [
       User[$app_user],
     ],

diff --git a/spec/classes/install_spec.rb b/spec/classes/install_spec.rb
@@ -41,10 +41,4 @@
     it { should contain_class('git').that_comes_before('Class[kallithea::install]') }
   end
 
-  context "with manage_python = true" do
-    let(:params) { default_params.merge({ :manage_python => true }) }
-
-    it { should contain_class('python').that_comes_before('Python::Virtualenv[/app/root/venv]') }
-  end
-
 end