switch to GH for pdi main

pdidev · Dec 5, 2024 · 28f0f17 · 28f0f17
1 parent 68ed5e6
commit 28f0f17
Show file tree

Hide file tree

Showing 46 changed files with 172 additions and 371 deletions.
diff --git a/build.conf b/build.conf
@@ -29,24 +29,24 @@ packages:
     paraconf:
         orig: "https://github.com/pdidev/paraconf/archive/{upstream_version}.tar.gz"
     pdi:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdidev-archive-keyring:
         disable: { fedora: all }
     pdiplugin-decl-hdf5:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-decl-netcdf:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-mpi:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-pycall:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-serialize:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-set-value:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-trace:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     pdiplugin-user-code:
-        orig: "https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/master/pdi-master.tar.bz2"
+        orig: "https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz"
     zpp:
         orig: "https://github.com/jbigot/zpp/archive/{upstream_version}.tar.gz"
diff --git a/paraconf/debian/control b/paraconf/debian/control
@@ -3,7 +3,7 @@ Section: libdevel
 Priority: optional
 Maintainer: Julien Bigot <[email protected]>
 Build-Depends: debhelper (>= 11), dh-exec,
-  dh-fortran-mod <!bionic>,
+  dh-fortran-mod,
   cmake (>= 3.5),
   gfortran | fortran-compiler,
   libyaml-dev,
@@ -30,9 +30,10 @@ Description: provide a simple query language to access a Yaml tree on top of lib
 Package: libparaconf-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${Fortran-Mod},
+  cmake (>= 3.5),
   libparaconf-f90.1 (= ${binary:Version}),
-  libyaml-dev
-Recommends: cmake (>= 3.5), pkg-config
+  libyaml-dev,
+  pkg-config
 Description: Development files for libparaconf
  The libparaconf-dev package contains C/C++/F90 header files for developing
  applications that use libparaconf.
diff --git a/paraconf/debian/libparaconf-dev.install b/paraconf/debian/libparaconf-dev.install
@@ -3,4 +3,3 @@
 usr/lib/*/*.so
 usr/include/*
 usr/share/paraconf/cmake/*
-usr/lib/*/fortran/*/*.mod <bionic>
diff --git a/paraconf/debian/rules b/paraconf/debian/rules
@@ -4,14 +4,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-ifeq (,$(filter bionic, $(DEB_BUILD_PROFILES)))
-	DHFLAGS += --with fortran_mod
-endif
 FC := $(shell basename $(shell readlink -f /usr/bin/gfortran))
 FMODDIR := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/fortran/$(FC)
 
 %:
-	dh $@ --parallel $(DHFLAGS)
+	dh $@ --parallel --with fortran_mod
 
 override_dh_auto_configure:
 	dh_auto_configure --parallel -D paraconf -- \

diff --git a/pdi/debian/changelog b/pdi/debian/changelog
@@ -1,8 +1,8 @@
-pdi (1721576760master-1) unstable devel; urgency=medium
+pdi (1721576760main-1) unstable devel; urgency=medium
 
-  * Upstream release master
+  * Upstream release main
 
- -- Pending release on master <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
+ -- Pending release on main <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
 
 pdi (1.7.1-1) unstable devel; urgency=medium
 

diff --git a/pdi/debian/control b/pdi/debian/control
@@ -3,20 +3,15 @@ Section: libs
 Priority: optional
 Maintainer: Julien Bigot <[email protected]>
 Build-Depends: debhelper (>= 11), dh-exec, dh-python,
-  dh-fortran-mod <!bionic>,
-  cmake (>= 3.10),
+  dh-fortran-mod,
+  cmake (>= 3.16.3),
   gfortran | fortran-compiler,
-  libbenchmark-dev (>= 1.5) <!bionic !buster !nocheck>,
-  libgmock-dev (>= 1.8) <!bionic !nocheck>,
-  libgtest-dev (>= 1.8) <!bionic !nocheck>,
-  libparaconf-dev (>= 0.4.16),
+  libparaconf-dev (>= 1.0.0),
   libspdlog-dev (>= 1:1.5.0),
-  pkg-config,
-  pybind11-dev (>= 2.3.0),
-  python3-dev (>= 3.6.5),
-  python3-numpy (>= 1.13.3),
-  python3-setuptools,
-  zpp (>= 1.0.15)
+  pybind11-dev (>= 2.4.3),
+  python3-dev (>= 3.8.2),
+  python3-numpy (>= 1.17.4),
+  python3-setuptools
 Standards-Version: 4.5.0
 Homepage: https://pdi.julien-bigot.fr/
 
@@ -65,11 +60,12 @@ Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${Fortran-Mod},
   libpdi-f90.1 (= ${binary:Version}),
   python3-pdi (= ${binary:Version}),
-  libparaconf-dev (>= 0.4.16),
-  libspdlog-dev (>= 1.3.1),
-  pybind11-dev (>= 2.3.0),
-  python3-dev (>= 3.5),
-  python3-numpy
+  libparaconf-dev (>= 1.0.0),
+  libspdlog-dev (>= 1:1.5.0),
+  pybind11-dev (>= 2.4.3),
+  python3-dev (>= 3.8.2),
+  python3-numpy (>= 1.17.4),
+  python3-setuptools
 Recommends: cmake, pkg-config, pdiplugin-all
 Description: Development files for PDI
  The pdi-dev package contains C/C++/Fortran header files for developing

diff --git a/pdi/debian/libpdi-dev.install b/pdi/debian/libpdi-dev.install
@@ -2,4 +2,3 @@
 usr/include/*
 usr/lib/*/*.so
 usr/share/pdi/cmake/*
-usr/lib/*/fortran/*/*.mod <bionic>
diff --git a/pdi/debian/rules b/pdi/debian/rules
@@ -4,31 +4,22 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 include /usr/share/dpkg/architecture.mk
-ifneq (,$(filter buster, $(DEB_BUILD_PROFILES)))
-	CMAKEFLAGS += -DBUILD_BENCHMARKING=OFF
-endif
-ifneq (,$(filter bionic, $(DEB_BUILD_PROFILES)))
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
 	CMAKEFLAGS += -DBUILD_TESTING=OFF -DBUILD_BENCHMARKING=OFF
-	DHFLAGS += --with python3
-else
-	ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-		CMAKEFLAGS += -DBUILD_TESTING=OFF -DBUILD_BENCHMARKING=OFF
-	endif
-	DHFLAGS += --with python3,fortran_mod
 endif
 FC := $(shell basename $(shell readlink -f /usr/bin/gfortran))
 FMODDIR := /usr/lib/$(DEB_HOST_MULTIARCH)/fortran/$(FC)
 PKG_VERSION := $(shell dpkg-parsechangelog -S version | sed 's/-.*//')
 
 %:
