Skip to content

Commit

Permalink
Merge 269beed into e779aa8
Browse files Browse the repository at this point in the history
  • Loading branch information
psi29a committed Oct 8, 2015
2 parents e779aa8 + 269beed commit d88898d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 29 deletions.
10 changes: 10 additions & 0 deletions docs/source/NEWS.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Changelog
=========

Release 15.3.1 (UNRELEASED)
---------------------------

Features
^^^^^^^^

- Updated and simplified setup.py, enforce minimal versions of PyMongo and Twisted necessary to
install TxMongo.


Release 15.3.0 (2015-09-29)
---------------------------

Expand Down
31 changes: 2 additions & 29 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,43 +1,16 @@
#!/usr/bin/env python
import sys
import os
import shutil

from setuptools import setup
from setuptools import Feature
from distutils.cmd import Command
from distutils.command.build_ext import build_ext
from distutils.errors import CCompilerError
from distutils.errors import DistutilsPlatformError, DistutilsExecError
from distutils.core import Extension


requirements = ["twisted", "pymongo"]
try:
import xml.etree.ElementTree
except ImportError:
requirements.append("elementtree")


if sys.platform == 'win32' and sys.version_info > (2, 6):
# 2.6's distutils.msvc9compiler can raise an IOError when failing to
# find the compiler
build_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError,
IOError)
else:
build_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)


setup(
name="txmongo",
version="15.3.0",
version="15.3.1",
description="Asynchronous Python driver for MongoDB <http://www.mongodb.org>",
author="Alexandre Fiori, Bret Curtis",
author_email="fiorix@gmail.com, psi29a@gmail.com",
url="https://github.com/twisted/txmongo",
keywords=["mongo", "mongodb", "pymongo", "gridfs", "txmongo"],
packages=["txmongo", "txmongo._gridfs"],
install_requires=requirements,
install_requires=["twisted>=14.0", "pymongo>=3.0"],
license="Apache License, Version 2.0",
include_package_data=True,
test_suite="nose.collector",
Expand Down

0 comments on commit d88898d

Please sign in to comment.