Skip to content

Commit dce6a06

Browse files
committed
Rebase
2 parents 0a515d2 + 9312fe4 commit dce6a06

File tree

11 files changed

+252
-42
lines changed

11 files changed

+252
-42
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
- run:
2626
name: Install dependencies
2727
command: |
28-
python -m venv venv || virtualenv venv
28+
sudo pip install virtualenv
29+
virtualenv venv
2930
. venv/bin/activate
3031
pip install -r $REQUIREMENTS_FILE
3132

.pylintrc37

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ disable=invalid-name,
146146
comprehension-escape,
147147
no-else-return,
148148
useless-object-inheritance,
149-
possibly-unused-variable
149+
possibly-unused-variable,
150+
too-many-lines
150151

151152
# Enable the message, report, category or checker with the given id(s). You can
152153
# either give multiple identifier separated by comma (,) or put this option

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
## 0.28.3 - 2018-10-17
2+
## Fixed
3+
- Fix http-equiv typo [#418](https://github.com/plotly/dash/pull/418)
4+
5+
## 0.28.2 - 2018-10-05
6+
## Added
7+
- Moved `add_url` function definition out of `Dash.__init__` [#377](https://github.com/plotly/dash/pull/377)
8+
9+
## 0.28.1 - 2018-09-26
10+
## Fixed
11+
- Missing favicon package_data from setup.py [#407](https://github.com/plotly/dash/pull/407)
12+
13+
## 0.28.0 - 2018-09-26
14+
## Added
15+
- Default favicon for dash apps. [#406](https://github.com/plotly/dash/pull/406#issuecomment-424821743)
16+
- Bust the cache of the assets favicon.
17+
18+
## Fixed
19+
- Remove the first and last blank lines from the HTML index string. [#403](https://github.com/plotly/dash/pull/403)
20+
21+
## 0.27.0 - 2018-09-20
22+
## Added
23+
- Added support for serving dev bundles from the components suite, enable with `app.run_server(dev_tools_serve_dev_bundles=True)` [#369](https://github.com/plotly/dash/pull/369)
24+
25+
## Fixed
26+
- Use HTML5 syntax for the meta tag [#350](https://github.com/plotly/dash/pull/350)
27+
128
## 0.26.6 - 2018-09-19
229
## Fixed
330
- Added `Cache-Control` headers to files served by `Dash.serve_component_suites`. [#387](https://github.com/plotly/dash/pull/387)

CONTRIBUTING.md

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# Contributing to dash
2+
3+
## Getting Started
4+
5+
Refer to the [readme](README.md) for installation and development instructions.
6+
7+
## Coding Style
8+
9+
Please lint any additions to Python code with `pylint` and `flake8`.
10+
11+
## Pull Request Guidelines
12+
13+
Use the [GitHub flow][] when proposing contributions to this repository (i.e. create a feature branch and submit a PR against the master branch).
14+
15+
## Running the Tests
16+
17+
**Warning:** _Tests do not currently run on windows. Track our progress: [#409](https://github.com/plotly/dash/issues/409)._
18+
19+
To run the tests, you can use Python's `unittest` module, or a test runner like `nose2`.
20+
21+
To run all of the tests:
22+
`python -m unittest tests`
23+
24+
Or:
25+
`nose2 -v`
26+
27+
## Local configuration
28+
You can configure the test server with the following variables:
29+
### DASH_TEST_CHROMEPATH
30+
If you run a special chrome set the path to your chrome binary with this environment variable.
31+
32+
### DASH_TEST_PROCESSES
33+
If you encounter errors about Multi-server + Multi-processing when running under Python 3 try running the tests with the number of server processes set to 1.
34+
35+
### Example: single test run with configuration
36+
```
37+
DASH_TEST_CHROMEPATH=/bin/google-chrome-beta DASH_TEST_PROCESSES=1 python -m unittest -v test.test_integration.Tests.test_inputs
38+
```
39+
40+
## Making a contribution
41+
_For larger features, your contribution will have a higher likelihood of getting merged if you create an issue to discuss the changes that you'd like to make before you create a pull request._
42+
43+
1. Create a pull request and tag the Plotly team (`@plotly/dash`) and tag / request review from [@rmarren1](https://github.com/rmarren1) and [@T4rk1n](https://github.com/T4rk1n).
44+
2. After a review has been done and your changes have been approved, create a prerelease and comment in the PR. Version numbers should follow [semantic versioning][]. To create a prerelease:
45+
* Add `rc1` to `version.py` (`./dash/version.py`) e.g. `0.13.0rc1`
46+
- If needed, ask @chriddyp to get PyPi package publishing access.
47+
* Run `python setup.py sdist` to build a distribution zip.
48+
* Check the `dist` folder for a `tar.gz` file ending with your selected version number. Double check that this version number ends with `rc#`, as to not mistakenly publish the package.
49+
* Run `twine upload dist/<package_name>`.
50+
3. Comment in the PR with the prerelease version
51+
4. Update the top-level comment to include info about how to install, a summary of the changes, and a simple example.
52+
* This makes it easier for a community member to come in and try it out. As more folks review, it's harder to find the installation instructions deep in the PR
53+
* Keep this top-level comment updated with installation instructions (e.g. the `pip install` command)
54+
5. Make a post in the [Dash Community Forum][]
55+
* Title it `":mega: Announcement! New <Your Feature> - Feedback Welcome"`
56+
* In the description, link to the PR and any relevant issue(s)
57+
* Pin the topic so that it appears at the top of the forum for two weeks
58+
59+
## [Checklists](http://rs.io/unreasonable-effectiveness-of-checklists/)
60+
### Pre-Merge checklist
61+
- [ ] All tests on CircleCI have passed.
62+
- [ ] All visual regression differences have been approved.
63+
- [ ] If changes are significant, a release candidate has been created and posted to Slack, the Plotly forums, and at the very top of the pull request.
64+
- [ ] You have updated the `dash/version.py` file and the top of `CHANGELOG.md`. For larger additions, your `CHANGELOG.md` entry includes sample code about how the feature works. The entry should also link to the original pull request(s).
65+
- [ ] Two people have :dancer:'d the pull request. You can be one of these people if you are a Dash core contributor.
66+
67+
### Post-Merge checklist
68+
- [ ] You have tagged the release using `git tag v<version_number>`.
69+
70+
### Pre-Release checklist
71+
- [ ] Everything in the Pre-Merge checklist is completed. (Except the last two if this is a release candidate).
72+
- [ ] `git remote show origin` shows you are in the correct repository.
73+
- [ ] `git branch` shows that you are on the expected branch.
74+
- [ ] `git status` shows that there are no unexpected changes.
75+
- [ ] `dash/version.py` is at the correct version.
76+
77+
### Post-Release checklist
78+
- [ ] You have closed all issues that this pull request solves, and commented the new version number users should install.
79+
- [ ] You have created an issue about documenting the new feature or change and you have added it to the [Documentation] project.
80+
- [ ] You have created a pull request in `dash-docs` with the new release of your feature by editing that project's [`requirements.txt` file](https://github.com/plotly/dash-docs/blob/master/requirements.txt) and you have assigned `@chriddyp` to review.
81+
82+
## Financial Contributions
83+
84+
Dash, and many of Plotly's open source products, have been funded through direct sponsorship by companies. [Get in touch] about funding feature additions, consulting, or custom app development.
85+
86+
[Dash Core Components]: https://dash.plot.ly/dash-core-components
87+
[Dash HTML Components]: https://github.com/plotly/dash-html-components
88+
[write your own components]: https://dash.plot.ly/plugins
89+
[Dash Component Biolerplate]: https://github.com/plotly/dash-component-boilerplate
90+
[issues]: https://github.com/plotly/dash-core-components/issues
91+
[GitHub flow]: https://guides.github.com/introduction/flow/
92+
[eslintrc-react.json]: https://github.com/plotly/dash-components-archetype/blob/master/config/eslint/eslintrc-react.json
93+
[contributors]: https://github.com/plotly/dash-core-components/graphs/contributors
94+
[semantic versioning]: https://semver.org/
95+
[Dash Community Forum]: https://community.plot.ly/c/dash
96+
[Confirmation Modal component]: https://github.com/plotly/dash-core-components/pull/211#issue-195280462
97+
[Confirmation Modal announcement]: https://community.plot.ly/t/announcing-dash-confirmation-modal-feedback-welcome/11627
98+
[Get in touch]: https://plot.ly/products/consulting-and-oem
99+
[Documentation]: https://github.com/orgs/plotly/projects/8

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
include README.md
22
include LICENSE
3+
include dash/favicon.ico

dash/_configs.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@ def env_configs():
1919
'DASH_SUPPRESS_CALLBACK_EXCEPTIONS',
2020
'DASH_ASSETS_EXTERNAL_PATH',
2121
'DASH_INCLUDE_ASSETS_FILES',
22-
'DASH_COMPONENTS_CACHE_MAX_AGE'
22+
'DASH_COMPONENTS_CACHE_MAX_AGE',
23+
'DASH_INCLUDE_ASSETS_FILES',
24+
'DASH_SERVE_DEV_BUNDLES',
25+
'DASH_DEBUG'
2326
)})
2427

2528

26-
def get_config(config_name, init, env, default=None):
29+
def get_config(config_name, init, env, default=None, is_bool=False):
2730
if init is not None:
2831
return init
2932

3033
env_value = env.get('DASH_{}'.format(config_name.upper()))
3134
if env_value is None:
3235
return default
33-
return env_value
36+
return env_value if not is_bool else env_value.lower() == 'true'
3437

3538

3639
def pathname_configs(url_base_pathname=None,

0 commit comments

Comments
 (0)