Changeset: 7e498e05c870 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7e498e05c870
Modified Files:
MonetDB.spec
sql/test/rel-optimizers/Tests/All
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (51 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -490,8 +490,6 @@ Provides: MonetDB5-server-hugeint%{?_isa
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
-# versions up to 1.0.5 don't accept the queryid field in the result set
-Conflicts: python-pymonetdb < 1.0.6
Requires(pre): systemd
%description -n MonetDB5-server
@@ -700,7 +698,7 @@ package. You probably don't need this,
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
Requires: %{name}-client-tests = %{version}-%{release}
-Requires: python3dist(pymonetdb) >= 1.0.6
+Requires: python3dist(pymonetdb)
BuildArch: noarch
%description testing-python
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 12), cmake
unixodbc-dev, zlib1g-dev, r-base-dev,
libcfitsio-dev, libssl-dev (>= 1.1.1)
Standards-Version: 3.8.0
-X-Python-Version: >= 2.6
Package: libmonetdb27
Architecture: any
@@ -186,8 +185,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
libmonetdb27 (= ${source:Version}),
Recommends: monetdb5-sql (= ${source:Version})
Suggests: monetdb-client (= ${source:Version})
-Conflicts: monetdb5-server-hugeint (<< 11.38.0),
- python-pymonetdb (<< 1.0.6)
+Conflicts: monetdb5-server-hugeint (<< 11.38.0)
Replaces: monetdb5-server-hugeint (<< 11.38.0)
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
@@ -327,7 +325,7 @@ Description: MonetDB embedded testing to
Package: monetdb-testing-python
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
- python3-pymonetdb (>= 1.0.6),
+ python3-pymonetdb,
monetdb-client-testing (= ${source:Version})
Description: MonetDB testing Python programs
MonetDB is a database management system that is developed from a
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
