Changeset: ce8ee749e18a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce8ee749e18a
Added Files:
clients/python2/MANIFEST.in
clients/python2/Makefile.ag
clients/python2/README.rst
clients/python2/examples/basics.py
clients/python2/examples/mclient.py
clients/python2/examples/perf.py
clients/python2/monetdb/__init__.py
clients/python2/monetdb/exceptions.py
clients/python2/monetdb/mapi.py
clients/python2/monetdb/sql/__init__.py
clients/python2/monetdb/sql/connections.py
clients/python2/monetdb/sql/converters.py
clients/python2/monetdb/sql/cursors.py
clients/python2/monetdb/sql/monetize.py
clients/python2/monetdb/sql/pythonize.py
clients/python2/monetdb/sql/types.py
clients/python2/setup.py
clients/python2/test/capabilities.py
clients/python2/test/dbapi20.py
clients/python2/test/run.sh
clients/python2/test/runtests.py
Removed Files:
clients/python/MANIFEST.in
clients/python/Makefile.ag
clients/python/README.rst
clients/python/examples/basics.py
clients/python/examples/mclient.py
clients/python/examples/perf.py
clients/python/monetdb/__init__.py
clients/python/monetdb/exceptions.py
clients/python/monetdb/mapi.py
clients/python/monetdb/sql/__init__.py
clients/python/monetdb/sql/connections.py
clients/python/monetdb/sql/converters.py
clients/python/monetdb/sql/cursors.py
clients/python/monetdb/sql/monetize.py
clients/python/monetdb/sql/pythonize.py
clients/python/monetdb/sql/types.py
clients/python/setup.py
clients/python/test/capabilities.py
clients/python/test/dbapi20.py
clients/python/test/run.sh
clients/python/test/runtests.py
Modified Files:
buildtools/autogen/autogen/am.py
clients/Makefile.ag
Branch: Oct2012
Log Message:
python: use explicit python2 and python3 targets
Don't assume python is Python 2, but rather make it explicit, such that
we are more flexible.
diffs (108 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1022,8 +1022,8 @@ def am_python_generic(fd, var, python, a
for pkgdir in sorted(pkgdirs, reverse = True):
fd.write("\t[ '$(srcdir)' -ef . ] || rm -r '%s'\n" % pkgdir)
-def am_python(fd, var, python, am):
- am_python_generic(fd, var, python, am, 'PYTHON')
+def am_python2(fd, var, python, am):
+ am_python_generic(fd, var, python, am, 'PYTHON2')
def am_python3(fd, var, python3, am):
am_python_generic(fd, var, python3, am, 'PYTHON3')
@@ -1156,7 +1156,7 @@ output_funcs = {'SUBDIRS': am_subdirs,
'HEADERS': am_headers,
'ANT': am_ant,
'GEM': am_gem,
- 'PYTHON': am_python,
+ 'PYTHON2': am_python2,
'PYTHON3': am_python3,
}
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -15,6 +15,6 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON?python HAVE_PYTHON3?python3
NATIVE_WIN32?NT
+SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON2?python2 HAVE_PYTHON3?python3
NATIVE_WIN32?NT
EXTRA_DIST_DIR = Tests
diff --git a/clients/python/MANIFEST.in b/clients/python2/MANIFEST.in
rename from clients/python/MANIFEST.in
rename to clients/python2/MANIFEST.in
diff --git a/clients/python/Makefile.ag b/clients/python2/Makefile.ag
rename from clients/python/Makefile.ag
rename to clients/python2/Makefile.ag
--- a/clients/python/Makefile.ag
+++ b/clients/python2/Makefile.ag
@@ -15,7 +15,7 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-python_setup = {
+python2_setup = {
FILES = setup.py
}
diff --git a/clients/python/README.rst b/clients/python2/README.rst
rename from clients/python/README.rst
rename to clients/python2/README.rst
diff --git a/clients/python/examples/basics.py
b/clients/python2/examples/basics.py
rename from clients/python/examples/basics.py
rename to clients/python2/examples/basics.py
diff --git a/clients/python/examples/mclient.py
b/clients/python2/examples/mclient.py
rename from clients/python/examples/mclient.py
rename to clients/python2/examples/mclient.py
diff --git a/clients/python/examples/perf.py b/clients/python2/examples/perf.py
rename from clients/python/examples/perf.py
rename to clients/python2/examples/perf.py
diff --git a/clients/python/monetdb/__init__.py
b/clients/python2/monetdb/__init__.py
rename from clients/python/monetdb/__init__.py
rename to clients/python2/monetdb/__init__.py
diff --git a/clients/python/monetdb/exceptions.py
b/clients/python2/monetdb/exceptions.py
rename from clients/python/monetdb/exceptions.py
rename to clients/python2/monetdb/exceptions.py
diff --git a/clients/python/monetdb/mapi.py b/clients/python2/monetdb/mapi.py
rename from clients/python/monetdb/mapi.py
rename to clients/python2/monetdb/mapi.py
diff --git a/clients/python/monetdb/sql/__init__.py
b/clients/python2/monetdb/sql/__init__.py
rename from clients/python/monetdb/sql/__init__.py
rename to clients/python2/monetdb/sql/__init__.py
diff --git a/clients/python/monetdb/sql/connections.py
b/clients/python2/monetdb/sql/connections.py
rename from clients/python/monetdb/sql/connections.py
rename to clients/python2/monetdb/sql/connections.py
diff --git a/clients/python/monetdb/sql/converters.py
b/clients/python2/monetdb/sql/converters.py
rename from clients/python/monetdb/sql/converters.py
rename to clients/python2/monetdb/sql/converters.py
diff --git a/clients/python/monetdb/sql/cursors.py
b/clients/python2/monetdb/sql/cursors.py
rename from clients/python/monetdb/sql/cursors.py
rename to clients/python2/monetdb/sql/cursors.py
diff --git a/clients/python/monetdb/sql/monetize.py
b/clients/python2/monetdb/sql/monetize.py
rename from clients/python/monetdb/sql/monetize.py
rename to clients/python2/monetdb/sql/monetize.py
diff --git a/clients/python/monetdb/sql/pythonize.py
b/clients/python2/monetdb/sql/pythonize.py
rename from clients/python/monetdb/sql/pythonize.py
rename to clients/python2/monetdb/sql/pythonize.py
diff --git a/clients/python/monetdb/sql/types.py
b/clients/python2/monetdb/sql/types.py
rename from clients/python/monetdb/sql/types.py
rename to clients/python2/monetdb/sql/types.py
diff --git a/clients/python/setup.py b/clients/python2/setup.py
rename from clients/python/setup.py
rename to clients/python2/setup.py
diff --git a/clients/python/test/capabilities.py
b/clients/python2/test/capabilities.py
rename from clients/python/test/capabilities.py
rename to clients/python2/test/capabilities.py
diff --git a/clients/python/test/dbapi20.py b/clients/python2/test/dbapi20.py
rename from clients/python/test/dbapi20.py
rename to clients/python2/test/dbapi20.py
diff --git a/clients/python/test/run.sh b/clients/python2/test/run.sh
rename from clients/python/test/run.sh
rename to clients/python2/test/run.sh
diff --git a/clients/python/test/runtests.py b/clients/python2/test/runtests.py
rename from clients/python/test/runtests.py
rename to clients/python2/test/runtests.py
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
