Merge pull request #591 from DataDog/remeh/remove-easy-install

Remove recipes using easy_install + update the README accordingly.
DataDog · Mar 27, 2019 · 284ecdd · 284ecdd
2 parents 55bd85f + 5800f48
commit 284ecdd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -98,23 +98,25 @@ dd-handler
 ----------
 Installs the [chef-handler-datadog](https://rubygems.org/gems/chef-handler-datadog) gem and invokes the handler at the end of a Chef run to report the details back to the newsfeed.
 
-dogstatsd-(python|ruby)
+dogstatsd-ruby
 -----------------------
 Installs the language-specific libraries to interact with `dogstatsd`.
 
-* Note for Chef >= 13 users: the `datadog::dogstatsd-python` recipe is not compatible with Chef >= 13, as it relies on a resource that was removed in Chef 13.0.
-  To install the `dogstatsd-python` library with Chef, please add a dependency on the `poise-python` cookbook to your custom/wrapper cookbook, and use the following resource:
+For ruby, please use the `datadog::dogstatsd-ruby` recipe.
+
+For Python, please add a dependency on the `poise-python` cookbook to your custom/wrapper cookbook, and use the following resource:
   ```ruby
   python_package 'dogstatsd-python' # assumes that python and pip are installed
   ```
   For more advanced usage, please refer to the [`poise-python` cookbook documentation](https://github.com/poise/poise-python)
 
-ddtrace-(python|ruby)
+ddtrace-ruby
 ---------------------
 Installs the language-specific libraries for application Traces (APM).
 
-* Note for Chef >= 13 users: the `datadog::ddtrace-python` recipe is not compatible with Chef >= 13, as it relies on a resource that was removed in Chef 13.0.
-  To install the `ddtrace-python` library with Chef, please add a dependency on the `poise-python` cookbook to your custom/wrapper cookbook, and use the following resource:
+For ruby, please use the `datadog::ddtrace-ruby` recipe.
+
+For Python, please add a dependency on the `poise-python` cookbook to your custom/wrapper cookbook, and use the following resource:
   ```ruby
   python_package 'ddtrace' # assumes that python and pip are installed
   ```

diff --git a/metadata.rb b/metadata.rb
@@ -34,9 +34,7 @@
 recipe 'datadog::dd-agent', 'Installs the Datadog Agent'
 recipe 'datadog::dd-handler', 'Installs a Chef handler for Datadog'
 recipe 'datadog::repository', 'Installs the Datadog package repository'
-recipe 'datadog::dogstatsd-python', 'Installs the Python dogstatsd package for custom metrics'
 recipe 'datadog::dogstatsd-ruby', 'Installs the Ruby dogstatsd package for custom metrics'
-recipe 'datadog::ddtrace-python', 'Installs the Python ddtrace package for APM'
 recipe 'datadog::ddtrace-ruby', 'Installs the Ruby ddtrace package for APM'
 
 # integration-specific

diff --git a/recipes/ddtrace-python.rb b/recipes/ddtrace-python.rb
diff --git a/recipes/dogstatsd-python.rb b/recipes/dogstatsd-python.rb