Merge branch 'develop' into wipe-changes

Author: ChrisspyB

.gitignore

@@ -14,3 +14,5 @@ launch.json
 compile_commands.json
 
 __pycache__/
+
+*.swp

cmake/z3fdb_setup.cfg.in

@@ -0,0 +1,7 @@
+[metadata]
+description = "z3fdb"
+# TODO replace with file: README.md
+long_description = "Z3FDB is a custom Zarr v3 Store connecting to FDB" 
+long_description_content_type = text/markdown
+# TODO consider replacing with file: AUTHORS, possibly after updating that file
+author = "European Centre for Medium-Range Weather Forecasts"

cmake/z3fdb_setup.py.in

@@ -1,8 +1,28 @@
+import os
 from setuptools import setup
+import platform
+from wheel.bdist_wheel import bdist_wheel
+import sys
+
+
+# NOTE this we need to correctly link with fdb5lib version on cd. For local builds feel free to ignore
+version_suffix = os.environ.get("VERSION_SUFFIX", "")
+
+# NOTE see ci-utils/wheelmaker/buildscripts/setup_utils, we need to get the right abi compat tag
+class bdist_wheel_ext(bdist_wheel):
+    def get_tag(self):
+        python, abi, plat = bdist_wheel.get_tag(self)
+        return python, abi, f"manylinux_2_28_{platform.machine()}"
+
+ext_kwargs = {
+    'darwin': {},
+    'linux': {"cmdclass": {"bdist_wheel": bdist_wheel_ext}},
+}
+
 
 setup(
     name="z3fdb",
-    version="@fdb5_VERSION_STR@",
+    version=f"@fdb5_VERSION_STR@{version_suffix}",
     packages=[
         "z3fdb",
         "z3fdb._internal",
@@ -12,6 +32,7 @@ setup(
     package_data={
         "chunked_data_view_bindings": ["*.so", "*.pyd"],
     },
-    install_requires=["numpy", "zarr>=3,<4", "findlibs"],
+    install_requires=["numpy", "zarr>=3,<4", "findlibs>=0.1.2", f"fdb5lib==@fdb5_VERSION_STR@{version_suffix}"],
     has_ext_modules=lambda: True,
+    **ext_kwargs[sys.platform],
 )

python/fdb5lib/buildconfig

@@ -12,6 +12,6 @@
 
 NAME="fdb"
 # TODO no idea why I cant get it to compile with grib=1
-CMAKE_PARAMS="-Deckit_ROOT=/tmp/fdb/prereqs/eckitlib -Dmetkit_ROOT=/tmp/fdb/prereqs/metkitlib -Deccodes_ROOT=/tmp/fdb/prereqs/eccodeslib -DENABLE_GRIB=0"
+CMAKE_PARAMS="-Deckit_ROOT=/tmp/fdb/prereqs/eckitlib -Dmetkit_ROOT=/tmp/fdb/prereqs/metkitlib -Deccodes_ROOT=/tmp/fdb/prereqs/eccodeslib -DENABLE_GRIB=0 -DENABLE_PYTHON_ZARR_INTERFACE=1"
 PYPROJECT_DIR="python/fdb5lib"
 DEPENDENCIES='["eckitlib", "eccodeslib", "metkitlib"]'

src/CMakeLists.txt

@@ -26,6 +26,11 @@ if (HAVE_PYTHON_ZARR_INTERFACE)
         ${Z3FDB_STAGING}/setup.py
         @ONLY
     )
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/z3fdb_setup.cfg.in
+        ${Z3FDB_STAGING}/setup.cfg
+        @ONLY
+    )
     add_subdirectory(chunked_data_view_bindings)
     set(_z3fdb_package_files
         "z3fdb/simple_store_builder.py"

src/fdb5/toc/TocHandler.cc

@@ -218,29 +218,6 @@ bool TocHandler::exists() const {
     return tocPath_.exists();
 }
 
-void TocHandler::checkUID() const {
-    static bool fdbOnlyCreatorCanWrite = eckit::Resource<bool>("fdbOnlyCreatorCanWrite", true);
-    if (!fdbOnlyCreatorCanWrite) {
-        return;
-    }
-
-    static std::vector<std::string> fdbSuperUsers =
-        eckit::Resource<std::vector<std::string>>("fdbSuperUsers", "", true);
-
-    if (dbUID() != userUID_) {
-
-        if (std::find(fdbSuperUsers.begin(), fdbSuperUsers.end(), userName(userUID_)) == fdbSuperUsers.end()) {
-
-            std::ostringstream oss;
-            oss << "Only user '" << userName(dbUID())
-
-                << "' can write to FDB " << directory_ << ", current user is '" << userName(userUID_) << "'";
-
-            throw eckit::UserError(oss.str());
-        }
-    }
-}
-
 void TocHandler::openForAppend() {
 
     checkUID();  // n.b. may openForRead

src/fdb5/toc/TocHandler.h

@@ -115,7 +115,6 @@ class TocHandler : public TocCommon {
     ~TocHandler() override;
 
     bool exists() const;
-    void checkUID() const override;
 
     void writeInitRecord(const Key& tocKey);
     void writeClearRecord(const Index&);