Skip to content

Commit 8f52221

Browse files
author
Ramiro Morales
committed
Document minimum supported version of Python consistently.
Fixes pymssql#205.
1 parent cf84ace commit 8f52221

4 files changed

Lines changed: 24 additions & 23 deletions

File tree

README_building_and_developing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Building
77

88
To build pymssql you should have:
99

10-
* python >= 2.5 including development files. Please research your OS usual
10+
* python >= 2.6 including development files. Please research your OS usual
1111
software distribution channels, e.g, ``python-dev`` or ``python-devel``
1212
packages.
1313
* Cython >= 0.15

bin/hudson.sh

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ cd pymssql
22

33
# Check the Python version
44
case $PYTHON_VERSION in
5-
25)
6-
PYTHON=python2.5
7-
;;
85
26)
96
PYTHON=python2.6
107
;;
@@ -34,57 +31,57 @@ if [ $(expr match "$PLATFORM" 'win') -gt 0 ]; then
3431
echo "Unknown version of Windows"
3532
exit 1
3633
fi
37-
34+
3835
PYDIR="c:\Python$PYTHON_VERSION"
39-
36+
4037
PYTHON="$PYDIR\python.exe"
4138
SCRIPTS="$PYDIR\Scripts"
42-
39+
4340
# Do a clean to start out
4441
wine $PYTHON setup.py clean
45-
42+
4643
# Remove possibly left over directories
4744
rm -rf build dist
4845

4946
# Build pymssql and create binaries
5047
wine $PYTHON setup.py build -c mingw32 bdist --formats=egg,wininst
51-
48+
5249
# Copy the binaries over to the downloads directory
5350
cp dist/pymssql-*.egg /srv/http/nginx/downloads/pymssql/snapshots/
5451
cp dist/pymssql-*.exe /srv/http/nginx/downloads/pymssql/snapshots/
55-
52+
5653
elif [ "$PLATFORM" = "linux" ]; then
57-
54+
5855
# Create the virtual python environment
5956
PYTHON_ENV=$(mktemp -d)
60-
57+
6158
if [ "$PYTHON" = "python3.1" ]; then
6259
VIRTUAL_ENV="python /usr/lib/python3.1/site-packages/virtualenv3.py"
6360
else
6461
VIRTUAL_ENV="virtualenv --distribute"
6562
fi
66-
63+
6764
$VIRTUAL_ENV --python=$PYTHON $PYTHON_ENV
68-
65+
6966
# Activate the virtual environment
7067
source $PYTHON_ENV/bin/activate
71-
68+
7269
# Install Cython
7370
easy_install Cython
74-
71+
7572
# Clean up the workspace
7673
python setup.py clean
7774
rm -rf build dist
78-
75+
7976
# Test building pymssql
8077
python setup.py build -c unix
81-
78+
8279
# Create a pymssql egg
8380
python setup.py bdist_egg
8481

85-
# Copy the egg over to the downloads directory
82+
# Copy the egg over to the downloads directory
8683
cp dist/pymssql-*.egg /srv/http/nginx/downloads/pymssql/snapshots/
87-
84+
8885
# Remove the vitualenv
8986
rm -rf $VIRTUAL_ENV
9087
fi;

bin/travis_env.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ if [ "$TRAVIS_SECURE_ENV_VARS" = "false" ]; then
66
fi
77

88
case $TRAVIS_PYTHON_VERSION in
9-
2.5)
10-
PYMSSQL_TEST_DATABASE=pymssql_dev_py25
11-
;;
129
2.6)
1310
PYMSSQL_TEST_DATABASE=pymssql_dev_py26
1411
;;

docs/intro.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ The pymssql package consists of two modules:
1212
* :mod:`_mssql` -- use it if you care about performance and ease of use
1313
(``_mssql`` module is easier to use than ``pymssql``).
1414

15+
Supported related software
16+
==========================
17+
18+
:Python: Python 2.x: 2.6 or newer. Python 3.x: 3.3 or newer.
19+
:FreeTDS: 0.82 or newer.
20+
:Cython: 0.15 or newer.
21+
1522
Project Discussion
1623
==================
1724

0 commit comments

Comments
 (0)