Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Issue 840 - Fix proptypes & syntax highlighting, and improve tests #841

Merged
merged 14 commits into from
Oct 20, 2020
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
58 changes: 0 additions & 58 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,68 +183,10 @@ jobs:
npm run lint
when: always


"python-3.6":
docker:
- image: circleci/python:3.7.5-stretch-node-browsers

environment:
PERCY_ENABLED: True
PERCY_PROJECT: plotly/dash-table-python-v0

steps:
- checkout

- run:
name: Inject Percy Environment variables
command: |
echo 'export PERCY_TOKEN="$PERCY_PYTHON_TOKEN_V0"' >> $BASH_ENV

- run:
name: Install requirements
command: |
sudo pip install --upgrade virtualenv
python -m venv venv || virtualenv venv
. venv/bin/activate
pip install -r dev-requirements.txt --quiet
npm ci

- run:
name: Install dependencies (dash)
command: |
. venv/bin/activate
git clone --depth 1 [email protected]:plotly/dash.git dash-main
pip install -e ./dash-main[dev,testing] --quiet
cd dash-main/dash-renderer && npm ci && npm run build && pip install -e . && cd ../..

- run:
name: Install test requirements
command: |
. venv/bin/activate
npm run build
python setup.py sdist
cd dist
find . -name "*.gz" | xargs pip install --no-cache-dir --ignore-installed && cd ..

- run:
name: ⚙️ run integration test
command: |
. venv/bin/activate
pytest --junitxml=test-reports/dash.xml tests/integration
- store_artifacts:
path: test-reports
- store_test_results:
path: test-reports
- store_artifacts:
path: /tmp/dash_artifacts



workflows:
version: 2
build:
jobs:
- "python-3.6"
- "node"
- "server-test"
- "standalone-test"
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Fixed
- [#841](https://github.com/plotly/dash-table/pull/841)
- Fix prop-types regression causing console errors in browser devtools
- Fix syntax highlighting regression for Markdown cells

### Added
- [#841](https://github.com/plotly/dash-table/pull/841) Add Julia syntax highlighting support for Markdown cells

## [4.10.1] - 2020-09-03
-Dash.jl Julia component generation

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"es-check": "^5.1.0",
"fast-isnumeric": "^1.1.4",
"file-loader": "^6.0.0",
"highlight.js": "^10.1.2",
"highlight.js": "^10.3.1",
"http-server": "^0.12.3",
"husky": "^4.2.5",
"less": "^3.12.2",
Expand Down
2 changes: 1 addition & 1 deletion src/dash-table/dash/DataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,7 @@ export const propTypes = {
}),
PropTypes.arrayOf(
PropTypes.oneOfType([
PropTypes.nully,
PropTypes.oneOf([null]),
PropTypes.string,
PropTypes.exact({
delay: PropTypes.number,
Expand Down
6 changes: 5 additions & 1 deletion src/third-party/highlight.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import highlightjs from 'highlight.js/lib/highlight';
import highlightjs from 'highlight.js/lib/core';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want to upgrade highlight in DCC too while this is front of mind?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. And if tacking that on, might as well add Julia support.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import 'highlight.js/styles/github.css';

import bash from 'highlight.js/lib/languages/bash';
import css from 'highlight.js/lib/languages/css';
import http from 'highlight.js/lib/languages/http';
import javascript from 'highlight.js/lib/languages/javascript';
import json from 'highlight.js/lib/languages/json';
import julia from 'highlight.js/lib/languages/julia';
import markdown from 'highlight.js/lib/languages/markdown';
import plaintext from 'highlight.js/lib/languages/plaintext';
import python from 'highlight.js/lib/languages/python';
import r from 'highlight.js/lib/languages/r';
import ruby from 'highlight.js/lib/languages/ruby';
Expand All @@ -20,7 +22,9 @@ highlightjs.registerLanguage('css', css);
highlightjs.registerLanguage('http', http);
highlightjs.registerLanguage('javascript', javascript);
highlightjs.registerLanguage('json', json);
highlightjs.registerLanguage('julia', julia);
highlightjs.registerLanguage('markdown', markdown);
highlightjs.registerLanguage('plaintext', plaintext);
highlightjs.registerLanguage('python', python);
highlightjs.registerLanguage('r', r);
highlightjs.registerLanguage('ruby', ruby);
Expand Down
91 changes: 0 additions & 91 deletions tests/integration/IntegrationTests.py

This file was deleted.

Empty file removed tests/integration/__init__.py
Empty file.
Loading