Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Small updates to build infrastructure #770

Merged
merged 8 commits into from
Nov 27, 2024
Merged

build: Small updates to build infrastructure #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
be08c7d
Ensure that node_modules are never added
hoxbro Nov 27, 2024
bb56faf
Try to move from wheel to sdist for build
hoxbro Nov 27, 2024
8e25be4
Add --package-format
hoxbro Nov 27, 2024
735ab14
Add channels to setup-miniconda
hoxbro Nov 27, 2024
6fa21c4
Run npm audit fix
hoxbro Nov 27, 2024
5dfabc8
Use _version.__version__ for pip install step
hoxbro Nov 27, 2024
cafd5ec
Update channel list for conda build
hoxbro Nov 27, 2024
2eb24ac
Update scripts/conda/build.sh
hoxbro Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
channels: "conda-forge"
- name: conda setup
run: |
conda install -y anaconda-client
Expand Down Expand Up @@ -125,7 +126,7 @@ jobs:
- name: Install package
run: python -m pip install dist/*.whl
- name: Test package
run: python -c "import $PACKAGE; print($PACKAGE.__version__)"
run: python -c "import $PACKAGE; print($PACKAGE._version.__version__)"

pip_publish:
name: Publish PyPI
Expand Down
13 changes: 7 additions & 6 deletions geoviews/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ raw-options = { version_scheme = "no-guess-dev" }

[tool.hatch.build.targets.wheel]
include = ["geoviews"]
exclude = ["geoviews/node_modules"]

[tool.hatch.build.targets.wheel.force-include]
"geoviews/dist" = "geoviews/dist"

[tool.hatch.build.targets.sdist]
include = ["geoviews", "scripts"]
exclude = ["geoviews/node_modules"]

[tool.hatch.build.targets.sdist.force-include]
"geoviews/dist" = "geoviews/dist"
Expand Down
8 changes: 4 additions & 4 deletions scripts/conda/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euxo pipefail

PACKAGE="geoviews"

python -m build . # Can add -w when this is solved: https://github.com/pypa/hatch/issues/1305
python -m build --sdist .

VERSION=$(python -c "import $PACKAGE; print($PACKAGE._version.__version__)")
export VERSION
Expand All @@ -14,13 +14,13 @@ import bokeh
from packaging.version import Version

if Version(bokeh.__version__).is_prerelease:
print('bokeh/label/dev')
print('bokeh/label/rc')
else:
print('bokeh')
")

conda build scripts/conda/recipe-core --no-anaconda-upload --no-verify -c "$BK_CHANNEL" -c pyviz
conda build scripts/conda/recipe-recommended --no-anaconda-upload --no-verify -c "$BK_CHANNEL" -c pyviz
conda build scripts/conda/recipe-core --no-anaconda-upload --no-verify -c pyviz -c "$BK_CHANNEL" -c conda-forge --package-format 1
conda build scripts/conda/recipe-recommended --no-anaconda-upload --no-verify -c pyviz -c "$BK_CHANNEL" -c conda-forge --package-format 1

mv "$CONDA_PREFIX/conda-bld/noarch/$PACKAGE-core-$VERSION-py_0.tar.bz2" dist
mv "$CONDA_PREFIX/conda-bld/noarch/$PACKAGE-$VERSION-py_0.tar.bz2" dist
4 changes: 2 additions & 2 deletions scripts/conda/recipe-core/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package:
version: {{ VERSION }}

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

build:
noarch: python
script: {{ PYTHON }} -m pip install --no-deps -vv {{ project["name"] }}-{{ VERSION }}-py3-none-any.whl
script: {{ PYTHON }} -m pip install --no-deps -vv .
entry_points:
{% for group,epoints in project.get("entry_points",{}).items() %}
{% for entry_point in epoints %}
Expand Down
2 changes: 1 addition & 1 deletion scripts/conda/recipe-recommended/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package:
version: {{ VERSION }}

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

build:
noarch: python
Expand Down