Update from upstream

.gitignore

@@ -0,0 +1,14 @@
+.vagrant
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+bin/*
+.bundle/*
+.kitchen/
+.kitchen.local.yml

.kitchen.yml

@@ -0,0 +1,62 @@
+---
+driver_plugin: vagrant
+driver_config:
+  require_chef_omnibus: true
+
+platforms:
+- name: ubuntu-12.10
+  driver_config:
+    box: opscode-ubuntu-12.10
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.10_provisionerless.box
+  run_list: ["recipe[apt]"]
+
+- name: ubuntu-12.04
+  driver_config:
+    box: opscode-ubuntu-12.04
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+  run_list: ["recipe[apt]"]
+
+- name: ubuntu-10.04
+  driver_config:
+    box: opscode-ubuntu-10.04
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
+  run_list: ["recipe[apt]"]
+
+- name: centos-5.9
+  driver_config:
+    box: opscode-centos-5.9
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
+
+- name: centos-6.4
+  driver_config:
+    box: opscode-centos-6.4
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
+
+suites:
+- name: default
+  run_list:
+  - recipe[minitest-handler]
+  - recipe[python]
+  - recipe[python_test::cook-3084]
+  attributes: {}
+- name: pip
+  run_list:
+  - recipe[minitest-handler]
+  - recipe[python]
+  - recipe[python_test::test_pip]
+
+- name: source
+  run_list:
+  - recipe[minitest-handler]
+  - recipe[python]
+  - recipe[python_test::cook-3084]
+  attributes: {python: {install_method: "source"}}
+- name: exert
+  excludes: ["centos-5.9"]
+  run_list:
+  - recipe[python]
+  - recipe[python_test::test_exert]
+- name: virtualenv
+  run_list:
+  - recipe[python]
+  - recipe[python_test::test_virtualenv]

.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+bundler_args: --deployment --binstubs
+before_script:
+  - ./bin/berks install
+script:
+  - ./bin/foodcritic -f any .
+  - ./bin/rake

Berksfile

@@ -0,0 +1,11 @@
+site 'https://supermarket.chef.io'
+
+metadata
+
+group :integration do
+  cookbook "minitest-handler"
+  cookbook "apt"
+  cookbook "yum"
+  cookbook "build-essential"
+  cookbook "python_test", :path => "./test/cookbooks/python_test"
+end

Berksfile.lock

@@ -0,0 +1,25 @@
+{
+  "sources": {
+    "python": {
+      "path": "."
+    },
+    "minitest-handler": {
+      "locked_version": "1.1.2"
+    },
+    "apt": {
+      "locked_version": "2.3.4"
+    },
+    "yum": {
+      "locked_version": "3.0.2"
+    },
+    "build-essential": {
+      "locked_version": "1.4.2"
+    },
+    "python_test": {
+      "path": "./test/cookbooks/python_test"
+    },
+    "chef_handler": {
+      "locked_version": "1.1.4"
+    }
+  }
+}

CHANGELOG.md

@@ -1,21 +1,110 @@
-## v1.0.8:
+python Cookbook CHANGELOG
+=========================
+This file is used to list changes made in each version of the python cookbook.
 
-* [COOK-1016] - python package needs separate names for centos/rhel 5.x vs 6.x
-* [COOK-1048] - installation of pip does not honor selected python version
-* [COOK-1282] - catch Chef::Exceptions::ShellCommandFailed for chef 0.10.8 compatibility
-* [COOK-1311] - virtualenv should have options attribute
-* [COOK-1320] - pip provider doesn't catch correct exception
-* [COOK-1415] - use plain 'python' binary instead of versioned one for
-  default interpreter
+v1.4.6
+------
 
-## v1.0.6:
+- **[#61](https://github.com/poise/python/pull/61)** – Python packages specified for Fedora platform.
+- **[#62](https://github.com/poise/python/pull/62)** – Use tgz archive instead of tbz2 as new releases no longer offer tb2
+- **[#72](https://github.com/poise/python/pull/72)** – Set $HOME in virtualenv provider
+- **[#74](https://github.com/poise/python/pull/74)** – Allow setting of virtualenv version
+- **[#78](https://github.com/poise/python/pull/78)** – AFix the pip version_check_cmd to use the virtualenv pip when applicable
+- **[#79](https://github.com/poise/python/pull/79)** – Add ability in pip lwrp to send custom env vars
+- **[#80](https://github.com/poise/python/pull/80)** – Update to yum3 yum-epel cookbook
+- Remove ez_setup.py usage and upgrade get-pip.py to 1.5.2.
 
-* [COOK-1036] - correctly grep for python-module version
-* [COOK-1046] - run pip inside the virtualenv
+v1.4.4
+------
+[COOK-3816] - Including ez_setup script with cookbook instead of downloading from the internet
 
-## v1.0.4:
 
-* [COOK-960] - add timeout to python_pip
-* [COOK-651] - 'install_path' not correctly resolved when using python::source
-* [COOK-650] - Add ability to specify version when installing distribute.
-* [COOK-553] - FreeBSD support in the python cookbook
+v1.4.2
+------
+### Bug
+- **[COOK-3796](https://tickets.chef.io/browse/COOK-3796)** - Virtualenv can fail
+
+### Improvement
+- **[COOK-3719](https://tickets.chef.io/browse/COOK-3719)** - Allow alternative install python, update pip location
+- **[COOK-3703](https://tickets.chef.io/browse/COOK-3703)** - Create symlink for source built python [python3 support]
+
+
+v1.4.0
+------
+### New Feature
+- **[COOK-3248](https://tickets.chef.io/browse/COOK-3248)** - Improve testing suite
+
+### Improvement
+- **[COOK-3125](https://tickets.chef.io/browse/COOK-3125)** - Don't use `normal` attributes
+
+### Bug
+- **[COOK-3084](https://tickets.chef.io/browse/COOK-3084)** - Fix `python_virtualenv` on EL 5
+
+v1.3.6
+------
+### Bug
+- [COOK-3305]: distribute merged back into setuptools
+
+### New Feature
+- [COOK-3248]: Improve testing suite in the python cookbook
+
+v1.3.4
+------
+### Bug
+- [COOK-3137]: `python_pip` LWRP cannot have differnent name and `package_name`
+
+v1.3.2
+------
+### Bug
+- [COOK-2917]: python::source fails on CentOS 6.3 minimal (make: command not found)
+- [COOK-3077]: Python - pip fails to install when `['python']['install_method'] == 'source'`
+
+v1.3.0
+------
+### Bug
+- [COOK-2376]: Python pip default action
+- [COOK-2468]: python cookbook - Chef 11 compat fixes
+- [COOK-2882]: Python source recipe fails on Ubuntu 12.10 because of unavailable libdb4.8-dev package
+- [COOK-3009]: fix build time dependencies and gcc flags for python source on newer ubuntus
+
+### New Feature
+- [COOK-2449]: Make the distribute download location an attribute
+- [COOK-3008]: Update python::source to install 2.7.5
+
+### Sub-task
+- [COOK-2866]: python::source checks existence of a directory that already exists
+
+v1.2.2
+------
+- [COOK-2297] - more gracefully handle pip packages from VCS and source archives
+
+v1.2.0
+------
+- [COOK-1866] - /usr/bin is not a pip binary location in source installs on RHEL
+- [COOK-1925] - add smartos support
+
+v1.1.0
+------
+- [COOK-1715] - Add user and group to python_pip
+- [COOK-1727] - Python cookbook cannot install `pip` on CentOS versions < 6
+
+v1.0.8
+------
+- [COOK-1016] - python package needs separate names for centos/rhel 5.x vs 6.x
+- [COOK-1048] - installation of pip does not honor selected python version
+- [COOK-1282] - catch Chef::Exceptions::ShellCommandFailed for chef 0.10.8 compatibility
+- [COOK-1311] - virtualenv should have options attribute
+- [COOK-1320] - pip provider doesn't catch correct exception
+- [COOK-1415] - use plain 'python' binary instead of versioned one for default interpreter
+
+v1.0.6
+------
+- [COOK-1036] - correctly grep for python-module version
+- [COOK-1046] - run pip inside the virtualenv
+
+v1.0.4
+------
+- [COOK-960] - add timeout to python_pip
+- [COOK-651] - 'install_path' not correctly resolved when using python::source
+- [COOK-650] - Add ability to specify version when installing distribute.
+- [COOK-553] - FreeBSD support in the python cookbook

Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'foodcritic', '>= 3.0.3'
+gem 'berkshelf', '~> 2.0'
+gem 'chefspec', '~> 3.0'