Skip to content

Commit 47174e9

Browse files
authored
Merge branch 'dev' into codeflash/optimize-flatten_grouping-max6hy2z
2 parents 017cf62 + bd06cc8 commit 47174e9

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/testing.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Dash Testing
22

33
on:
44
push:
5+
branches:
6+
- dev
7+
- master
8+
pull_request:
59
workflow_dispatch:
610

711
jobs:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
88
## Fixed
99
- [#3279](https://github.com/plotly/dash/pull/3279) Fix an issue where persisted values were incorrectly pruned when updated via callback. Now, callback returned values are correctly stored in the persistence storage. Fix [#2678](https://github.com/plotly/dash/issues/2678)
1010
- [#3298](https://github.com/plotly/dash/pull/3298) Fix dev_only resources filtering.
11+
- [#3315](https://github.com/plotly/dash/pull/3315) Fix pages module is package check.
1112

1213
## Added
1314
- [#3294](https://github.com/plotly/dash/pull/3294) Added the ability to pass `allow_optional` to Input and State to allow callbacks to work even if these components are not in the dash layout.

dash/_pages.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,10 @@ def _infer_path(module_name, template):
8686

8787

8888
def _module_name_is_package(module_name):
89-
file_path = sys.modules[module_name].__file__
90-
return (
91-
file_path
92-
and module_name in sys.modules
93-
and Path(file_path).name == "__init__.py"
94-
)
89+
if module_name not in sys.modules:
90+
return False
91+
file = sys.modules[module_name].__file__
92+
return file and file.endswith("__init__.py")
9593

9694

9795
def _path_to_module_name(path):

dash/development/_generate_prop_types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
2222
_js_dist.append(dict(
2323
dev_package_path="proptypes.js",
24+
dev_only=True,
2425
namespace="{namespace}"
2526
))
2627

0 commit comments

Comments
 (0)