Browse Source

Merge "Pin setuptools and wheels packages"

changes/18/656518/1
Zuul 4 months ago
parent
commit
33cd025214
3 changed files with 5 additions and 3 deletions
  1. 1
    1
      attributes/default.rb
  2. 3
    1
      recipes/setup.rb
  3. 1
    1
      spec/setup-redhat_spec.rb

+ 1
- 1
attributes/default.rb View File

@@ -60,7 +60,7 @@ when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
60 60
   default['openstack']['integration-test']['platform'] = {
61 61
     tempest_packages: %w(git curl libxslt-devel
62 62
                          libxml2-devel python-testrepository
63
-                         libffi-devel python-devel python-setuptools
63
+                         libffi-devel python-devel
64 64
                          python-gabbi python-testscenarios
65 65
                          python-ddt),
66 66
     package_overrides: '',

+ 3
- 1
recipes/setup.rb View File

@@ -82,7 +82,9 @@ tempest_path = '/opt/tempest'
82 82
 venv_path = '/opt/tempest-venv'
83 83
 
84 84
 python_virtualenv venv_path do
85
-  system_site_packages true
85
+  pip_version '18.0'
86
+  setuptools_version '40.0.0'
87
+  wheel_version '0.31.1'
86 88
 end
87 89
 
88 90
 python_execute 'install tempest' do

+ 1
- 1
spec/setup-redhat_spec.rb View File

@@ -14,7 +14,7 @@ describe 'openstack-integration-test::setup' do
14 14
     it 'installs tempest dependencies' do
15 15
       %w(git curl libxslt-devel
16 16
          libxml2-devel python-testrepository
17
-         libffi-devel python-devel python-setuptools
17
+         libffi-devel python-devel
18 18
          python-gabbi python-testscenarios
19 19
          python-ddt).each do |pkg|
20 20
         expect(chef_run).to upgrade_package(pkg)

Loading…
Cancel
Save