Skip to content

Commit

Permalink
Clean-up Python-related packages.
Browse files Browse the repository at this point in the history
python{2.6, 3.3} and python{2.6, 3.3}-dev were not required; tox.ini was not using either. Removing these packages then made the deadsnakes ubuntu PPA unnecessary.
I found that python2.6-dev seemingly was needed to build the wheels from the cryptography package in swift, but adding the OpenSSL development package (libssl-dev) fixed this.
  • Loading branch information
pchng committed Oct 15, 2015
1 parent a3f97a0 commit 0d12faf
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions cookbooks/swift/recipes/setup.rb
Expand Up @@ -26,18 +26,6 @@
end
end

# deadsnakes for py2.6
execute "deadsnakes key" do
command "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DB82666C"
action :run
not_if "sudo apt-key list | grep 'Launchpad Old Python Versions'"
end

cookbook_file "/etc/apt/sources.list.d/fkrull-deadsnakes-trusty.list" do
source "etc/apt/sources.list.d/fkrull-deadsnakes-trusty.list"
mode 0644
end

execute "enable backports" do
command "sudo sed -ie 's/# deb http:\\/\\/archive.ubuntu.com\\/ubuntu trusty-backports/deb http:\\/\\/archive.ubuntu.com\\/ubuntu trusty-backports/' /etc/apt/sources.list"
action :run
Expand All @@ -56,9 +44,9 @@
# NOTE: Ubuntu Trusty 14.04 provides Python {2.7.6, 3.4.3} out of the box.
required_packages = [
"libjerasure-dev", # required for the EC biz
"libssl-dev", # libssl-dev is required for building wheels from the cryptography package in swift.
"curl", "gcc", "memcached", "rsync", "sqlite3", "xfsprogs", "git-core",
"build-essential", "python-dev", "libffi-dev", "python-dev", "python3.3",
"python3.3-dev", "python2.6", "python2.6-dev",
"build-essential", "libffi-dev", "python-dev",
"libxml2-dev", "libxml2", "libxslt1-dev",
]
extra_packages = node['extra_packages']
Expand Down

0 comments on commit 0d12faf

Please sign in to comment.