[draft] Support for Python 3.10

.gitignore

@@ -16,6 +16,13 @@ envset/
 *.whl
 .tmp/
 
+# virtual environments
+.env
+.venv*
+env/
+venv/
+ENV/
+
 # built files
 dist/
 coverage/
@@ -32,4 +39,7 @@ node_modules/
 docs/iJO1366.json
 docs/e_coli_core.json
 docs/iAB_RBC_283.json
-docs/example_map.html
+docs/example_map.html
+
+# intellij
+.idea/

.nvmrc

@@ -0,0 +1 @@
+6.17.1

DEPLOY.md

@@ -1,13 +1,15 @@
 # npm
 
-update version in package.json
-yarn clean
-yarn install
-yarn build
-yarn copy # for docs to build
-git commit version change
-git tag version
-git push commit & tags
+source .venv/bin/activate
+nvm use
+(update version in package.json)
+npm run clean
+npm install
+npm run build
+npm run copy # for docs to build
+git commit -m "version change"
+git tag <version>
+git push 
 npm login # last time i tried, yarn wasn't working for login & publish
 npm publish
 

README.md

@@ -50,6 +50,12 @@ First, install dependencies with [npm](https://www.npmjs.com) (or you can use
 [yarn](https://yarnpkg.com)):
 
 ```
+brew install nvm pyenv
+pyenv install 3.10.12
+pyenv shell 3.10.12
+python -m venv .venv
+source .venv/bin/activate
+nvm use
 npm install
 ```
 
@@ -126,7 +132,14 @@ Then in the `py` directory, install the Python package:
 
 ```
 cd py
-pip install -e . # installs escher in develop mode and dependencies
+pip install -r requirements.txt
+pip install -e . # installs escher in develop mode
+```
+
+To use the widgets within notebooks from jupyterlab, you also need to run the following from the escher root directory:
+```bash
+jupyter labextension install @jupyter-widgets/jupyterlab-manager
+jupyter labextension install escher
 ```
 
 For Python testing, run this in the `py` directory:

appveyor.yml

@@ -1,6 +1,6 @@
 environment:
   matrix:
-    - python: 'C:\\Python37-x64'
+    - python: 'C:\\Python310-x64'
 
 install:
   # Add python to PATH
@@ -9,6 +9,7 @@ install:
   # Install python packages
   - python -m pip install --upgrade pip
   - cd py
+  - python -m pip install -r requirements.txt
   - python -m pip install -e .
   - cd ..
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "escher",
   "author": "Zachary King",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "post_version": null,
   "schema_version": "1-0-0",
   "map_model_version": "6",

py/escher/static/package.json

@@ -1,7 +1,7 @@
 {
   "name": "escher",
   "author": "Zachary King",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "post_version": null,
   "schema_version": "1-0-0",
   "map_model_version": "6",