Skip to content

Commit

Permalink
Merge pull request #174 from havogt/fix_license_ref
Browse files Browse the repository at this point in the history
Fix source distribution
  • Loading branch information
havogt authored Dec 18, 2024
2 parents 02a06aa + 0d9bbd3 commit 0310781
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/pypi_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ jobs:
python -m pip install build --user
- name: Build source tarball
run: |
cd bindings/python
python -m build --sdist --outdir dist/
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: ghex-dist
path: ./bindings/python/dist/**
path: ./dist/**
# publish-pypi:
# name: Publish Python distribution to pypi.org
# runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
. ~/env/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install -r ./bindings/python/requirements-test.txt # before ghex installation to avoid mpi4py version conflict
python3 -m pip install -v ./bindings/python
python3 -m pip install -v .
- if: ${{ matrix.config.run == 'ON' }}
name: Run Python tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ doc_src/__pycache__
doc_src/_build/
__pycache__
_build
.venv*/
1 change: 0 additions & 1 deletion bindings/python/MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion bindings/python/src/ghex/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if (SKBUILD_PROJECT_NAME)
# CMake driven by scikit-build-core
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION .. FILES_MATCHING PATTERN "*.py")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION . FILES_MATCHING PATTERN "*.py")
install(FILES ${CMAKE_BINARY_DIR}/version.txt DESTINATION .)
else()
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${GHEX_PYTHON_LIB_PATH} FILES_MATCHING PATTERN "*.py")
Expand Down
8 changes: 4 additions & 4 deletions bindings/python/pyproject.toml → pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ name = 'ghex'
# install: pip install bump-my-version
# example: bump-my-version bump patch
version = '0.4.0'
license = {file = '../../LICENSE'}
readme = {file = 'README.md', content-type = 'text/markdown'}
license = {text = "BSD-3 License"}
readme = {file = 'bindings/python/README.md', content-type = 'text/markdown'}

[project.urls]
repository = 'https://github.com/ghex-org/GHEX'
Expand All @@ -30,7 +30,7 @@ logging.level = 'INFO'
minimum-version = '0.5'
cmake.minimum-version = '3.21'
cmake.verbose = true
cmake.source-dir = "../.."
cmake.source-dir = "."
cmake.build-type = "Release"
cmake.args = [
"-DGHEX_BUILD_PYTHON_BINDINGS=ON",
Expand Down Expand Up @@ -106,4 +106,4 @@ warn_unused_ignores = true
# pip install bindings/python

# from github:
#pip install 'git+https://github.com/ghex-org/GHEX.git#subdirectory=bindings/python'
#pip install 'git+https://github.com/ghex-org/GHEX.git'

0 comments on commit 0310781

Please sign in to comment.