-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from gmrukwa/poetry-fixup
Poetry fixup
- Loading branch information
Showing
5 changed files
with
53 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -42,7 +42,8 @@ jobs: | |
yum install -y hdf5-devel && \ | ||
pip install --upgrade pip && \ | ||
pip install poetry poetry-core && \ | ||
poetry install && \ | ||
poetry run pip install oldest-supported-numpy && \ | ||
poetry install -vvv && \ | ||
poetry run pytest && \ | ||
deactivate' | ||
|
@@ -68,7 +69,7 @@ jobs: | |
run: | | ||
sudo apt-get update | ||
sudo apt-get install -y libgomp1 | ||
poetry install | ||
poetry install -vvv | ||
- name: Test library | ||
run: poetry run pytest | ||
env: | ||
|
@@ -93,7 +94,7 @@ jobs: | |
- name: Setup poetry | ||
uses: abatilo/[email protected] | ||
- name: Install dependencies | ||
run: poetry install | ||
run: poetry install -vvv | ||
- name: Test library | ||
run: poetry run pytest | ||
env: | ||
|
@@ -115,6 +116,8 @@ jobs: | |
uses: actions/setup-python@v2 | ||
with: | ||
python-version: ${{ matrix.python-version }} | ||
- name: Install LLVM | ||
run: brew install llvm | ||
- name: Install OpenMP | ||
run: brew install libomp | ||
- name: Setup poetry | ||
|
@@ -126,7 +129,7 @@ jobs: | |
echo "CPLUS_INCLUDE_PATH=/usr/local/opt/llvm/include:$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV | ||
echo "LIBRARY_PATH=/usr/local/opt/llvm/lib:/usr/local/opt/libomp/lib:$LIBRARY_PATH" >> $GITHUB_ENV | ||
echo "DYLD_LIBRARY_PATH=/usr/local/opt/llvm/lib:/usr/local/opt/libomp/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV | ||
poetry install | ||
poetry install -vvv | ||
env: | ||
CC: /usr/local/opt/llvm/bin/clang | ||
CXX: /usr/local/opt/llvm/bin/clang++ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[tool.poetry] | ||
name = "divik" | ||
version = "3.2.2" | ||
version = "3.2.3" | ||
description = "Divisive iK-means algorithm implementation" | ||
authors = ["Grzegorz Mrukwa <[email protected]>"] | ||
license = "Apache-2.0" | ||
|
@@ -26,7 +26,10 @@ classifiers = [ | |
include = [ | ||
"gamred_native", | ||
] | ||
build = "build.py" | ||
|
||
[tool.poetry.build] | ||
script = "build.py" | ||
generate-setup-file = true | ||
|
||
[tool.poetry.dependencies] | ||
python = ">=3.7.1,<4.0" | ||
|
@@ -71,7 +74,7 @@ fit-clusters = "divik._cli.fit_clusters:main" | |
[build-system] | ||
requires = [ | ||
"poetry-core>=1.0.0", | ||
"numpy>=0.12.1", | ||
"oldest-supported-numpy", | ||
"setuptools", | ||
] | ||
build-backend = "poetry.core.masonry.api" |