From f35193517837ccec03bc130ac168dbd55ca28c94 Mon Sep 17 00:00:00 2001 From: sdixon Date: Sun, 14 Apr 2024 04:42:49 +0100 Subject: [PATCH] trying to get cibuildwheel to run from pyuda install location, instead of default project root directory --- .github/workflows/build_wheels.yml | 4 ++-- source/wrappers/python/README.md | 1 + pyproject.toml => source/wrappers/python/pyproject.toml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 source/wrappers/python/README.md rename pyproject.toml => source/wrappers/python/pyproject.toml (50%) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index d1e14af1..e88a1185 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -108,12 +108,12 @@ jobs: -DSSLAUTHENTICATION=OFF -DENABLE_CAPNP=ON -DCLIENT_ONLY=ON && cmake --build build -j --config Release --target install && - cp -r /usr/local/python_installer/* /project && - ls /project - uses: actions/upload-artifact@v4 with: name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl + package_dir: /usr/local/python_installer + config-file: /project/source/wrappers/python/pyproject.toml upload_pypi: needs: build_wheels diff --git a/source/wrappers/python/README.md b/source/wrappers/python/README.md new file mode 100644 index 00000000..e0b60d36 --- /dev/null +++ b/source/wrappers/python/README.md @@ -0,0 +1 @@ +pyuda is the python interface to the uda client library. It is used for remote access to scientific and experimental data from a number of international labs hosting uda data servers. diff --git a/pyproject.toml b/source/wrappers/python/pyproject.toml similarity index 50% rename from pyproject.toml rename to source/wrappers/python/pyproject.toml index 4fd41087..e504e089 100644 --- a/pyproject.toml +++ b/source/wrappers/python/pyproject.toml @@ -6,5 +6,6 @@ build-backend = "setuptools.build_meta" [project] name = "ukaea_pyuda" version = "2.7.5" -long_description="""pyuda is the the python interface to the uda (uda data access) client, which provides remote access to scientific and experimental data from a number of international labs hosting uda data servers""" +readme = {file = 'README.md', content-type = "text/markdown"} +license = {text = "Apache-2.0 license"} dependencies = ["numpy>=1.7", "Cython>=0.29", "six"]