-
-
Notifications
You must be signed in to change notification settings - Fork 210
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #266 from tas50/cairoffi
Require Python 2.7 + Update dependencies to match the graphite docs
- Loading branch information
Showing
55 changed files
with
166 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,27 @@ | ||
| sudo: required | ||
| dist: trusty | ||
|
|
||
| # install the pre-release chef-dk. Use chef-stable-trusty to install the stable release | ||
| # Use Travis's cointainer based infrastructure | ||
| sudo: false | ||
| addons: | ||
| apt: | ||
| sources: | ||
| - chef-current-trusty | ||
| - chef-current-precise | ||
| packages: | ||
| - chefdk | ||
|
|
||
| # Don't `bundle install` which takes about 1.5 mins | ||
| # Don't `bundle install` | ||
| install: echo "skip bundle install" | ||
|
|
||
| branches: | ||
| only: | ||
| - develop | ||
| - master | ||
|
|
||
| services: docker | ||
|
|
||
| env: | ||
| matrix: | ||
| - INSTANCE=default-centos-6 | ||
| - INSTANCE=default-centos-7 | ||
| - INSTANCE=default-debian-7 | ||
| - INSTANCE=default-debian-8 | ||
| - INSTANCE=default-ubuntu-1204 | ||
| - INSTANCE=default-ubuntu-1404 | ||
| - INSTANCE=default-ubuntu-1604 | ||
|
|
||
| # Ensure we make ChefDK's Ruby the default | ||
| before_script: | ||
| - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) | ||
| - eval "$(/opt/chefdk/bin/chef shell-init bash)" | ||
|
|
||
| script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE} | ||
|
|
||
| matrix: | ||
| include: | ||
| - before_script: | ||
| - eval "$(/opt/chefdk/bin/chef shell-init bash)" | ||
| - /opt/chefdk/embedded/bin/chef --version | ||
| - /opt/chefdk/embedded/bin/cookstyle --version | ||
| - /opt/chefdk/embedded/bin/foodcritic --version | ||
| - script: | ||
| - /opt/chefdk/bin/chef exec rake | ||
| env: UNIT_AND_LINT=1 | ||
| # We have to install chef-sugar for ChefSpec | ||
| - /opt/chefdk/embedded/bin/chef gem install chef-sugar | ||
|
|
||
| script: | ||
| - /opt/chefdk/embedded/bin/chef --version | ||
| - /opt/chefdk/embedded/bin/cookstyle --version | ||
| - /opt/chefdk/embedded/bin/foodcritic --version | ||
| - /opt/chefdk/bin/chef exec rake |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,42 @@ | ||
| Graphite CHANGELOG | ||
| =================== | ||
| # Graphite CHANGELOG | ||
|
|
||
| This file is used to list changes made in each version of the graphite cookbook. | ||
|
|
||
| ## 1.0.4 | ||
|
|
||
| - Syntax and styling updates | ||
| - Use full Twisted version number | ||
| - Manage graphite nofile ulimit | ||
| - Fixes carbon source | ||
| - Adds License and Code of Conduct | ||
|
|
||
| ### Known Issues | ||
| - Reordering of Carbon .ini [241](https://github.com/hw-cookbooks/graphite/issues/241) | ||
| - Graphite web timeout when restarting [224](https://github.com/hw-cookbooks/graphite/issues/224) | ||
|
|
||
| - Reordering of Carbon .ini [241](https://github.com/sous-chefs/graphite/issues/241) | ||
| - Graphite web timeout when restarting [224](https://github.com/sous-chefs/graphite/issues/224) | ||
|
|
||
| ## 1.0.2 | ||
| - README improvements to address resource usage and removal of Apache | ||
| dependency ([@webframp][], [#187][]) | ||
| - restart graphite-web in graphite_example sample recipe ([@obazoud][], [#182][]) | ||
| - remove unused `['graphite']['web_server']` attribute ([@obazoud][], [#181][]) | ||
|
|
||
| - README improvements to address resource usage and removal of Apache dependency ([@webframp], [#187]) | ||
| - restart graphite-web in graphite_example sample recipe ([@obazoud], [#182]) | ||
| - remove unused `['graphite']['web_server']` attribute ([@obazoud], [#181]) | ||
|
|
||
| ## 1.0.1 | ||
|
|
||
| - Readme improvements. | ||
|
|
||
| ## 1.0.0 | ||
|
|
||
| ### Breaking Changes | ||
| - Initial release of graphite library style cookbook. Complete rewrite | ||
| of cookbook to provide reusable resources. Breaks backward | ||
| compatibility with cookbook version prior 1.0. ([@webframp][], [@fnichol][], | ||
| [@agoddard][]) | ||
|
|
||
| <!--- The following link definition list is generated by PimpMyChangelog ---> | ||
| [#181]: https://github.com/hw-cookbooks/graphite/issues/181 | ||
| [#182]: https://github.com/hw-cookbooks/graphite/issues/182 | ||
| [#187]: https://github.com/hw-cookbooks/graphite/issues/187 | ||
|
|
||
| - Initial release of graphite library style cookbook. Complete rewrite of cookbook to provide reusable resources. Breaks backward compatibility with cookbook version prior 1.0\. ([@webframp], [@fnichol], [@agoddard]) | ||
|
|
||
| <!-- - The following link definition list is generated by PimpMyChangelog - --> | ||
|
|
||
| [#181]: https://github.com/sous-chefs/graphite/issues/181 | ||
| [#182]: https://github.com/sous-chefs/graphite/issues/182 | ||
| [#187]: https://github.com/sous-chefs/graphite/issues/187 | ||
| [@agoddard]: https://github.com/agoddard | ||
| [@fnichol]: https://github.com/fnichol | ||
| [@obazoud]: https://github.com/obazoud | ||
| [@webframp]: https://github.com/webframp | ||
| [@webframp]: https://github.com/webframp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,31 @@ | ||
| # -*- mode: ruby -*- | ||
| # vi: set ft=ruby : | ||
| #!/usr/bin/env ruby | ||
| # ^syntax detection | ||
|
|
||
| opts = '--color --format progress' | ||
| require 'cookstyle' | ||
|
|
||
| guard 'rspec', cmd: "bundle exec rspec #{opts}" do | ||
| watch(%r{^spec/.+_spec\.rb$}) | ||
| watch(%r{^(libraries|providers|recipes|resources)/(.+)\.rb$}) { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" } | ||
| watch('spec/spec_helper.rb') { 'spec' } | ||
| watch(%r{^spec/fixtures/.+$}) { 'spec' } | ||
| guard :rubocop, keep_failed: false, cli: '-r finstyle' do | ||
| watch(/.+\.rb$/) { |m| m[0] } | ||
| watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } | ||
| end | ||
|
|
||
| guard 'foodcritic', cookbook_paths: '.', cli: '-C -t ~FC001' do | ||
| watch(%r{attributes/.+\.rb$}) | ||
| watch(%r{providers/.+\.rb$}) | ||
| watch(%r{recipes/.+\.rb$}) | ||
| watch(%r{resources/.+\.rb$}) | ||
| end | ||
|
|
||
| spec_path = 'test/unit' | ||
| rspec_guard_config = { | ||
| cmd: "bundle exec rspec --color --format progress --default-path=#{spec_path}", | ||
| all_on_start: true, | ||
| spec_paths: [spec_path] | ||
| } | ||
|
|
||
| guard 'rspec', rspec_guard_config do | ||
| watch(%r{^#{spec_path}/.+_spec\.rb$}) | ||
| watch("#{spec_path}/spec_helper.rb") { spec_path } | ||
| watch(%r{^(libraries|providers|recipes|resources)/(.+)\.rb$}) do |m| | ||
| "#{spec_path}/#{m[2]}_spec.rb" | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.