Commits

Peter Sagerson committed 2e372ea

Packaging and unit test cleanup.

Comments (0)

Files changed (16)

 # setuptools
 /MANIFEST$
 /MANIFEST.in$
+/build/
 /dist/
 /docs/build/
 \.egg-info/

django-otp-yubikey/CHANGES

+v0.1.1 - May 8, 2013 - Packaging and test cleanup
+-------------------------------------------------
+
+Include fixtures in the installation so the tests pass.
+
+
+v0.1.0 - August 21, 2012 - Initial Release
+------------------------------------------
+
+Initial release.
+
+
+.. vim: ft=rst nospell tw=80

django-otp-yubikey/docs/source/conf.py

 # built documents.
 #
 # The short X.Y version.
-version = '0.1.0'
+version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

django-otp-yubikey/otp_yubikey/fixtures/otp_yubikey/alice_and_bob.yaml

+- fields:
+    date_joined: '2012-07-15 16:03:02Z'
+    email: alice@example.com
+    first_name: ''
+    groups: []
+    is_active: true
+    is_staff: false
+    is_superuser: false
+    last_login: '2012-07-17 19:00:09Z'
+    last_name: ''
+    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
+    user_permissions: []
+    username: alice
+  model: auth.user
+  pk: 1
+
+- fields:
+    date_joined: '2012-07-15 16:03:02Z'
+    email: bob@example.com
+    first_name: ''
+    groups: []
+    is_active: true
+    is_staff: false
+    is_superuser: false
+    last_login: '2012-07-17 19:00:09Z'
+    last_name: ''
+    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
+    user_permissions: []
+    username: bob
+  model: auth.user
+  pk: 2
+
+- model: otp_yubikey.yubikeydevice
+  pk: 1
+  fields:
+    user: 1
+    name: yubikey
+    confirmed: True
+    private_id: '5dc30490956b'
+    key: 'fb362a0853be5e5306d5cc2483f279cb'
+    session: 5
+    counter: 0
+
+- model: otp_yubikey.yubikeydevice
+  pk: 2
+  fields:
+    user: 2
+    name: yubikey
+    confirmed: True
+    private_id: '326f70826d31'
+    key: '11080a0e7a56d0a1546f327f20626308'
+    session: 10
+    counter: 3

django-otp-yubikey/otp_yubikey/fixtures/tests/alice_and_bob.yaml

-- fields:
-    date_joined: 2012-07-15 16:03:02.420965
-    email: alice@example.com
-    first_name: ''
-    groups: []
-    is_active: true
-    is_staff: false
-    is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
-    last_name: ''
-    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
-    user_permissions: []
-    username: alice
-  model: auth.user
-  pk: 1
-
-- fields:
-    date_joined: 2012-07-15 16:03:02.420965
-    email: bob@example.com
-    first_name: ''
-    groups: []
-    is_active: true
-    is_staff: false
-    is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
-    last_name: ''
-    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
-    user_permissions: []
-    username: bob
-  model: auth.user
-  pk: 2
-
-- model: otp_yubikey.yubikeydevice
-  pk: 1
-  fields:
-    user: 1
-    name: yubikey
-    confirmed: True
-    private_id: '5dc30490956b'
-    key: 'fb362a0853be5e5306d5cc2483f279cb'
-    session: 5
-    counter: 0
-
-- model: otp_yubikey.yubikeydevice
-  pk: 2
-  fields:
-    user: 2
-    name: yubikey
-    confirmed: True
-    private_id: '326f70826d31'
-    key: '11080a0e7a56d0a1546f327f20626308'
-    session: 10
-    counter: 3

django-otp-yubikey/otp_yubikey/tests.py

 
 
 class YubikeyTest(TestCase):
-    fixtures = ['tests/alice_and_bob']
+    fixtures = ['otp_yubikey/alice_and_bob.yaml']
 
     alice_public = 'cccccccb'
     alice_aes = unhexlify('fb362a0853be5e5306d5cc2483f279cb')

django-otp-yubikey/setup.py

 #!/usr/bin/env python
 
