Skip to content

Commit feaceb1

Browse files
authored
Merge branch 'master' into byronz-patch-contribute
2 parents 9688cdf + 1ba23cf commit feaceb1

28 files changed

+270
-1045
lines changed

.circleci/config.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77
docker:
88
- image: circleci/python:2.7-stretch-node-browsers
99
environment:
10-
REQUIREMENTS_FILE: .circleci/requirements/dev-requirements.txt
1110
PYLINTRC: .pylintrc
1211

1312
steps:
@@ -23,28 +22,27 @@ jobs:
2322
echo "RUNNING JOB: ${CIRCLE_JOB}"
2423
echo "JOB PARALLELISM: ${CIRCLE_NODE_TOTAL}"
2524
echo "CIRCLE_REPOSITORY_URL: ${CIRCLE_REPOSITORY_URL}"
26-
cat "$REQUIREMENTS_FILE" > reqs.txt
2725
echo $CIRCLE_JOB > circlejob.txt
2826
2927
- restore_cache:
30-
key: py-{{ .Branch }}-{{ checksum "circlejob.txt" }}-{{ checksum "reqs.txt" }}-{{ checksum ".circleci/config.yml" }}
28+
key: v-{{ checksum "circlejob.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}
3129
- run:
3230
name: 🚧 pip dev requirements
3331
command: |
3432
sudo pip install --upgrade virtualenv
3533
python -m venv venv || virtualenv venv
3634
. venv/bin/activate
37-
pip install -r $REQUIREMENTS_FILE --quiet
35+
pip install -r requires-install.txt -r requires-ci.txt --quiet
3836
- save_cache:
39-
key: py-{{ .Branch }}-{{ checksum "circlejob.txt" }}-{{ checksum "reqs.txt" }}-{{ checksum ".circleci/config.yml" }}
37+
key: v-{{ checksum "circlejob.txt" }}-{{ checksum "requires-ci.txt" }}-{{ checksum "requires-install.txt" }}
4038
paths:
4139
- "venv"
4240

4341
- run:
4442
name: 🌸 linting
4543
command: |
4644
. venv/bin/activate
47-
pip install -e . --quiet
45+
pip install -e .[ci] --quiet
4846
pip list | grep dash
4947
flake8 dash setup.py
5048
flake8 --ignore=E123,E126,E501,E722,E731,F401,F841,W503,W504 --exclude=metadata_test.py tests
@@ -102,7 +100,6 @@ jobs:
102100
docker:
103101
- image: circleci/python:3.6-stretch-node-browsers
104102
environment:
105-
REQUIREMENTS_FILE: .circleci/requirements/dev-requirements.txt
106103
PYLINTRC: .pylintrc
107104
PERCY_ENABLE: 0
108105

@@ -111,7 +108,6 @@ jobs:
111108
docker:
112109
- image: circleci/python:3.7-stretch-node-browsers
113110
environment:
114-
REQUIREMENTS_FILE: .circleci/requirements/dev-requirements-py37.txt
115111
PYLINTRC: .pylintrc37
116112
PERCY_ENABLE: 0
117113

.circleci/requirements/dev-requirements-py37.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

.circleci/requirements/dev-requirements.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- [ ] I have broken down my PR scope into the following TODO tasks
66
- [ ] task 1
77
- [ ] task 2
8-
- [ ] I have run the tests locally and they passed. (refer to testing section in [contributing](../CONTRIBUTING.md))
8+
- [ ] I have run the tests locally and they passed. (refer to testing section in [contributing](https://github.com/plotly/dash/blob/master/CONTRIBUTING.md))
99
- [ ] I have added tests, or extended existing tests, to cover any new features or bugs fixed in this PR
1010

1111
### optionals

.pylintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ valid-metaclass-classmethod-first-arg=mcs
401401
max-args=5
402402

403403
# Maximum number of attributes for a class (see R0902).
404-
max-attributes=7
404+
max-attributes=20
405405

406406
# Maximum number of boolean expressions in a if statement
407407
max-bool-expr=5
@@ -416,7 +416,7 @@ max-locals=15
416416
max-parents=7
417417

418418
# Maximum number of public methods for a class (see R0904).
419-
max-public-methods=20
419+
max-public-methods=40
420420

421421
# Maximum number of return / yield for function / method body
422422
max-returns=6

.pylintrc37

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ valid-metaclass-classmethod-first-arg=mcs
500500
max-args=5
501501

502502
# Maximum number of attributes for a class (see R0902).
503-
max-attributes=7
503+
max-attributes=20
504504

505505
# Maximum number of boolean expressions in an if statement.
506506
max-bool-expr=5
@@ -515,7 +515,7 @@ max-locals=15
515515
max-parents=7
516516

517517
# Maximum number of public methods for a class (see R0904).
518-
max-public-methods=20
518+
max-public-methods=40
519519

520520
# Maximum number of return / yield for function / method body.
521521
max-returns=6
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include README.md
22
include LICENSE
3+
include requires-*.txt
34
include dash/favicon.ico
45
include dash/extract-meta.js

dash-renderer/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
## [UNRELEASED]
5+
## [1.0.0] - 2019-06-20
66
### Changed
77
- Undo/redo toolbar is removed by default, unless `config.show_undo_redo=true` is provided. The CSS hack `._dash-undo-redo:{display:none;}` is no longer needed [#175](https://github.com/plotly/dash-renderer/pull/175)
88

0 commit comments

Comments
 (0)