-	dh $@ --parallel $(DHFLAGS)
+	dh $@ --parallel --with python3,fortran_mod
 
 override_dh_auto_configure:
 	dh_auto_configure --parallel -D pdi -- \
 		-DBUILD_DOCUMENTATION=OFF \
 		-DBUILD_PYTHON=ON \
-		-DPython3_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_BUILD_TYPE=Release \
 		"-DINSTALL_FMODDIR=$(FMODDIR)" \
 		-DINSTALL_PDIPLUGINDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pdi/plugins_$(PKG_VERSION)/ \
-		$(CMAKEFLAGS) \
-		-DCMAKE_BUILD_TYPE=Release
+		-DPython3_EXECUTABLE=/usr/bin/python3 \
+		$(CMAKEFLAGS)
diff --git a/pdi/pdi.spec b/pdi/pdi.spec
@@ -1,16 +1,15 @@
 %define _sover  1
 Name:           pdi
-Version:        master
+Version:        main
 Release:        0
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Summary:        the PDI Data Interface
-Url:            https://gitlab.maisondelasimulation.fr/pdidev/pdi
-Source0:        https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/%{version}/pdi-%{version}.tar.bz2
-BuildRequires:  gcc, gcc-c++, gcc-gfortran, make, cmake >= 3.10
-BuildRequires:  zpp >= 1.0.15, paraconf-devel >= 1.0.0, spdlog-devel >= 1.5
-BuildRequires:  pybind11-devel >= 2.3, python3-devel >= 3.6.5, python3-numpy >= 1.13.3
-BuildRequires:  gtest-devel >= 1.8.0, gmock-devel >= 1.8.0, google-benchmark-devel >= 1.5.0
+Url:            https://github.com/pdidev/pdi
+Source0:        https://github.com/pdidev/pdi/archive/refs/heads/%{version}.tar.gz
+BuildRequires:  gcc, gcc-c++, gcc-gfortran, make, cmake >= 3.16.3
+BuildRequires:  paraconf-devel >= 1.0.0, spdlog-devel >= 1.5.0
+BuildRequires:  pybind11-devel >= 2.4.3, python3-devel >= 3.8.2, python3-numpy >= 1.17.4
 BuildRequires:  python3-setuptools
 
 %description
@@ -22,10 +21,11 @@ Summary:        Development files for %{name}
 Requires:       gcc-gfortran%{_isa}
 Requires:       lib%{name}-f90.%{_sover}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       paraconf-devel >= 1.0.0
