Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yann/v0.1.2 #7

Merged
merged 2 commits into from
Mar 23, 2015
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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ stats.increment('home.page.hits')

Change Log
----------
- 0.1.2
- Release date: 2015.03.23
- Fix a typo that was causing an initialization issue with `datadog.dogshell`
- 0.1
- Release date: 2015.03.10
- First release
2 changes: 1 addition & 1 deletion datadog/dogshell/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def main():
" out an API call (default 10)", default=10, type=int)
parser.add_argument('-v', '--version', help='Dog API version', action='version',
version='%(prog)s {version}'
.format(version=pkg.require("datadog.py")[0].version))
.format(version=pkg.require("datadog")[0].version))

config = DogshellConfig()

Expand Down
2 changes: 1 addition & 1 deletion doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The :mod:`datadog` module provides :mod:`datadog.api` - a simple wrapper around
Installation
============

To install from source, `download <https://github.com/DataDog/datadog.py>`_ a distribution and run:
To install from source, `download <https://github.com/DataDog/datadogpy>`_ a distribution and run:

>>> sudo python setup.py install

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name="datadog",
version="0.1.1",
version="0.1.2",
install_requires=install_reqs,
tests_require=["tox"],
packages=[
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/dogshell/test_dogshell.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ def test_event(self):
event_id = None

def match_permalink(out):
match = re.match(r'.*/event/jump_to\?event_id=([0-9]*)', out, re.DOTALL)
match = re.match(r'.*/event/event\?id=([0-9]*)', out, re.DOTALL) or \
re.match(r'.*/event/jump_to\?event_id=([0-9]*)', out, re.DOTALL)
if match:
return match.group(1)
else:
Expand Down