Merge branch 'master' of github.com:ericrasmussen/pyramid_redis_sessions

ericrasmussen · Apr 3, 2012 · c26f862 · c26f862
2 parents d8381e9 + d5cb065
commit c26f862
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 .coverage
 build/
 dist/
-env*/
+env*/
+tmp/
diff --git a/pyramid_redis_sessions/__init__.py b/pyramid_redis_sessions/__init__.py
@@ -176,6 +176,8 @@ def RedisSessionFactory(
       ``unix_socket_path``
     """
 
+    port = int(port)
+
     def factory(request, new_session_id=get_unique_session_id):
         # note: will raise ConnectionError if connection is not established
         redis = getattr(request.registry, '_redis_sessions', None)

diff --git a/setup.cfg b/setup.cfg
@@ -7,3 +7,6 @@ where=pyramid_redis_sessions
 nocapture=1
 cover-package=pyramid_redis_sessions
 cover-erase=1
+
+[aliases]
+dev = develop easy_install pyramid_redis_sessions[testing]
diff --git a/setup.py b/setup.py
@@ -8,6 +8,8 @@
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
+testing_extras = ['pkginfo', 'nose', 'coverage']
+
 setup(name='pyramid_redis_sessions',
       version=__version__,
       description='Pyramid web framework session factory backed by Redis',
@@ -25,7 +27,7 @@
       url='http://pyramid.chromaticleaves.com/docs/pyramid_redis_sessions/',
       license='FreeBSD',
       packages=find_packages(),
-      test_suite='pyramid-redis-sessions.tests',
+      test_suite='pyramid_redis_sessions.tests',
       include_package_data=True,
       zip_safe=False,
       tests_require=['pkginfo', 'nose'],
@@ -34,4 +36,7 @@
         'pyramid>=1.3',
         ],
       entry_points='',
+      extras_require = {
+          'testing':testing_extras,
+          },
 )