-Requires:       pybind11-devel >= 2.3.0
+Requires:       pybind11-devel >= 2.4.3
 Requires:       python3-%{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       python3-devel >= 3.5, python3-numpy
-Requires:       spdlog-devel >= 1.3.1
+Requires:       python3-devel >= 3.8.2, python3-numpy >= 1.17.4
+Requires:       spdlog-devel >= 1.5.0
+Requires:       python3-setuptools
 
 %description devel
 The %{name}-devel package contains C/C++ header files for developing
@@ -115,8 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitearch}/pdi/*
 
 %changelog
-* Sun Jul 21 2024 - Pending release on master <[email protected]>
-- Upstream release master
+* Sun Jul 21 2024 - Pending release on main <[email protected]>
+- Upstream release main
 * Sun Jul 21 2024 - Julien Bigot <[email protected]>
 - Upstream release 1.7.1
 * Thu Mar 09 2023 - Julien Bigot <[email protected]>

diff --git a/pdiplugin-decl-hdf5/debian/changelog b/pdiplugin-decl-hdf5/debian/changelog
@@ -1,8 +1,8 @@
-pdiplugin-decl-hdf5 (1721576760master-1) unstable devel; urgency=medium
+pdiplugin-decl-hdf5 (1721576760main-1) unstable devel; urgency=medium
 
-  * Upstream release master
+  * Upstream release main
 
- -- Pending release on master <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
+ -- Pending release on main <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
 
 pdiplugin-decl-hdf5 (1.7.1-1) unstable devel; urgency=medium
 

diff --git a/pdiplugin-decl-hdf5/debian/control b/pdiplugin-decl-hdf5/debian/control
@@ -3,21 +3,16 @@ Section: libs
 Priority: optional
 Maintainer: Julien Bigot <[email protected]>
 Build-Depends: debhelper (>= 11),
-  cmake (>= 3.10),
-  libbenchmark-dev (>= 1.5) <!bionic !buster !nocheck>,
-  libgmock-dev (>= 1.8) <!bionic !nocheck>,
-  libgtest-dev (>= 1.8) <!bionic !nocheck>,
-  libhdf5-dev (>= 1.10),
-  libhdf5-mpich-dev (>= 1.10),
-  libhdf5-openmpi-dev (>= 1.10),
+  cmake (>= 3.16.3),
+  libhdf5-dev (>= 1.10.4),
+  libhdf5-mpich-dev (>= 1.10.4),
+  libhdf5-openmpi-dev (>= 1.10.4),
   libpdi-dev,
   mpi-default-dev,
   mpich <!nocheck>,
   openmpi-bin <!nocheck>,
   pdiplugin-mpi-mpich <!nocheck>,
-  pdiplugin-mpi-openmpi <!nocheck>,
-  pkg-config,
-  python3-setuptools
+  pdiplugin-mpi-openmpi <!nocheck>
 Standards-Version: 4.5.0
 Homepage: https://pdi.julien-bigot.fr/
 

diff --git a/pdiplugin-decl-hdf5/debian/rules b/pdiplugin-decl-hdf5/debian/rules
@@ -9,18 +9,7 @@ include /usr/share/mpi-default-dev/debian_defaults
 PKG_VERSION := $(shell dpkg-parsechangelog -S version | sed 's/-.*//')
 FLAVORS = $(shell dh_listpackages | grep '^pdiplugin-decl-hdf5-' | sed 's/^pdiplugin-decl-hdf5-//')
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-	DISABLED_TESTS_FLAVOR = $(FLAVORS)
-else
-ifneq (,$(filter buster bionic, $(DEB_BUILD_PROFILES)))
-	# openmpi < 4.0.2 does not support running as root
-	DISABLED_TESTS_FLAVOR = openmpi
-else
-	DISABLED_TESTS_FLAVOR = no_flavor
-endif
-endif
-DISABLED_BENCHS_FLAVOR = $(DISABLED_TESTS_FLAVOR)
-ifneq (,$(filter buster, $(DEB_BUILD_PROFILES)))
-	DISABLED_BENCHS_FLAVOR = $(FLAVORS)
+	CMAKEFLAGS += -DBUILD_TESTING=OFF -DBUILD_BENCHMARKING=OFF
 endif
 
 
@@ -38,19 +27,16 @@ override_dh_auto_configure:
 	do  \
 		H5CC="$$(printf 'h5pcc.%s' "$${FLAVOR}" | sed -e 's/h5pcc.serial/h5cc/' )" ;\
 		BUILD_HDF5_PARALLEL=$$([ "$${FLAVOR}" = serial ] && echo OFF || echo ON ) ;\
-		BUILD_TESTING=OFF; echo "$(DISABLED_TESTS_FLAVOR)" | fgrep "$${FLAVOR}" || BUILD_TESTING=ON; \
-		BUILD_BENCHMARKING=OFF; echo "$(DISABLED_BENCHS_FLAVOR)" | fgrep "$${FLAVOR}" || BUILD_BENCHMARKING=ON; \
 		dh_auto_configure -Bbuild-$${FLAVOR} -ppdiplugin-decl-hdf5-$${FLAVOR} -- \
