Permalink
Browse files

Release 0.2

- Python 3 support
- Test against Django 1.5rc
- Integrate travis testing
  • Loading branch information...
1 parent 279c49d commit 35c8d47a243b677f04c7c5b43090931235183da2 @nkuttler committed Feb 16, 2013
Showing with 40 additions and 24 deletions.
  1. +26 −10 .travis.yml
  2. +8 −11 README.rst
  3. +2 −1 setup.py
  4. +2 −0 tests/test_project/settings.py
  5. +2 −2 webmaster_verification/tests.py
View
36 .travis.yml
@@ -1,14 +1,30 @@
language: python
+# Python releases to test
python:
- - "2.5"
- - "2.6"
- - "2.7"
- - "3.2"
- - "3.3"
-install:
- - pip install -q Django==$DJANGO_VERSION
- - python setup.py -q install
+ - 2.5
+ - 2.6
+ - 2.7
+ - 3.2
+# Django releases
env:
- - DJANGO_VERSION=1.3.5
- - DJANGO_VERSION=1.4.3
+ - DJANGO_VERSION=Django==1.3.5
+ - DJANGO_VERSION=Django==1.4.3
+ # 1.5 release candidate
+ - DJANGO_VERSION=git+git://github.com/django/django.git@f23d3ce8d47cc3ec58cb7fb1b32d3d3237c025f5
+# Exclude some Django releases depending on Python version
+matrix:
+ exclude:
+ - python: 3.2
+ env: DJANGO_VERSION=Django==1.3.5
+ - python: 3.2
+ env: DJANGO_VERSION=Django==1.4.3
+ - python: 2.5
+ env: DJANGO_VERSION=git+git://github.com/django/django.git@f23d3ce8d47cc3ec58cb7fb1b32d3d3237c025f5
+install:
+ - pip install --use-mirrors $DJANGO_VERSION
+ - python setup.py install
script: make test
+notifications:
+ email:
+ on_success: never
+ on_failure: change
View
19 README.rst
@@ -2,9 +2,11 @@
README
======
-This application allows various webmaster tools to verify that a django site is managed by you.
+This application allows various webmaster tools to verify that a django site is
+managed by you.
-The only supported method of verification is by accessing a file on your server.
+The only supported method of verification is by accessing a file on your
+server.
Supported services:
@@ -79,27 +81,22 @@ For **Yandex** only the `.txt` file method is supported, but adding support for
Changelog
=========
-0.1.11 (2013-02-16)
--------------------
-
-- Integrate travis
+0.2 (2013-02-16)
+----------------
+- Python 3.2 support
+- Integrate testing with travis
0.1.10 (2012-12-21)
-------------------
-
- Fix test errors when running from a real project
0.1.9 (2012-12-19)
------------------
-
- Pypi updates
-
0.1.8 (2012-12-19)
------------------
-
- Yandex Webmaster Tools support added.
0.1.7 (2012-05-07)
------------------
-
- Bugfix for multiple verification codes for one provider.
View
3 setup.py
@@ -2,7 +2,7 @@
setup(
name = "django-webmaster-verification",
- version = "0.1.10",
+ version = "0.2",
packages = find_packages(),
author = "Nicolas Kuttler",
@@ -23,6 +23,7 @@
"Programming Language :: Python :: 2.5",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3.2",
],
install_requires = [
"Django >= 1.3",
View
2 tests/test_project/settings.py
@@ -28,3 +28,5 @@
'majestic': 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
'yandex': 'f0f0f0f0f0f0f0f0',
}
+
+SECRET_KEY = 'CHANGE_THIS_TO_SOMETHING_UNIQUE_AND_SECURE'
View
4 webmaster_verification/tests.py
@@ -30,7 +30,7 @@ def _test_google_file_access_and_content(self, code):
"Couldn't access %s, got %d" % (url, r.status_code)
)
self.assertRegexpMatches(
- r.content,
+ str(r.content),
'.*google%s\.html.*' % code,
'Verification code not found in response body',
)
@@ -69,7 +69,7 @@ def test_bing_file_access_and_content(self):
"Got %s content type for xml file" % r['Content-Type']
)
self.assertRegexpMatches(
- r.content,
+ str(r.content),
'.*%s.*' % code,
'Verification code not found in response body',
)

0 comments on commit 35c8d47

Please sign in to comment.