Skip to content
Browse files

Switch to setuptools and hashlib

Closes #5 and #6, thanks Fabian!
  • Loading branch information...
1 parent 1b52c4d commit 702e6577ce75b40a68df1ed0f81bbbb3bb9c922a @nkuttler nkuttler committed Feb 15, 2013
Showing with 27 additions and 22 deletions.
  1. +1 −1 Makefile
  2. +5 −0 doc/changelog.rst
  3. +14 −0 piwikapi/tests/__init__.py
  4. +0 −13 piwikapi/tests/__main__.py
  5. +7 −8 setup.py
View
2 Makefile
@@ -22,7 +22,7 @@ clean:
.PHONY: test
test:
- python piwikapi/tests/ --failfast
+ python setup.py test
.PHONY: html
html:
View
5 doc/changelog.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.3 (2013-02-)
+----------------
+
+- Switch to setuptools
+
0.2.2 (2013-01-20)
------------------
View
14 piwikapi/tests/__init__.py
@@ -0,0 +1,14 @@
+import unittest
+
+from analytics import AnalyticsClassTestCase
+from analytics import AnalyticsTestCase
+from analytics import AnalyticsLiveTestCase
+from ecommerce import TrackerEcommerceVerifyTestCase
+from goals import GoalsTestCase
+from tracking import TrackerClassTestCase
+from tracking import TrackerVerifyDebugTestCase
+from tracking import TrackerVerifyTestCase
+
+
+if __name__ == '__main__':
+ unittest.main()
View
13 piwikapi/tests/__main__.py
@@ -1,13 +0,0 @@
-import unittest
-
-from analytics import AnalyticsClassTestCase
-from analytics import AnalyticsTestCase
-from analytics import AnalyticsLiveTestCase
-from ecommerce import TrackerEcommerceVerifyTestCase
-from goals import GoalsTestCase
-from tracking import TrackerClassTestCase
-from tracking import TrackerVerifyDebugTestCase
-from tracking import TrackerVerifyTestCase
-
-if __name__ == '__main__':
- unittest.main()
View
15 setup.py
@@ -1,19 +1,19 @@
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+from setuptools import setup, find_packages
+
setup(
name = "piwikapi",
version = "0.2.2",
+ packages = find_packages(),
+ test_suite = 'piwikapi.tests',
+
+ # PyPI
author = "Nicolas Kuttler",
author_email = "pypi@kuttler.eu",
description = "Python Piwik API",
- long_description = open("README.rst").read(),
license = "BSD",
+ long_description = open("README.rst").read(),
url = "http://github.com/nkuttler/python-piwikapi",
- packages = ['piwikapi'],
- include_package_data = True,
classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Web Environment",
@@ -22,5 +22,4 @@
"Operating System :: OS Independent",
"Programming Language :: Python",
],
- zip_safe = True,
)

0 comments on commit 702e657

Please sign in to comment.
Something went wrong with that request. Please try again.