Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'hannosch/no-python25'

  • Loading branch information...
commit 711b93faf515a6d9417957e2f52a44fb22801f91 2 parents c4ca94c + cb415e5
@thobbs thobbs authored
View
1  .travis.yml
@@ -1,6 +1,5 @@
language: python
python:
- - "2.5"
- "2.6"
- "2.7"
View
7 CHANGES
@@ -1,3 +1,10 @@
+Changes in Version 1.8.0
+
+ This release requires either Python 2.6 or 2.7. Python 2.4 and 2.5
+ are no longer supported. There are no concrete plans for Python 3
+ compatibility yet.
+
+
Changes in Version 1.7.2
This release fixes a minor bug and upgrades the bundled Cassandra
View
2  doc/assorted/pycassa_shell.rst
@@ -7,7 +7,7 @@ exploring Cassandra, especially for those who are just beginning.
Requirements
------------
-Python 2.4 or later is required.
+Python 2.6 or later is required.
Make sure you have **pycassa** installed as shown in :ref:`installing`.
View
7 doc/changelog.rst
@@ -1,6 +1,13 @@
Changelog
=========
+Changes in Version 1.8.0
+------------------------
+This release requires either Python 2.6 or 2.7. Python 2.4 and 2.5
+are no longer supported. There are no concrete plans for Python 3
+compatibility yet.
+
+
Changes in Version 1.7.2
------------------------
This release fixes a minor bug and upgrades the bundled Cassandra
View
4 doc/installation.rst
@@ -3,6 +3,10 @@
Installing
==========
+Requirements
+------------
+You need to have either Python 2.6 or 2.7 installed.
+
Installing from PyPi
--------------------
If you have :file:`pip` installed, you can simply do:
View
2  pycassa/batch.py
@@ -45,7 +45,7 @@
.. note:: If a single operation in a batch fails, the whole batch fails.
-In Python >= 2.5, mutators can be used as context managers, where an implicit
+In addition mutators can be used as context managers, where an implicit
:meth:`send` will be called upon exit.
.. code-block:: python
View
16 pycassa/marshal.py
@@ -13,19 +13,9 @@
_number_types = frozenset((int, long, float))
-if hasattr(struct, 'Struct'): # new in Python 2.5
- def make_packer(fmt_string):
- return struct.Struct(fmt_string)
-else:
- def make_packer(fmt_string):
- class Struct(object):
- def pack(self, v):
- return struct.pack(fmt_string, v)
-
- def unpack(self, v):
- return struct.unpack(fmt_string, v)
-
- return Struct()
+
+def make_packer(fmt_string):
+ return struct.Struct(fmt_string)
_bool_packer = make_packer('>B')
_float_packer = make_packer('>f')
View
16 setup.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
-import os, sys
+import os
try:
import subprocess
@@ -23,7 +23,7 @@
from distutils.cmd import Command
-__version__ = "1.7.2"
+__version__ = "1.8.0"
long_description = """pycassa is a python client library for Apache Cassandra with the following features:
@@ -34,11 +34,6 @@
5. A method to map an existing class to a Cassandra column family
"""
-if sys.version_info < (2, 6):
- install_requires = ['thrift < 0.9.0']
-else:
- install_requires = ['thrift']
-
class rpm(Command):
@@ -128,7 +123,7 @@ def run(self):
packages = ['pycassa',
'pycassa.cassandra',
'pycassa.logging'],
- install_requires = install_requires,
+ install_requires = ['thrift'],
py_modules=['ez_setup'],
scripts=['pycassaShell'],
cmdclass={"doc": doc, "rpm": rpm},
@@ -138,10 +133,11 @@ def run(self):
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.4',
- 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 2 :: Only',
'Topic :: Software Development :: Libraries :: Python Modules'
]
)
Please sign in to comment.
Something went wrong with that request. Please try again.