Skip to content

Commit 4c4a850

Browse files
committed
build: Small updates to build infrastructure
1 parent dec5b6a commit 4c4a850

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/build.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
- uses: conda-incubator/setup-miniconda@v3
7676
with:
7777
miniconda-version: "latest"
78+
channels: "conda-forge"
7879
- name: conda setup
7980
run: |
8081
conda install -y anaconda-client
@@ -121,7 +122,7 @@ jobs:
121122
- name: Install package
122123
run: python -m pip install dist/*.whl
123124
- name: Import package
124-
run: python -c "import $PACKAGE; print($PACKAGE.__version__)"
125+
run: python -c "import $PACKAGE; print($PACKAGE._version.__version__)"
125126

126127
pip_publish:
127128
name: Publish PyPI

scripts/conda/build.sh

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ set -euxo pipefail
44

55
PACKAGE="spatialpandas"
66

7-
python -m build -w .
7+
python -m build --sdist .
88

99
VERSION=$(python -c "import $PACKAGE; print($PACKAGE._version.__version__)")
1010
export VERSION
1111

12-
# conda config --env --set conda_build.pkg_format 2
13-
conda build scripts/conda/recipe --no-anaconda-upload --no-verify
12+
conda build scripts/conda/recipe --no-anaconda-upload --no-verify -c conda-forge --package-format 2
1413

15-
# mv "$CONDA_PREFIX/conda-bld/noarch/$PACKAGE-$VERSION-py_0.conda" dist
1614
mv "$CONDA_PREFIX/conda-bld/noarch/$PACKAGE-$VERSION-py_0.tar.bz2" dist

scripts/conda/recipe/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ package:
66
version: {{ VERSION }}
77

88
source:
9-
url: ../../../dist/{{ project["name"] }}-{{ VERSION }}-py3-none-any.whl
9+
url: ../../../dist/{{ project["name"] }}-{{ VERSION }}.tar.gz
1010

1111
build:
1212
noarch: python
13-
script: {{ PYTHON }} -m pip install --no-deps -vv {{ project["name"] }}-{{ VERSION }}-py3-none-any.whl
13+
script: {{ PYTHON }} -m pip install --no-deps -vv .
1414
entry_points:
1515
{% for group,epoints in project.get("entry_points",{}).items() %}
1616
{% for entry_point in epoints %}

0 commit comments

Comments
 (0)