Merge pull request #633 from vchepkov/virtualenv

smortex · web-flow · commit 339d2a16aa15 · 2022-04-04T15:25:15.000-10:00
diff --git a/examples/gunicorn.pp b/examples/gunicorn.pp
@@ -1,7 +1,6 @@
 class { 'python':
-  version    => 'system',
-  dev        => true,
-  virtualenv => true,
+  version => 'system',
+  dev     => true,
 }
 
 python::gunicorn { 'vhost':
diff --git a/examples/init.pp b/examples/init.pp
@@ -1,5 +1,4 @@
 class { 'python':
-  version    => 'system',
-  dev        => true,
-  virtualenv => true,
+  version => 'system',
+  dev     => true,
 }
diff --git a/examples/pip.pp b/examples/pip.pp
@@ -1,7 +1,6 @@
 class { 'python':
-  version    => 'system',
-  dev        => true,
-  virtualenv => true,
+  version => 'system',
+  dev     => true,
 }
 
 python::pip { 'flask':
diff --git a/examples/requirements.pp b/examples/requirements.pp
@@ -1,7 +1,6 @@
 class { 'python':
-  version    => 'system',
-  dev        => true,
-  virtualenv => true,
+  version => 'system',
+  dev     => true,
 }
 
 python::requirements { '/var/www/project1/requirements.txt':
diff --git a/examples/virtualenv.pp b/examples/virtualenv.pp
diff --git a/lib/facter/virtualenv_version.rb b/lib/facter/virtualenv_version.rb
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -12,7 +12,6 @@
   $ensure                      = 'present'
   $pip                         = 'present'
   $dev                         = 'absent'
-  $virtualenv                  = 'absent'
   $venv                        = 'absent'
   $gunicorn                    = 'absent'
   $manage_gunicorn             = true
diff --git a/metadata.json b/metadata.json
@@ -2,16 +2,14 @@
   "name": "puppet-python",
   "version": "6.2.2-rc0",
   "author": "Vox Pupuli",
-  "summary": "Python Module",
+  "summary": "Puppet module for Python",
   "license": "Apache-2.0",
   "source": "https://github.com/voxpupuli/puppet-python.git",
   "project_page": "https://github.com/voxpupuli/puppet-python",
   "issues_url": "https://github.com/voxpupuli/puppet-python/issues",
-  "description": "Puppet module for Python",
   "tags": [
     "python",
     "pip",
-    "virtualenv",
     "gunicorn"
   ],
   "operatingsystem_support": [
diff --git a/spec/unit/facter/virtualenv_version_spec.rb b/spec/unit/facter/virtualenv_version_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`class { 'python':`
`2`		`- version => 'system',`
`3`		`- dev => true,`
`4`		`- virtualenv => true,`
	`2`	`+ version => 'system',`
	`3`	`+ dev => true,`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`python::gunicorn { 'vhost':`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`class { 'python':`
`2`		`- version => 'system',`
`3`		`- dev => true,`
`4`		`- virtualenv => true,`
	`2`	`+ version => 'system',`
	`3`	`+ dev => true,`
`5`	`4`	`}`