-			-DBUILD_BENCHMARKING=$${BUILD_BENCHMARKING} \
 			-DBUILD_HDF5_PARALLEL=$${BUILD_HDF5_PARALLEL} \
-			-DBUILD_TESTING=$${BUILD_TESTING} \
 			-DHDF5_C_COMPILER_EXECUTABLE=/usr/bin/$${H5CC} \
 			-DINSTALL_PDIPLUGINDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pdi/plugins_$(PKG_VERSION)/$${FLAVOR} \
 			-DCMAKE_BUILD_TYPE=Release \
 			-DMPI_C_COMPILER=mpicc.$${FLAVOR} \
 			-DMPI_CXX_COMPILER=mpicxx.$${FLAVOR} \
 			-DMPI_Fortran_COMPILER=mpif90.$${FLAVOR} \
-			-DMPIEXEC_EXECUTABLE=/usr/bin/mpiexec.$${FLAVOR} ;\
+			-DMPIEXEC_EXECUTABLE=/usr/bin/mpiexec.$${FLAVOR} \
+			$(CMAKEFLAGS) ;\
 	done
 
 override_dh_auto_build:

diff --git a/pdiplugin-decl-hdf5/pdiplugin-decl-hdf5.spec b/pdiplugin-decl-hdf5/pdiplugin-decl-hdf5.spec
@@ -1,15 +1,13 @@
 Name:           pdiplugin-decl-hdf5
-Version:        master
+Version:        main
 Release:        0
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Summary:        Decl'HDF5 plugin for the PDI Data Interface
-Url:            https://gitlab.maisondelasimulation.fr/pdidev/pdi
-Source0:        https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/%{version}/pdi-%{version}.tar.bz2
-BuildRequires:  gcc, gcc-c++, make, cmake >= 3.10
-BuildRequires:  pdi-devel = %{version}, hdf5-devel >= 1.10
-BuildRequires:  gtest-devel >= 1.8.0, gmock-devel >= 1.8.0, google-benchmark-devel >= 1.5.0
-BuildRequires:  python3-setuptools
+Url:            https://github.com/pdidev/pdi
+Source0:        https://github.com/pdidev/pdi/archive/refs/heads/%{version}.tar.gz
+BuildRequires:  gcc, gcc-c++, make, cmake >= 3.16.3
+BuildRequires:  pdi-devel = %{version}, hdf5-devel >= 1.10.4
 
 %description
 The Decl'HDF5 PDI plugin enables one to read and write data from HDF5 files in a
@@ -18,7 +16,7 @@ a simple declarative interface to access a large subset of it.
 
 %package openmpi
 Summary: Decl'HDF5 plugin for the PDI Data Interface, OpenMPI version
-BuildRequires:  hdf5-openmpi-devel >= 1.10
+BuildRequires:  hdf5-openmpi-devel >= 1.10.4
 
 %description openmpi
 The Decl'HDF5 PDI plugin enables one to read and write data from HDF5 files in a
@@ -27,7 +25,7 @@ a simple declarative interface to access a large subset of it.
 
 %package mpich
 Summary: Decl'HDF5 plugin for the PDI Data Interface, MPich version
-BuildRequires:  hdf5-mpich-devel >= 1.10
+BuildRequires:  hdf5-mpich-devel >= 1.10.4
 
 %description mpich
 The Decl'HDF5 PDI plugin enables one to read and write data from HDF5 files in a
@@ -104,8 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mpich/lib/pdi/*/lib*.so
 
 %changelog
-* Sun Jul 21 2024 - Pending release on master <[email protected]>
-- Upstream release master
+* Sun Jul 21 2024 - Pending release on main <[email protected]>
+- Upstream release main
 * Sun Jul 21 2024 - Julien Bigot <[email protected]>
 - Upstream release 1.7.1
 * Thu Mar 09 2023 - Julien Bigot <[email protected]>

diff --git a/pdiplugin-decl-netcdf/debian/changelog b/pdiplugin-decl-netcdf/debian/changelog
@@ -1,8 +1,8 @@
-pdiplugin-decl-netcdf (1721576760master-1) unstable devel; urgency=medium
+pdiplugin-decl-netcdf (1721576760main-1) unstable devel; urgency=medium
 
-  * Upstream release master
+  * Upstream release main
 
- -- Pending release on master <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
+ -- Pending release on main <[email protected]>  Sun, 21 Jul 2024 17:46:00 +0200
 
 pdiplugin-decl-netcdf (1.7.1-1) unstable devel; urgency=medium