Allow rh-python36-python as a version

bodgit · bodgit · commit 5f6f76f14886 · 2019-04-09T11:28:49.000+01:00
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -29,7 +29,7 @@
 # @example install python3 from scl repo
 #   class { 'python' :
 #     ensure      => 'present',
-#     version     => 'rh-python36',
+#     version     => 'rh-python36-python',
 #     dev         => 'present',
 #     virtualenv  => 'present',
 #   }
@@ -64,7 +64,7 @@
   }
 
   unless $version =~ Pattern[/\A(python)?[0-9](\.[0-9])+/,
-        /\Apypy\Z/, /\Asystem\Z/, /\Arh-python[0-9]{2}\Z/] {
+        /\Apypy\Z/, /\Asystem\Z/, /\Arh-python[0-9]{2}(?:-python)?\Z/] {
     fail("version needs to be pypy, system or a version string like '3.5' or 'python3.5)")
   }
 
diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -249,9 +249,14 @@
               describe 'with python::provider' do
                 context 'scl' do
                   describe 'with version' do
-                    context '3.6 SCL package' do
+                    context '3.6 SCL meta package' do
                       let(:params) { { version: 'rh-python36' } }
 
+                      it { is_expected.to compile.with_all_deps }
+                    end
+                    context '3.6 SCL python package' do
+                      let(:params) { { version: 'rh-python36-python' } }
+
                       it { is_expected.to compile.with_all_deps }
                     end
                   end
@@ -282,9 +287,14 @@
               describe 'with python::provider' do
                 context 'scl' do
                   describe 'with version' do
-                    context '3.6 SCL package' do
+                    context '3.6 SCL meta package' do
                       let(:params) { { version: 'rh-python36' } }
 
+                      it { is_expected.to compile.with_all_deps }
+                    end
+                    context '3.6 SCL python package' do
+                      let(:params) { { version: 'rh-python36-python' } }
+
                       it { is_expected.to compile.with_all_deps }
                     end
                   end
