Merge pull request #7 from DataDog/yann/v0.1.2

Yann/v0.1.2
DataDog · Mar 23, 2015 · 3100649 · 3100649
2 parents 13b5ff7 + 7202321
commit 3100649
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -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
diff --git a/datadog/dogshell/__init__.py b/datadog/dogshell/__init__.py
@@ -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()
 

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -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
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="datadog",
-    version="0.1.1",
+    version="0.1.2",
     install_requires=install_reqs,
     tests_require=["tox"],
     packages=[

diff --git a/tests/integration/dogshell/test_dogshell.py b/tests/integration/dogshell/test_dogshell.py
@@ -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: