Skip to content

Commit

Permalink
move ibis install to the workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
maximlt committed Feb 8, 2022
1 parent bf57e13 commit 21839c9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Expand Up @@ -63,6 +63,7 @@ jobs:
conda activate test-environment
conda list
doit develop_install -c pyviz/label/dev -c bokeh ${{ env.HV_REQUIREMENTS }}
conda install -c pyviz/label/dev -c bokeh ibis-framework "panel=0.12"
python -c "from param import version; print(version.Version.setup_version('.', 'holoviews', archive_commit='$Format:%h$'))"
echo "-----"
git describe
Expand All @@ -75,6 +76,7 @@ jobs:
conda activate test-environment
conda list
doit develop_install ${{ env.CHANS_DEV }} ${{ env.HV_REQUIREMENTS }}
conda install ${{ env.CHANS_DEV }} ibis-sqlite
python -c "from param import version; print(version.Version.setup_version('.', 'holoviews', archive_commit='$Format:%h$'))"
echo "-----"
git describe
Expand All @@ -83,12 +85,12 @@ jobs:
# Pin panel on Python 3.6 because one or more dev releases on the 0.13.* series
# can be installed on Python 3.6 but are actually not compatible with Python 3.6
# Panel 0.13 will support Python >= 3.7 only so the pin here can stay indefinitely.
- name: Pin panel on py36
if: matrix.python-version == '3.6'
run: |
eval "$(conda shell.bash hook)"
conda activate test-environment
conda install -c pyviz/label/dev -c bokeh "panel=0.12"
# - name: Pin panel on py36
# if: matrix.python-version == '3.6'
# run: |
# eval "$(conda shell.bash hook)"
# conda activate test-environment
# conda install -c pyviz/label/dev -c bokeh "panel=0.12"
- name: doit env_capture
run: |
eval "$(conda shell.bash hook)"
Expand Down
4 changes: 0 additions & 4 deletions setup.cfg
@@ -1,6 +1,2 @@
[metadata]
license_file = LICENSE.txt

[tool:pyctdev.conda]
namespace_map =
ibis-framework=ibis-sqlite
7 changes: 0 additions & 7 deletions setup.py
Expand Up @@ -69,17 +69,10 @@

extras_require["unit_tests"] = extras_require["examples"] + extras_require["tests"]

# Moving ibis-framework from `examples` to `unit_tests`
# because it could not be installed on Linux with conda-forge
# (https://github.com/conda-forge/ibis-framework-feedstock/issues/54)
# which was blocking the docs build. ibis-framework isn't
# required to build the docs anyway.
if sys.version_info.major > 2:
extras_require["unit_tests"].extend(
[
"pyarrow",
# ibis-sqlite on conda, see setup.cfg
"ibis-framework",
] # spatialpandas incompatibility
)

Expand Down

0 comments on commit 21839c9

Please sign in to comment.