From 83773b8784193e3435483a31be020da4e58424e6 Mon Sep 17 00:00:00 2001
From: Vojta Tuma <vojta.tuma@gmail.com>
Date: Mon, 3 Mar 2025 13:47:49 +0100
Subject: [PATCH] Python wheel: reorg

---
 .github/workflows/build-wheel-wrapper.yml              |  4 +++-
 {python_wrapper => python/atlaslib-ecmwf}/buildconfig  |  2 +-
 .../atlaslib-ecmwf}/post-build.sh                      |  0
 .../atlaslib-ecmwf}/post-compile.sh                    |  0
 .../atlaslib-ecmwf}/pre-compile.sh                     | 10 +++++-----
 {python_wrapper => python/atlaslib-ecmwf}/setup.cfg    |  0
 {python_wrapper => python/atlaslib-ecmwf}/setup.py     |  0
 7 files changed, 9 insertions(+), 7 deletions(-)
 rename {python_wrapper => python/atlaslib-ecmwf}/buildconfig (95%)
 rename {python_wrapper => python/atlaslib-ecmwf}/post-build.sh (100%)
 rename {python_wrapper => python/atlaslib-ecmwf}/post-compile.sh (100%)
 rename {python_wrapper => python/atlaslib-ecmwf}/pre-compile.sh (75%)
 rename {python_wrapper => python/atlaslib-ecmwf}/setup.cfg (100%)
 rename {python_wrapper => python/atlaslib-ecmwf}/setup.py (100%)

diff --git a/.github/workflows/build-wheel-wrapper.yml b/.github/workflows/build-wheel-wrapper.yml
index 151ab02ac..f5212e49d 100644
--- a/.github/workflows/build-wheel-wrapper.yml
+++ b/.github/workflows/build-wheel-wrapper.yml
@@ -21,5 +21,7 @@ on:
 jobs:
   python-wrapper-wheel:
     name: Python Wrapper Wheel
-    uses: ecmwf-actions/reusable-workflows/.github/workflows/python-wrapper-wheel.yml@act/pyWrapWheel/dockerUser
+    uses: ecmwf/reusable-workflows/.github/workflows/python-wrapper-wheel.yml@act/pyWrapWheel/dockerUser
+    with: 
+      wheel_directory: python/atlaslib-ecmwf
     secrets: inherit
diff --git a/python_wrapper/buildconfig b/python/atlaslib-ecmwf/buildconfig
similarity index 95%
rename from python_wrapper/buildconfig
rename to python/atlaslib-ecmwf/buildconfig
index 3c0e54650..466aa7dea 100644
--- a/python_wrapper/buildconfig
+++ b/python/atlaslib-ecmwf/buildconfig
@@ -12,5 +12,5 @@
 
 NAME="atlas"
 CMAKE_PARAMS="-Deckit_ROOT=/tmp/atlas/prereqs/eckitlib -DQhull_ROOT=/tmp/qhull/target -DENABLE_TESSELATION=1"
-PYPROJECT_DIR="python_wrapper"
+PYPROJECT_DIR="python/atlaslib-ecmwf"
 DEPENDENCIES='["eckitlib"]'
diff --git a/python_wrapper/post-build.sh b/python/atlaslib-ecmwf/post-build.sh
similarity index 100%
rename from python_wrapper/post-build.sh
rename to python/atlaslib-ecmwf/post-build.sh
diff --git a/python_wrapper/post-compile.sh b/python/atlaslib-ecmwf/post-compile.sh
similarity index 100%
rename from python_wrapper/post-compile.sh
rename to python/atlaslib-ecmwf/post-compile.sh
diff --git a/python_wrapper/pre-compile.sh b/python/atlaslib-ecmwf/pre-compile.sh
similarity index 75%
rename from python_wrapper/pre-compile.sh
rename to python/atlaslib-ecmwf/pre-compile.sh
index cde21a31d..9432d963e 100755
--- a/python_wrapper/pre-compile.sh
+++ b/python/atlaslib-ecmwf/pre-compile.sh
@@ -2,8 +2,8 @@
 
 # the procedure for adding a new ext dependency to be bundled in here:
 # - add git checkout, compile, etc
-# - ensure the version ends up in python_wrapper/src/versions.txt
-# - ensure the licence ends up in python_wrapper/src/copying/, and fname is referenced in copying/list.json
+# - ensure the version ends up in python/atlaslib-ecmwf/src/versions.txt
+# - ensure the licence ends up in python/atlaslib-ecmwf/src/copying/, and fname is referenced in copying/list.json
 # - ensure the .so ends up in target/lib64/ with the expected libname
 # - validate that the resulting wheel contains all the above
 # additionally, make sure this script is aligned with /buildscripts/compile.sh and /buildscripts/wheel-linux.sh,
@@ -11,7 +11,7 @@
 
 set -euo pipefail
 
-mkdir -p python_wrapper/src/copying
+mkdir -p python/atlaslib-ecmwf/src/copying
 
 bash ./tools/install-qhull.sh --prefix /tmp/qhull/target
 # copy the libs, instead of having auditwheel done it later. This is a bit risky because cmake will later write in this
@@ -26,8 +26,8 @@ else
     done
 fi
 
-wget https://raw.githubusercontent.com/qhull/qhull/master/COPYING.txt -O python_wrapper/src/copying/libqhull.txt
-echo '{"libqhull_r": {"path": "copying/libqhull.txt", "home": "https://github.com/qhull/qhull"}}' > python_wrapper/src/copying/list.json
+wget https://raw.githubusercontent.com/qhull/qhull/master/COPYING.txt -O python/atlaslib-ecmwf/src/copying/libqhull.txt
+echo '{"libqhull_r": {"path": "copying/libqhull.txt", "home": "https://github.com/qhull/qhull"}}' > python/atlaslib-ecmwf/src/copying/list.json
 
 
 
diff --git a/python_wrapper/setup.cfg b/python/atlaslib-ecmwf/setup.cfg
similarity index 100%
rename from python_wrapper/setup.cfg
rename to python/atlaslib-ecmwf/setup.cfg
diff --git a/python_wrapper/setup.py b/python/atlaslib-ecmwf/setup.py
similarity index 100%
rename from python_wrapper/setup.py
rename to python/atlaslib-ecmwf/setup.py