Changeset: d444859a0841 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d444859a0841
Added Files:
sql/backends/monet5/UDF/pyapi3/connection.h
sql/backends/monet5/UDF/pyapi3/conversion.h
sql/backends/monet5/UDF/pyapi3/convert_loops.h
sql/backends/monet5/UDF/pyapi3/emit.h
sql/backends/monet5/UDF/pyapi3/formatinput.h
sql/backends/monet5/UDF/pyapi3/pyapi.h
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/UDF/pyapi3/pytypes.h
sql/backends/monet5/UDF/pyapi3/type_conversion.h
sql/backends/monet5/UDF/pyapi3/undef.h
sql/backends/monet5/UDF/pyapi3/unicode.h
Removed Files:
clients/examples/python/mclient-python2.py
debian/monetdb-python2.install
sql/backends/monet5/Tests/createorreplace.sql
sql/backends/monet5/Tests/createorreplace.stable.err
sql/backends/monet5/Tests/createorreplace.stable.out
sql/backends/monet5/Tests/pyapi00.sql
sql/backends/monet5/Tests/pyapi00.stable.err
sql/backends/monet5/Tests/pyapi00.stable.out
sql/backends/monet5/Tests/pyapi01.sql
sql/backends/monet5/Tests/pyapi01.stable.err
sql/backends/monet5/Tests/pyapi01.stable.out
sql/backends/monet5/Tests/pyapi02.sql
sql/backends/monet5/Tests/pyapi02.stable.err
sql/backends/monet5/Tests/pyapi02.stable.out
sql/backends/monet5/Tests/pyapi03.sql
sql/backends/monet5/Tests/pyapi03.stable.err
sql/backends/monet5/Tests/pyapi03.stable.out
sql/backends/monet5/Tests/pyapi04.sql
sql/backends/monet5/Tests/pyapi04.stable.err
sql/backends/monet5/Tests/pyapi04.stable.out
sql/backends/monet5/Tests/pyapi05.sql
sql/backends/monet5/Tests/pyapi05.stable.err
sql/backends/monet5/Tests/pyapi05.stable.out
sql/backends/monet5/Tests/pyapi06.sql
sql/backends/monet5/Tests/pyapi06.stable.err
sql/backends/monet5/Tests/pyapi06.stable.out
sql/backends/monet5/Tests/pyapi07.sql
sql/backends/monet5/Tests/pyapi07.stable.err
sql/backends/monet5/Tests/pyapi07.stable.out
sql/backends/monet5/Tests/pyapi08.sql
sql/backends/monet5/Tests/pyapi08.stable.err
sql/backends/monet5/Tests/pyapi08.stable.out
sql/backends/monet5/Tests/pyapi09.sql
sql/backends/monet5/Tests/pyapi09.stable.err
sql/backends/monet5/Tests/pyapi09.stable.out
sql/backends/monet5/Tests/pyapi10.sql
sql/backends/monet5/Tests/pyapi10.stable.err
sql/backends/monet5/Tests/pyapi10.stable.err.Windows
sql/backends/monet5/Tests/pyapi10.stable.out
sql/backends/monet5/Tests/pyapi11.sql
sql/backends/monet5/Tests/pyapi11.stable.err
sql/backends/monet5/Tests/pyapi11.stable.out
sql/backends/monet5/Tests/pyapi12.sql
sql/backends/monet5/Tests/pyapi12.stable.err
sql/backends/monet5/Tests/pyapi12.stable.out
sql/backends/monet5/Tests/pyapi13.sql
sql/backends/monet5/Tests/pyapi13.stable.err
sql/backends/monet5/Tests/pyapi13.stable.out
sql/backends/monet5/Tests/pyapi14.sql
sql/backends/monet5/Tests/pyapi14.stable.err
sql/backends/monet5/Tests/pyapi14.stable.out
sql/backends/monet5/Tests/pyapi15.sql
sql/backends/monet5/Tests/pyapi16.sql
sql/backends/monet5/Tests/pyapi16.stable.err
sql/backends/monet5/Tests/pyapi16.stable.out
sql/backends/monet5/Tests/pyapi17.sql
sql/backends/monet5/Tests/pyapi17.stable.err
sql/backends/monet5/Tests/pyapi17.stable.out
sql/backends/monet5/Tests/pyapi18.sql
sql/backends/monet5/Tests/pyapi18.stable.err
sql/backends/monet5/Tests/pyapi18.stable.out
sql/backends/monet5/Tests/pyapi19.sql
sql/backends/monet5/Tests/pyapi19.stable.err
sql/backends/monet5/Tests/pyapi19.stable.out
sql/backends/monet5/Tests/pyapi20.sql
sql/backends/monet5/Tests/pyapi20.stable.err
sql/backends/monet5/Tests/pyapi20.stable.out
sql/backends/monet5/Tests/pyapi21.sql
sql/backends/monet5/Tests/pyapi21.stable.err
sql/backends/monet5/Tests/pyapi21.stable.out
sql/backends/monet5/Tests/pyapi23.sql
sql/backends/monet5/Tests/pyapi23.stable.err
sql/backends/monet5/Tests/pyapi23.stable.out
sql/backends/monet5/Tests/pyapi24.sql
sql/backends/monet5/Tests/pyapi24.stable.err
sql/backends/monet5/Tests/pyapi24.stable.out
sql/backends/monet5/Tests/pyapi25.sql
sql/backends/monet5/Tests/pyapi25.stable.err
sql/backends/monet5/Tests/pyapi25.stable.err.Windows
sql/backends/monet5/Tests/pyapi25.stable.out
sql/backends/monet5/Tests/pyapi26.sql
sql/backends/monet5/Tests/pyapi26.stable.err
sql/backends/monet5/Tests/pyapi26.stable.out
sql/backends/monet5/Tests/pyapi27.sql
sql/backends/monet5/Tests/pyapi27.stable.err
sql/backends/monet5/Tests/pyapi27.stable.out
sql/backends/monet5/Tests/pyapi28.sql
sql/backends/monet5/Tests/pyapi28.stable.err
sql/backends/monet5/Tests/pyapi28.stable.out
sql/backends/monet5/Tests/pyapi29.sql
sql/backends/monet5/Tests/pyapi29.stable.err
sql/backends/monet5/Tests/pyapi29.stable.out
sql/backends/monet5/Tests/pyapi30.sql
sql/backends/monet5/Tests/pyapi30.stable.err
sql/backends/monet5/Tests/pyapi30.stable.out
sql/backends/monet5/Tests/pyapi31.sql
sql/backends/monet5/Tests/pyapi31.stable.err
sql/backends/monet5/Tests/pyapi31.stable.out
sql/backends/monet5/Tests/pyapi32.sql
sql/backends/monet5/Tests/pyapi32.stable.err
sql/backends/monet5/Tests/pyapi32.stable.out
sql/backends/monet5/Tests/pyapi33.sql
sql/backends/monet5/Tests/pyapi33.stable.err
sql/backends/monet5/Tests/pyapi33.stable.out
sql/backends/monet5/Tests/pyapi34.sql
sql/backends/monet5/Tests/pyapi34.stable.err
sql/backends/monet5/Tests/pyapi34.stable.out
sql/backends/monet5/Tests/pyloader01.sql
sql/backends/monet5/Tests/pyloader01.stable.err
sql/backends/monet5/Tests/pyloader01.stable.out
sql/backends/monet5/Tests/pyloader02.sql
sql/backends/monet5/Tests/pyloader02.stable.err
sql/backends/monet5/Tests/pyloader02.stable.out
sql/backends/monet5/Tests/pyloader03.sql
sql/backends/monet5/Tests/pyloader03.stable.err
sql/backends/monet5/Tests/pyloader03.stable.out
sql/backends/monet5/Tests/pyloader04.sql
sql/backends/monet5/Tests/pyloader04.stable.err
sql/backends/monet5/Tests/pyloader04.stable.out
sql/backends/monet5/Tests/pyloader05.sql
sql/backends/monet5/Tests/pyloader05.stable.err
sql/backends/monet5/Tests/pyloader05.stable.out
sql/backends/monet5/Tests/pyloader06.sql
sql/backends/monet5/Tests/pyloader06.stable.err
sql/backends/monet5/Tests/pyloader06.stable.out
sql/backends/monet5/Tests/pyloader06.stable.out.32bit
sql/backends/monet5/Tests/pyloader06.stable.out.Windows
sql/backends/monet5/Tests/pyloader07.sql
sql/backends/monet5/Tests/pyloader07.stable.err
sql/backends/monet5/Tests/pyloader07.stable.out
sql/backends/monet5/Tests/pyloader07.stable.out.32bit
sql/backends/monet5/Tests/pyloader07.stable.out.Windows
sql/backends/monet5/Tests/pyloader08.sql
sql/backends/monet5/Tests/pyloader08.stable.err
sql/backends/monet5/Tests/pyloader08.stable.out
sql/backends/monet5/UDF/pyapi/50_pyapi.mal
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Tests/All
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_boolean.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_boolean.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_boolean.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_numeric_nested.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_numeric_nested.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_pandas.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_pandas.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_pandas.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_returntypes.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_returntypes.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_returntypes.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_boolean.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_boolean.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_boolean.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_numeric.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_numeric.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_numeric.stable.out
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_string.malC
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_string.stable.err
sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_string.stable.out
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/connection.h
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/conversion.h
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/formatinput.h
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/UDF/pyapi/pyapi.mal
sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat.in
sql/backends/monet5/UDF/pyapi/pyheader.h
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/UDF/pyapi/pytypes.c
sql/backends/monet5/UDF/pyapi/pytypes.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/UDF/pyapi/undef.h
sql/backends/monet5/UDF/pyapi/unicode.c
sql/backends/monet5/UDF/pyapi/unicode.h
sql/test/mapi/Tests/python2_dbapi.SQL.bat
sql/test/mapi/Tests/python2_dbapi.SQL.sh
sql/test/mapi/Tests/python2_dbapi.stable.err
sql/test/mapi/Tests/python2_dbapi.stable.out
sql/test/mapi/Tests/python2_dec38.SQL.bat
sql/test/mapi/Tests/python2_dec38.SQL.sh
sql/test/mapi/Tests/python2_dec38.stable.err
sql/test/mapi/Tests/python2_dec38.stable.out.int128
sql/test/mapi/Tests/python2_int128.SQL.bat
sql/test/mapi/Tests/python2_int128.SQL.sh
sql/test/mapi/Tests/python2_int128.stable.err
sql/test/mapi/Tests/python2_int128.stable.out.int128
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
NT/monetdb_config.h.in
NT/rules.msc
README-Debian
README-Fedora
buildtools/doc/windowsbuild.rst
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mhelp.c
configure.ag
debian/control
debian/rules
monetdb5/NT/M5server.bat
monetdb5/mal/mal_linker.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
sql/ChangeLog
sql/backends/monet5/Tests/All
sql/backends/monet5/UDF/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/UDF/pyapi3/emit3.c
sql/backends/monet5/UDF/pyapi3/formatinput3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.c
sql/backends/monet5/UDF/pyapi3/pyloader3.c
sql/backends/monet5/UDF/pyapi3/pytypes3.c
sql/backends/monet5/UDF/pyapi3/type_conversion3.c
sql/backends/monet5/UDF/pyapi3/unicode3.c
sql/backends/monet5/sql_gencode.c
sql/include/sql_catalog.h
sql/server/rel_psm.c
sql/server/sql_parser.y
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2018/Tests/All
sql/test/mapi/Tests/All
sql/test/mapi/Tests/python3_dbapi.SQL.bat
sql/test/mapi/Tests/python3_dbapi.SQL.sh
sql/test/merge-partitions/Tests/All
testing/Mfilter.py
testing/Mtest.py.in
tools/merovingian/daemon/forkmserver.c
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Removed support for Python 2.
diffs (truncated from 25580 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -85,11 +85,6 @@
%bcond_without rintegration
%endif
-# On Fedora <= 30 and RHEL 7, create the MonetDB-python2 package.
-# On RHEL 6, numpy is too old.
-%if 0%{?rhel} == 7 || %{!?fedora:1000}%{?fedora} <= 30
-%bcond_without py2integration
-%endif
%if %{?rhel:0}%{!?rhel:1}
# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
# is too old (in both cases 3.4).
@@ -159,15 +154,6 @@ BuildRequires: pkgconfig(zlib)
%if %{with samtools}
BuildRequires: samtools-devel
%endif
-%if %{with py2integration}
-BuildRequires: python-devel
-%if %{?rhel:1}%{!?rhel:0}
-# RedHat Enterprise Linux calls it simply numpy
-BuildRequires: numpy
-%else
-BuildRequires: python2-numpy
-%endif
-%endif
%if %{with py3integration}
BuildRequires: python3-devel >= 3.5
BuildRequires: python3-numpy
@@ -516,32 +502,6 @@ install it.
%{_libdir}/monetdb5/lib_rapi.so
%endif
-%if %{with py2integration}
-%package python2
-Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
-Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
-
-%description python2
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL front end.
-
-This package contains the interface to use the Python language from
-within SQL queries. This package is for Python 2.
-
-NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES. If you don't
-know how this package affects the security of your system, do not
-install it.
-
-%files python2
-%defattr(-,root,root)
-%{_libdir}/monetdb5/pyapi.*
-%{_libdir}/monetdb5/autoload/*_pyapi.mal
-%{_libdir}/monetdb5/lib_pyapi.so
-%endif
-
%if %{with py3integration}
%package python3
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
@@ -642,9 +602,6 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/lidar.mal
%endif
-%if %{with py2integration}
-%exclude %{_libdir}/monetdb5/pyapi.mal
-%endif
%if %{with py3integration}
%exclude %{_libdir}/monetdb5/pyapi3.mal
%endif
@@ -663,9 +620,6 @@ exit 0
%if %{with lidar}
%exclude %{_libdir}/monetdb5/autoload/*_lidar.mal
%endif
-%if %{with py2integration}
-%exclude %{_libdir}/monetdb5/autoload/*_pyapi.mal
-%endif
%if %{with py3integration}
%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal
%endif
@@ -967,7 +921,6 @@ export CFLAGS
--enable-netcdf=no \
--enable-odbc=yes \
--enable-profiler=no \
-
--enable-py2integration=%{?with_py2integration:yes}%{!?with_py2integration:no} \
--enable-py3integration=%{?with_py3integration:yes}%{!?with_py3integration:no} \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sanitizer=no \
@@ -986,7 +939,6 @@ export CFLAGS
--with-openssl=yes \
--with-proj=no \
--with-pthread=yes \
- --with-python2=%{?with_py2integration:yes}%{!?with_py2integration:no} \
--with-python3=yes \
--with-readline=yes \
--with-regex=%{?with_pcre:PCRE}%{!?with_pcre:POSIX} \
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -51,7 +51,6 @@ def main():
extend = []
debug = []
geom = []
- pyapi2 = []
pyapi3 = []
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
@@ -85,14 +84,6 @@ def main():
print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
- print(r' <Property Id="PYAPI2EXISTS">')
- print(r' <DirectorySearch Id="CheckFileDir4" Path="[INSTALLDIR]"
Depth="0">')
- print(r' <FileSearch Id="CheckFile4"
Name="pyapi_locatepython.bat"/>')
- print(r' </DirectorySearch>')
- print(r' <DirectorySearch Id="CheckFileDir42" Path="[INSTALLDIR]"
Depth="0">')
- print(r' <FileSearch Id="CheckFile42"
Name="pyapi_locatepython2.bat"/>')
- print(r' </DirectorySearch>')
- print(r' </Property>')
print(r' <Property Id="PYAPI3EXISTS">')
print(r' <DirectorySearch Id="CheckFileDir5" Path="[INSTALLDIR]"
Depth="0">')
print(r' <FileSearch Id="CheckFile5"
Name="pyapi_locatepython3.bat"/>')
@@ -181,8 +172,6 @@ def main():
[r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5', 'autoload'))))])
id = comp(geom, id, 18,
[r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('.mal') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
- id = comp(pyapi2, id, 18,
- [r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('_pyapi.mal'),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
id = comp(pyapi3, id, 18,
[r'lib\monetdb5\autoload\{}'.format(x) for x in
sorted(filter(lambda x: x.endswith('_pyapi3.mal'),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5', 'autoload'))))])
print(r' </Directory>')
@@ -202,9 +191,6 @@ def main():
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(geom, id, 16,
[r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
- id = comp(pyapi2, id, 16,
- [r'lib\monetdb5\pyapi.mal',
- r'lib\monetdb5\lib_pyapi.dll'])
id = comp(pyapi3, id, 16,
[r'lib\monetdb5\pyapi3.mal',
r'lib\monetdb5\lib_pyapi3.dll'])
@@ -240,8 +226,6 @@ def main():
r'M5server.bat',
r'msqldump.bat',
r'stethoscope.bat'])
- id = comp(pyapi2, id, 12,
- [r'pyapi_locatepython2.bat'])
id = comp(pyapi3, id, 12,
[r'pyapi_locatepython3.bat'])
id = comp(features, id, 12,
@@ -272,11 +256,6 @@ def main():
print(r' <ComponentRef Id="{}"/>'.format(f))
print(r' <MergeRef Id="VCRedist"/>')
print(r' </Feature>')
- print(r' <Feature Id="PyAPI2" Level="1000" AllowAdvertise="no"
Absent="allow" Title="Include embedded Python 2" Description="Files required
for using embedded Python 2.">')
- for f in pyapi2:
- print(r' <ComponentRef Id="{}"/>'.format(f))
- print(r' <Condition Level="1">PYAPI2EXISTS</Condition>')
- print(r' </Feature>')
print(r' <Feature Id="PyAPI3" Level="1000" AllowAdvertise="no"
Absent="allow" Title="Include embedded Python 3" Description="Files required
for using embedded Python 3.">')
for f in pyapi3:
print(r' <ComponentRef Id="{}"/>'.format(f))
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -258,9 +258,6 @@
/* #undef HAVE_LIBPTHREAD */
/* Define if we can link to python */
-/* #undef HAVE_LIBPY2 */
-
-/* Define if we can link to python */
/* #undef HAVE_LIBPY3 */
/* Define if you have libR installed */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -65,16 +65,6 @@ ODBCINST_LIBS = odbccp32.lib user32.lib
ODBC_LIBS = odbc32.lib
!IFNDEF PY3VER
-PY2VER=7
-!ENDIF
-!IFNDEF PYTHON2BASE
-PYTHON2BASE=C:\Python2$(PY2VER)
-!ENDIF
-!IFNDEF PYTHON2LIB
-PYTHON2LIB=python2$(PY2VER).lib
-!ENDIF
-
-!IFNDEF PY3VER
PY3VER=7
!ENDIF
!IFNDEF PYTHON3BASE
@@ -181,11 +171,6 @@ R.lib: "$(libr_DLL)"
lib /machine:$(BITSMCHN) /def:R.def /out:R.lib
!ENDIF
-!IFDEF HAVE_LIBPY2
-libpy2_LIBS = "$(PYTHON2DIR)\libs\$(PYTHON2LIB)"
-libpy2_CFLAGS = -DHAVE_LIBPY2 "-I$(PYTHON2DIR)\include"
"-I$(PYTHON2DIR)\Lib\site-packages\numpy\core\include"
-!ENDIF
-
!IFDEF HAVE_LIBPY3
libpy3_LIBS = "$(PYTHON3DIR)\libs\$(PYTHON3LIB)"
libpy3_CFLAGS = -DHAVE_LIBPY3 "-I$(PYTHON3DIR)\include"
"-I$(PYTHON3DIR)\Lib\site-packages\numpy\core\include"
@@ -327,11 +312,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_LIBLZMA_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_LIBPY2
- $(ECHO) HAVE_LIBPY2_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_LIBPY2_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_LIBPY3
$(ECHO) HAVE_LIBPY3_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -422,9 +402,7 @@ CONFIGURE="$(PYTHON)" $(CONFIGURE_PY) \
"PACKAGE=$(pkg)" \
"PYTHON=$(PYTHON)" \
"PYTHON_LIBDIR=$(PYTHON_LIBDIR)" \
- "PY2VER=$(PY2VER)" \
"PY3VER=$(PY3VER)" \
- "PYTHON2=$(PYTHON2)" \
"PYTHON3=$(PYTHON3)" \
"TOPDIR=$(TOPDIR)" \
"VERSION=$(VERSION)" \
diff --git a/README-Debian b/README-Debian
--- a/README-Debian
+++ b/README-Debian
@@ -24,8 +24,8 @@ liblas-c-dev # optional: read LIDAR fil
liblzma-dev # optional: read and write .xz compressed files
libpcre3-dev # optional: use PCRE library, enable some functions
libreadline-dev # optional, enable editing in mclient
-python-dev # optional, needed for Python 2 integration
-python-numpy # optional, needed for Python 2 integration
+python3-dev # optional, needed for Python 3 integration
+python3-numpy # optional, needed for Python 3 integration
r-base # optional, needed for R integration
unixodbc-dev # optional, needed for ODBC driver
uuid-dev # optional
@@ -36,5 +36,3 @@ These packages are optional.
libcfitsio-dev # optional: read FITS files
liblz4-dev # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
libsnappy-dev # optional: compression in new (unused) MAPI protocol
-python3-dev # optional, needed for Python 3 integration
-python3-numpy # optional, needed for Python 3 integration
diff --git a/README-Fedora b/README-Fedora
--- a/README-Fedora
+++ b/README-Fedora
@@ -21,8 +21,8 @@ geos-devel # optional: required for geo
libcurl-devel # optional: read remote files with sys.getcontent(url)
libuuid-devel # optional
pcre-devel # optional: use PCRE library, enable some functions
-python2-devel # optional, needed for Python 2 integration
-python2-numpy # optional, needed for Python 2 integration
+python3-devel # optional, needed for Python 3 integration
+python3-numpy # optional, needed for Python 3 integration
R-core-devel # optional, needed for R integration
readline-devel # optional, enable editing in mclient
rpm-build # optional, required to create RPMs (make rpm)
@@ -38,7 +38,5 @@ liblas-devel # optional: read LIDAR fil
lz4-devel # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
netcdf-devel # optional: read NetCDF files
proj-devel # optional, only optionally used in geom module
-python3-devel # optional, needed for Python 3 integration
-python3-numpy # optional, needed for Python 3 integration
snappy-devel # optional: compression in new (unused) MAPI protocol
valgrind-devel # optional: --with-valgrind configuration (debug)
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -113,7 +113,7 @@ are on their website__.
We have installed the following programs using Chocolatey_::
choco install ActivePerl ant cmake ruby
- choco install python2 python2-x86_32 python3 python3-x86_32
+ choco install python3 python3-x86_32
.. _Chocolatey: https://chocolatey.org/
@@ -185,16 +185,16 @@ Windows binary distribution.
.. Say something about py2integration.
-Note that you can use either or both Python2 and Python3, and on 64
-bit architectures, either the 32 bit or 64 bit version of Python. All
-these versions are fine for building the MonetDB suite. It is
-possible to install all versions. Using Chocolatey_ you can do::
+Note that on 64 bit architectures you can use either the 32 bit or 64
+bit version of Python. All these versions are fine for building the
+MonetDB suite. It is possible to install all versions. Using
+Chocolatey_ you can do::
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
