Skip to content

Commit

Permalink
Do not use pyctdev for building conda package (#5572)
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxbro committed Oct 4, 2023
1 parent aa43812 commit e85bb5e
Show file tree
Hide file tree
Showing 17 changed files with 141 additions and 635 deletions.
21 changes: 12 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,15 @@ jobs:
- name: conda setup
run: |
conda config --set always_yes True
conda install "pip<21.2.1"
conda install -c pyviz "pyctdev>=0.5"
doit ecosystem_setup
# See: https://github.com/holoviz/panel/pull/4979
conda install -c conda-forge "urllib3<2.0.0" "conda-build==3.24"
conda config --append channels pyviz/label/dev
conda config --append channels bokeh/label/dev
conda install -y conda-build anaconda-client build
- name: conda build
run: |
bash ./scripts/build_conda.sh
- name: build pyodide wheels for CDN
run: |
python ./scripts/build_pyodide_wheels.py
- name: conda build
run: doit package_build $CHANS_DEV $PKG_TEST_PYTHON --test-group=unit_deploy
- name: npm setup
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_API_TOKEN }}" > $HOME/.npmrc
Expand All @@ -67,14 +66,18 @@ jobs:
- name: conda dev deploy
if: (github.event_name == 'push' && (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
run: |
doit package_upload --token=${{ secrets.CONDA_UPLOAD_TOKEN }} --label=dev
VERSION="$(echo "$(ls dist/*.whl)" | cut -d- -f2)"
FILE="$CONDA_PREFIX/conda-bld/noarch/panel-$VERSION-py_0.tar.bz2"
anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz --label=dev $FILE
python setup.py develop
cd ./panel
npm publish --tag dev
- name: conda main deploy
if: (github.event_name == 'push' && !(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
run: |
doit package_upload --token=${{ secrets.CONDA_UPLOAD_TOKEN }} --label=dev --label=main
VERSION="$(echo "$(ls dist/*.whl)" | cut -d- -f2)"
FILE="$CONDA_PREFIX/conda-bld/noarch/panel-$VERSION-py_0.tar.bz2"
anaconda --token $CONDA_UPLOAD_TOKEN upload --user pyviz --label=dev --label=main $FILE
python setup.py develop
cd ./panel
npm publish --tag latest
Expand Down
22 changes: 17 additions & 5 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% set sdata = load_setup_py_data() %}
{% set sdata = load_setup_py_data(setup_file="../setup.py", from_recipe_dir=True) %}

package:
name: panel
version: {{ sdata['version'] }}
name: {{ sdata['name'] }}
version: {{ VERSION }}

source:
path: ..
url: ../dist/{{ sdata['name'] }}-{{ VERSION }}-py3-none-any.whl

build:
noarch: python
script: python setup.py install --single-version-externally-managed --record record.txt
script: {{ PYTHON }} -m pip install -vv {{ sdata['name'] }}-{{ VERSION }}-py3-none-any.whl
entry_points:
{% for group,epoints in sdata.get("entry_points",{}).items() %}
{% for entry_point in epoints %}
Expand All @@ -31,6 +31,18 @@ requirements:
run_constrained:
- holoviews >=1.13.2

test:
imports:
- panel
- panel.io
requires:
- pip
- pytest-asyncio
commands:
- pip check
- panel --help
- pytest --pyargs panel.tests

about:
home: {{ sdata['url'] }}
summary: {{ sdata['description'] }}
Expand Down
149 changes: 71 additions & 78 deletions panel/package-lock.json

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

2 changes: 1 addition & 1 deletion panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://github.com/holoviz/panel.git"
},
"dependencies": {
"@bokeh/bokehjs": "~3.2.0",
"@bokeh/bokehjs": "~3.2.2",
"@luma.gl/constants": "^8.0.3",
"@types/debounce": "^1.2.0",
"@types/gl-matrix": "^2.4.5",
Expand Down
Loading

0 comments on commit e85bb5e

Please sign in to comment.