Skip to content

Commit

Permalink
Merge branch 'dev' into master-2.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
T4rk1n committed Jun 29, 2023
2 parents 0144a59 + a7a12d1 commit e6dec9b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 3 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
All notable changes to `dash` will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/).

## [2.11.1] - 2023-06-29

## Fixed

- [#2573](https://github.com/plotly/dash/pull/2578) Disable jupyter dash in Databricks, as the implementation here does not work in a Databricks notebook. Dash Enterprise customers can use the separate databricks-dash package for this purpose.

## Changed

- [#2573](https://github.com/plotly/dash/pull/2573) Use `julia --project` command inside `JuliaRunner`.
- [#2579](https://github.com/plotly/dash/pull/2579) Add warning if using `JupyterDash`

## [2.11.0] - 2023-06-23

## Added
Expand Down
3 changes: 2 additions & 1 deletion dash/_jupyter.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,8 @@ def _wrap_errors(error):

@property
def active(self):
return _dep_installed and (self.in_ipython or self.in_colab)
_inside_dbx = "DATABRICKS_RUNTIME_VERSION" in os.environ
return _dep_installed and not _inside_dbx and (self.in_ipython or self.in_colab)


jupyter_dash = JupyterDash()
7 changes: 7 additions & 0 deletions dash/dash.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import collections
import importlib
import warnings
from contextvars import copy_context
from importlib.machinery import ModuleSpec
import pkgutil
Expand Down Expand Up @@ -511,6 +512,12 @@ def __init__( # pylint: disable=too-many-statements

self.logger.setLevel(logging.INFO)

if self.__class__.__name__ == "JupyterDash":
warnings.warn(
"JupyterDash is deprecated, use Dash instead.\n"
"See https://dash.plotly.com/dash-in-jupyter for more details."
)

def init_app(self, app=None, **kwargs):
"""Initialize the parts of Dash that require a flask app."""

Expand Down
4 changes: 3 additions & 1 deletion dash/testing/application_runners.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ def start(self, app, start_timeout=30, cwd=None):

logger.info("Run Dash.jl app with julia => %s", app)

args = shlex.split(f"julia {os.path.realpath(app)}", posix=not self.is_windows)
args = shlex.split(
f"julia --project {os.path.realpath(app)}", posix=not self.is_windows
)
logger.debug("start Dash.jl process with %s", args)

try:
Expand Down
2 changes: 1 addition & 1 deletion dash/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.11.0"
__version__ = "2.11.1"

0 comments on commit e6dec9b

Please sign in to comment.