Skip to content

Commit 404791b

Browse files
author
Marc-André Rivet
committed
Merge remote-tracking branch 'origin/dev' + update build artifacts
2 parents 599cccb + 5b329f4 commit 404791b

File tree

117 files changed

+21298
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+21298
-326
lines changed

.circleci/config.yml

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
version: 2
1+
version: 2.1
2+
orbs:
3+
win: circleci/[email protected]
24
jobs:
35
percy-finalize:
46
docker:
@@ -104,8 +106,6 @@ jobs:
104106
cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
105107
git clone --depth 1 https://github.com/plotly/dash-core-components.git
106108
cd dash-core-components && npm ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
107-
git clone --depth 1 https://github.com/plotly/dash-renderer-test-components
108-
cd dash-renderer-test-components && npm ci && npm run build:all && python setup.py sdist && mv dist/* ../packages/ && cd ..
109109
ls -la packages
110110
- persist_to_workspace:
111111
root: ~/dash
@@ -176,6 +176,43 @@ jobs:
176176
environment:
177177
PYVERSION: python27
178178

179+
build-windows-37: &build-windows
180+
working_directory: ~/dash
181+
executor:
182+
name: win/default
183+
shell: bash.exe
184+
environment:
185+
PYVERSION: python37
186+
steps:
187+
- checkout
188+
- run: echo $PYVERSION > ver.txt
189+
- restore_cache:
190+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
191+
- run:
192+
name: ️️🏗️ pip dev requirements
193+
command: |
194+
pip install --upgrade virtualenv
195+
virtualenv venv
196+
source venv/Scripts/activate
197+
sed -i '/dash-/d' requires-install.txt
198+
pip install -e . --no-cache-dir -r requires-install.txt -r requires-dev.txt -r requires-testing.txt --progress-bar off
199+
- save_cache:
200+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-dev.txt" }}-{{ checksum "requires-install.txt" }}-{{ checksum "requires-testing.txt" }}
201+
paths:
202+
- venv
203+
- run:
204+
name: ️️🏗️ build core
205+
command: |
206+
source venv/Scripts/activate && pip install --no-cache-dir --upgrade -e . --progress-bar off && mkdir packages
207+
cd dash-renderer && renderer build && python setup.py sdist && mv dist/* ../packages/ && cd ..
208+
git clone --depth 1 https://github.com/plotly/dash-core-components.git
209+
cd dash-core-components && npm ci && npm run build && python setup.py sdist && mv dist/* ../packages/ && cd ..
210+
ls -la packages
211+
- persist_to_workspace:
212+
root: ~/dash
213+
paths:
214+
- packages/*.tar.gz
215+
179216
test-37: &test
180217
working_directory: ~/dash
181218
docker:
@@ -240,6 +277,7 @@ workflows:
240277
jobs:
241278
- lint-unit-37
242279
- build-core-37
280+
- build-windows-37
243281
- build-misc-37
244282
- test-37:
245283
requires:

.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ downloads/
4848
eggs/
4949
.eggs/
5050
lib/
51+
!dash-renderer/lib
5152
lib64/
5253
parts/
5354
sdist/
@@ -63,4 +64,20 @@ node_modules/
6364
.npm
6465
npm-debug*
6566

67+
dash_renderer/
68+
dash_generator_test_component_standard/
69+
dash_generator_test_component_nested/
70+
dash_generator_test_component_sub_nested/
71+
inst/
72+
man/
73+
R/
74+
.Rbuildignore
75+
.Rdata
76+
.Rhistory
77+
DESCRIPTION
78+
NAMESPACE
79+
digest.json
6680
VERSION.txt
81+
82+
# vim
83+
*.swp
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include dash_generator_test_component_nested/**
2+
include dash_generator_test_component_nested/nested/**
3+
include package.json
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Empty
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const presets = [
2+
'@babel/preset-env',
3+
'@babel/preset-react'
4+
];
5+
6+
module.exports = { presets };
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import json
2+
import os as _os
3+
4+
_basepath = _os.path.dirname(__file__)
5+
_filepath = _os.path.abspath(_os.path.join(_basepath, 'package.json'))
6+
with open(_filepath) as f:
7+
package = json.load(f)
8+
9+
package_name = package['name'].replace(' ', '_').replace('-', '_')
10+
__version__ = package['version']
11+
12+
from ._imports_ import * # noqa: F401, F403
13+
from ._imports_ import __all__ # noqa: E402
14+
15+
_js_dist = [
16+
dict(
17+
relative_package_path='nested/dash_generator_test_component_nested.js',
18+
namespace='dash_generator_test_component_nested'
19+
)
20+
]
21+
22+
for _component in __all__:
23+
setattr(locals()[_component], '_js_dist', _js_dist)

0 commit comments

Comments
 (0)