Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
# Dev commands

desc "run tests"
task :test do
sh "python setup.py test"
end

desc "install the library in dev mode"
task :dev do
sh "pip uninstall -y ddtrace"
sh "pip install -e ."
end

desc "remove artifacts"
task :clean do
sh 'rm -rf build *egg*'
end

desc "build the docs"
task :docs do
Dir.chdir 'docs' do
sh "make html"
Expand Down
12 changes: 8 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ dependencies:
- sudo service postgresql stop
- sudo service redis-server stop
# install of mock fails otherwise
- pip2.7 install -U setuptools
- pip3.4 install -U setuptools
# Pre-install all dependencies
- python2.7 setup.py test -n
- python3.4 setup.py test -n
test:
override:
- docker run -d -p 9200:9200 elasticsearch:2.3
Expand All @@ -25,12 +29,12 @@ deployment:
# CircleCI is configured to provide VERSION_SUFFIX=$CIRCLE_BRANCH$CIRCLE_BUILD_NUM
commands:
- pip install mkwheelhouse sphinx
- S3_DIR=apm_dev rake release_wheel
- S3_DIR=apm_dev rake release_docs
- S3_DIR=trace-dev rake release_wheel
- S3_DIR=trace-dev rake release_docs
unstable:
tag: /v[0-9]+(\.[0-9]+)*/
# Nullify VERSION_SUFFIX to deploy the package with its public version
commands:
- pip install mkwheelhouse sphinx
- S3_DIR=apm_unstable VERSION_SUFFIX= rake release_wheel
- S3_DIR=apm_unstable rake release_docs
- S3_DIR=trace VERSION_SUFFIX= rake release_wheel
- S3_DIR=trace rake release_docs
3 changes: 3 additions & 0 deletions ddtrace/contrib/flask/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
To install the middleware, do the following::

from flask import Flask
import blinker as _

from ddtrace import tracer
from ddtrace.contrib.flask import TraceMiddleware

app = Flask(...)

Expand Down
4 changes: 4 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ have great visiblity into bottlenecks and troublesome requests.
Installation
------------

Install with :code:`pip` but point to Datadog's package repo::

$ pip install ddtrace --find-links=https://s3.amazonaws.com/pypi.datadoghq.com/trace/index.html


Quick Start
-----------
Expand Down