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.

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

Fix appveyor builds #699

Merged
merged 4 commits into from
Nov 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ environment:
install:
- "SET PATH=%CONDA%;%CONDA%\\Scripts;%PATH%"
- "conda install -y -c pyviz pyctdev && doit ecosystem_setup"
- "doit env_create %CHANS_DEV% --name=test --python=%PY%"
- "activate test"
- "doit develop_install -o recommended -o tests %CHANS_DEV%"
- "bokeh sampledata"

Expand Down
26 changes: 0 additions & 26 deletions dodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
os.environ["PYCTDEV_ECOSYSTEM"] = "conda"

from pyctdev import * # noqa: api
from pyctdev import CmdAction
from pyctdev._conda import _options_param, _channel_param, _conda_build_deps, _conda_install_with_options_hacked

def task_pip_on_conda():
"""Experimental: provide pip build env via conda"""
Expand All @@ -21,27 +19,3 @@ def task_pip_on_conda():
def _build_dev(channel):
channels = " ".join(['-c %s' % c for c in channel])
return "conda build %s conda.recipe/ --build-only" % channels


def task_develop_install():
"""python develop install, with specified optional groups of dependencies (installed by conda only).

Typically ``conda install "test dependencies" && pip install -e . --no-deps``.

Pass --options multiple times to specify other optional groups
(see project's setup.py for available options).

E.g.

``doit develop_install -o examples -o tests``
``doit develop_install -o all``

"""
return {'actions': [
CmdAction(_conda_build_deps),
CmdAction(_conda_install_with_options_hacked),
#CmdAction(_build_dev), # Switch to locally built version at later point
#"conda install --use-local panel"
"conda uninstall panel --force",
"python setup.py develop --no-deps"],
'params': [_options_param,_channel_param]}
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[build-system]
requires = [
"param >=1.7.0",
"bokeh >=1.4.0",
"pyct >=0.4.4",
"setuptools >=30.3.0",
]
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def run(self):
########## dependencies ##########

install_requires = [
'bokeh >=1.3.0',
'bokeh >=1.4.0',
'param >=1.9.0',
'pyviz_comms >=0.7.2',
'markdown',
Expand Down Expand Up @@ -141,7 +141,7 @@ def run(self):
'param >=1.9.0',
'pyct >=0.4.4',
'setuptools >=30.3.0',
'bokeh >=1.3.0',
'bokeh >=1.4.0',
'pyviz_comms >=0.6.0',
'nodejs >=9.11.1',
]
Expand Down