-from distutils.core import setup
+from setuptools import setup
 
 
 setup(
     name='django-otp-yubikey',
-    version='0.1.0',
+    version='0.1.1',
     description='A django-otp plugin that verifies YubiKey OTP tokens.',
     long_description=open('README').read(),
     author='Peter Sagerson',
     packages=[
         'otp_yubikey',
     ],
+    include_package_data=True,
     url='https://bitbucket.org/psagers/django-otp',
     license='BSD',
     install_requires=[

django-otp/CHANGES

   the current Django version. Django versions 1.3 to 1.5 are currently
   supported.
 
+- Unit test cleanup.
+
 
 v0.1.3 - March 10, 2013 - Django 1.5 compatibility
 --------------------------------------------------

django-otp/django_otp/fixtures/django_otp/alice_and_bob.yaml

 - fields:
-    date_joined: 2012-07-15 16:03:02.420965
+    date_joined: '2012-07-15 16:03:02Z'
     email: alice@example.com
     first_name: ''
     groups: []
     is_active: true
     is_staff: false
     is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
+    last_login: '2012-07-17 19:00:09Z'
     last_name: ''
     password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
     user_permissions: []
   pk: 1
 
 - fields:
-    date_joined: 2012-07-15 16:03:02.420965
+    date_joined: '2012-07-15 16:03:02Z'
     email: bob@example.com
     first_name: ''
     groups: []
     is_active: true
     is_staff: false
     is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
+    last_login: '2012-07-17 19:00:09Z'
     last_name: ''
     password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
     user_permissions: []

django-otp/django_otp/plugins/otp_hotp/fixtures/otp_hotp/tests.yaml

+- fields:
+    date_joined: '2012-07-15 16:03:02Z'
+    email: alice@example.com
+    first_name: ''
+    groups: []
+    is_active: true
+    is_staff: false
+    is_superuser: false
+    last_login: '2012-07-17 19:00:09Z'
+    last_name: ''
+    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
+    user_permissions: []
+    username: alice
+  model: auth.user
+  pk: 1
+
+- model: otp_hotp.hotpdevice
+  pk: 1
+  fields:
+    user: 1
+    key: 'd2e8a68036f68960b1c30532bb6c56da5934d879'
+    digits: 6
+    tolerance: 1
+    counter: 0

django-otp/django_otp/plugins/otp_hotp/fixtures/tests/hotp.yaml

-- fields:
-    date_joined: 2012-07-15 16:03:02.420965
-    email: alice@example.com
-    first_name: ''
-    groups: []
-    is_active: true
-    is_staff: false
-    is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
-    last_name: ''
-    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
-    user_permissions: []
-    username: alice
-  model: auth.user
-  pk: 1
-
-- model: otp_hotp.hotpdevice
-  pk: 1
-  fields:
-    user: 1
-    key: 'd2e8a68036f68960b1c30532bb6c56da5934d879'
-    digits: 6
-    tolerance: 1
-    counter: 0

django-otp/django_otp/plugins/otp_hotp/tests.py

 
 
 class HOTPTest(TestCase):
-    fixtures = ['tests/hotp']
+    fixtures = ['otp_hotp/tests.yaml']
 
     # The next three tokens
     tokens = [782373, 313268, 307722]

django-otp/django_otp/plugins/otp_totp/fixtures/otp_totp/tests.yaml

+- fields:
+    date_joined: '2012-07-15 16:03:02Z'
+    email: alice@example.com
+    first_name: ''
+    groups: []
+    is_active: true
+    is_staff: false
+    is_superuser: false
+    last_login: '2012-07-17 19:00:09Z'
+    last_name: ''
+    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
+    user_permissions: []
+    username: alice
+  model: auth.user
+  pk: 1
+
+- model: otp_totp.totpdevice
+  pk: 1
+  fields:
+    user: 1
+    key: '2a2bbba1092ffdd25a328ad1a0a5f5d61d7aacc4'
+    step: 30
+    t0: 0
+    digits: 6
+    tolerance: 0
+    drift: 0

django-otp/django_otp/plugins/otp_totp/fixtures/tests/totp.yaml

-- fields:
-    date_joined: 2012-07-15 16:03:02.420965
-    email: alice@example.com
-    first_name: ''
-    groups: []
-    is_active: true
-    is_staff: false
-    is_superuser: false
-    last_login: 2012-07-17 19:00:09.753345
-    last_name: ''
-    password: sha1$76223$c4f1daa1f2f3a7a3a6737538873ba335c60b5b7d
-    user_permissions: []
-    username: alice
-  model: auth.user
-  pk: 1
-
-- model: otp_totp.totpdevice
-  pk: 1
-  fields:
-    user: 1
-    key: '2a2bbba1092ffdd25a328ad1a0a5f5d61d7aacc4'
-    step: 30
-    t0: 0
-    digits: 6
-    tolerance: 0
-    drift: 0

django-otp/django_otp/plugins/otp_totp/tests.py

 
 
 class TOTPTest(TestCase):
-    fixtures = ['tests/totp']
+    fixtures = ['otp_totp/tests.yaml']
 
     # The next ten tokens
     tokens = [179225, 656163, 839400, 154567, 346912, 471576, 45675, 101397, 491039, 784503]
 
 
 DEBUG = True
+USE_TZ = True
 
 DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.