Issue 488 - Rename async modules (#489)

plotly · Feb 27, 2020 · e9c9d56 · e9c9d56
1 parent 9523a2c
commit e9c9d56
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -37,7 +37,6 @@ jobs:
                 command: |
                     python -m venv venv
                     . venv/bin/activate
-                    pip install --upgrade pip
                     pip install dash>=1.6.1
                     npm run build
 
@@ -46,7 +45,6 @@ jobs:
                 command: |
                     python -m venv venv
                     . venv/bin/activate
-                    pip install --upgrade pip
                     pip install dash_bio_utils
                     cd tests/unit
                     python unit_test_data_setup.py
@@ -76,9 +74,8 @@ jobs:
                 name: Install requirements
                 command: |
                     . venv/bin/activate
-                    pip install --upgrade pip
-                    pip install -r tests/requirements.txt --quiet
-                    pip install dash[testing]
+                    pip install --progress-bar off -r tests/requirements.txt --quiet
+                    pip install --progress-bar off dash[testing]
 
             - save_cache:
                 key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ checksum "ver.txt" }}
@@ -103,11 +100,11 @@ jobs:
                 name: Run integration tests
                 command: |
                     . venv/bin/activate
-                    pip install --upgrade pip
-                    pip install -r tests/requirements.txt
                     npm ci
                     npm run build
-                    pip install -e .
+                    python setup.py sdist
+                    cd dist
+                    find . -name "*.gz" | xargs pip install --no-cache-dir --ignore-installed && cd ..
                     pytest tests/integration
 
             - run:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+### Changed
+* [#489](https://github.com/plotly/dash-bio/pull/489) Renamed async modules with hyphen `-` instead of tilde `~`
+
 ## [0.4.7] - 2020-02-21
 ### Added
 * [#478](https://github.com/plotly/dash-bio/pull/478) Added support of

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,6 @@
 include dash_bio/bundle.js
-include dash_bio/async~*.js
-include dash_bio/async~*.js.map
+include dash_bio/async-*.js
+include dash_bio/async-*.js.map
 include dash_bio/metadata.json
 include dash_bio/package-info.json
 include README.md
diff --git a/dash_bio/__init__.py b/dash_bio/__init__.py
@@ -47,20 +47,20 @@
 _js_dist = []
 
 _js_dist.extend([{
-        'relative_package_path': 'async~{}.js'.format(async_resource),
+        'relative_package_path': 'async-{}.js'.format(async_resource),
         'external_url': (
             'https://unpkg.com/dash-bio@{}'
-            '/' + package_name + '/async~{}.js'
+            '/' + package_name + '/async-{}.js'
         ).format(__version__, async_resource),
         'namespace': 'dash_bio',
         'async': True
     } for async_resource in async_resources])
 
 _js_dist.extend([{
-        'relative_package_path': 'async~{}.js.map'.format(async_resource),
+        'relative_package_path': 'async-{}.js.map'.format(async_resource),
         'external_url': (
             'https://unpkg.com/dash-bio@{}'
-            '/' + package_name + '/async~{}.js.map'
+            '/' + package_name + '/async-{}.js.map'
         ).format(__version__, async_resource),
         'namespace': 'dash_bio',
         'dynamic': True

diff --git a/dash_bio/async~alignment.js → dash_bio/async-alignment.js b/dash_bio/async~alignment.js → dash_bio/async-alignment.js
diff --git a/dash_bio/async~circos.js → dash_bio/async-circos.js b/dash_bio/async~circos.js → dash_bio/async-circos.js
diff --git a/dash_bio/async~ideogram.js → dash_bio/async-ideogram.js b/dash_bio/async~ideogram.js → dash_bio/async-ideogram.js
diff --git a/dash_bio/async~moleculeviewer2.js → dash_bio/async-moleculeviewer2.js b/dash_bio/async~moleculeviewer2.js → dash_bio/async-moleculeviewer2.js
diff --git a/dash_bio/async~moleculeviewer3.js → dash_bio/async-moleculeviewer3.js b/dash_bio/async~moleculeviewer3.js → dash_bio/async-moleculeviewer3.js
diff --git a/dash_bio/async~needle.js → dash_bio/async-needle.js b/dash_bio/async~needle.js → dash_bio/async-needle.js
diff --git a/dash_bio/async~onco.js → dash_bio/async-onco.js b/dash_bio/async~onco.js → dash_bio/async-onco.js
diff --git a/dash_bio/async~sequence.js → dash_bio/async-sequence.js b/dash_bio/async~sequence.js → dash_bio/async-sequence.js
diff --git a/dash_bio/async~speck.js → dash_bio/async-speck.js b/dash_bio/async~speck.js → dash_bio/async-speck.js
diff --git a/dash_bio/bundle.js b/dash_bio/bundle.js
diff --git a/requirements.txt b/requirements.txt
@@ -1,14 +1,14 @@
 # Switch into a virtual environment
 # pip install -r requirements.txt
--e .
+
 cython>=0.19
 dash>=1.6.1
 dash-bio-utils==0.0.4
 dash-daq==0.2.2
 gunicorn==19.9.0
 jsonschema==2.6.0
 matplotlib==3.0.2
-numpy==1.15.4
+numpy
 pandas>=0.24.2
 plotly>=3.5.0
 PubChemPy==1.0.4

diff --git a/webpack.config.js b/webpack.config.js
@@ -49,7 +49,7 @@ module.exports = {
                     chunks: 'async',
                     minSize: 0,
                     name(module, chunks, cacheGroupKey) {
-                        return `${cacheGroupKey}~${chunks[0].name}`;
+                        return `${cacheGroupKey}-${chunks[0].name}`;
                     }
                 }
             }