Skip to content

Commit

Permalink
Merge pull request #17 from nareynolds/master
Browse files Browse the repository at this point in the history
Adding option to install Anaconda3
  • Loading branch information
thmttch committed May 27, 2015
2 parents 2eae8a2 + ad5ccb9 commit ad2bebd
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ bin/*

# anaconda installs should not be checked in
Anaconda-*-Linux-*.sh

# OSX
.DS_Store
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ The following are user-configurable attributes. Check
- 2.0.1
- 2.1.0
- 2.2.0
- 3-2.2.0 (uses Python 3.4)
- miniconda-python2
- miniconda-python3
- `flavor`: either `x86` (32-bit) or `x86_64` (64-bit)
Expand Down
8 changes: 5 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Vagrant.configure('2') do |config|
config.vm.hostname = 'anaconda-berkshelf'
# 14.04 LTS
config.vm.box = 'ubuntu/trusty32'
config.vm.box = 'ubuntu/trusty64'
config.vm.network :private_network, ip: '33.33.33.123'

# ssh
Expand Down Expand Up @@ -39,6 +39,8 @@ Vagrant.configure('2') do |config|
'Anaconda-2.1.0-Linux-x86_64.sh',
'Anaconda-2.2.0-Linux-x86.sh',
'Anaconda-2.2.0-Linux-x86_64.sh',
'Anaconda3-2.2.0-Linux-x86.sh',
'Anaconda3-2.2.0-Linux-x86_64.sh',
].each do |f|
if File.exists?(f)
config.vm.provision :shell do |shell|
Expand All @@ -51,8 +53,8 @@ Vagrant.configure('2') do |config|
config.vm.provision :chef_solo do |chef|
chef.json = {
:anaconda => {
#:version => '2.2.0',
#:flavor => 'x86',
:version => '3-2.2.0',
:flavor => 'x86_64',
:accept_license => 'yes',
}
}
Expand Down
5 changes: 5 additions & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
'x86' => '6437d5b08a19c3501f2f5dc3ae1ae16f91adf6bed0f067ef0806a9911b1bef15',
'x86_64' => 'ca2582cb2188073b0f348ad42207211a2b85c10b244265b5b27bab04481b88a2',
},
'3-2.2.0' => {
'uri_prefix' => 'https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com',
'x86' => '223655cd256aa912dfc83ab24570e47bb3808bc3b0c6bd21b5db0fcf2750883e',
'x86_64' => '4aac68743e7706adb93f042f970373a6e7e087dbf4b02ac467c94ca4ce33d2d1',
},
'miniconda-python2' => {
'uri_prefix' => 'https://repo.continuum.io/miniconda',
# miniconda is always latest, so it doesn't have a stable checksum
Expand Down
2 changes: 2 additions & 0 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"Miniconda-latest-Linux-#{flavor}.sh"
elsif 'miniconda-python3' == version
"Miniconda3-latest-Linux-#{flavor}.sh"
elsif '3-2.2.0' == version
"Anaconda3-2.2.0-Linux-#{flavor}.sh"
else
"Anaconda-#{version}-Linux-#{flavor}.sh"
end
Expand Down

0 comments on commit ad2bebd

Please sign in to comment.