Skip to content

Commit

Permalink
Add ConvertCircuitToNetlist Plugin (v0.1.0). Closes #23 (#25)
Browse files Browse the repository at this point in the history
* WIP- #23 Initial Commit for Spice Conversion

* WIP- Remove __pycache__

* WIP- Add netlist parsing for subcircuits and additional components

* WIP- Add Conda to github workflow test

* WIP- Fix testing in github workflows

* WIP- Fix setup conda action name

* WIP- Fix python environment.yml path

* WIP- Test for node 12 only

* WIP- Don't activate environment before test

* WIP- Deploy branch for testing

* WIP- Fix testing in CI

* WIP- Fix tests

* WIP- Fix conda shell

* WIP- Use different conda setup action

* WIP- Fix workflow syntax

* WIP- Use Source activate in github workflow

* WIP- Add netlist for PySpice Components

* WIP- Deploy branch

* WIP- Add test-deploy on node 10 only

* WIP- Remove tests

* WIP- Skip Missing Nodes in the Netlist

* WIP- Add Sinusoidal Sources, generate Netlist Labels using chr

* WIP- Add Basic Testing

* WIP- Add Test seed

* WIP- Activate conda environment before test

* WIP- Fix typo in environment name

* WIP- Fix eslint issues in tests/globals.js

* WIP- Readd node 12 to test matrix

* WIP- Minor fixes and cleanup

* WIP- Run black

* WIP- Run Isort

* WIP- Add Dummy Modelname for netlist for transistor and MOSFET

* WIP- Add units, extended test

* WIP- Don't deploy branch

* WIP- Lint Python using black

* WIP- Run black on plugin files
  • Loading branch information
umesh-timalsina authored Feb 22, 2021
1 parent d1fb237 commit d2afe9a
Show file tree
Hide file tree
Showing 20 changed files with 1,410 additions and 53 deletions.
1 change: 1 addition & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ jobs:
LINTER_RULES_PATH: /
JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.yml
VALIDATE_JAVASCRIPT_ES: true
VALIDATE_PYTHON_BLACK: true
4 changes: 3 additions & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ jobs:
run: npm install

- name: Run Tests
run: npm test
run: |
source activate electric-circuits
npm test
dockerAndDeploy:
runs-on: ubuntu-latest
Expand Down
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@ ADD . /webgme

WORKDIR /webgme

RUN chmod +x utils/install-miniconda.sh && ./utils/install-miniconda.sh

ENV PATH /root/miniconda3/bin:$PATH

RUN conda init && conda env create --file environment.yml

RUN npm install -g npm

RUN npm config set unsafe-perm true && npm install
RUN npm config set unsafe-perm true && npm install && npm config set script-shell /bin/bash

ENTRYPOINT NODE_ENV=production npm start
8 changes: 7 additions & 1 deletion config/config.webgme.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,18 @@ config.seedProjects.basePaths.push(__dirname + '/../src/seeds/project');




config.rest.components['BindingsDocs'] = {
src: __dirname + '/../node_modules/webgme-bindings/src/routers/BindingsDocs/BindingsDocs.js',
mount: 'bindings-docs',
options: {}
};

// Visualizer descriptors

// Add requirejs paths
config.requirejsPaths = {
'BindingsDocs': 'node_modules/webgme-bindings/src/routers/BindingsDocs',
'webgme-bindings': './node_modules/webgme-bindings/src/common',
'electric-circuits': './src/common'
};

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ services:
- DEPLOYMENT_BLOB_DIR=/data/blob
ports:
- "8888:8888"
- "5555:5555"
volumes:
- "$HOME/.webgme/blob:/data/blob"
- "${TOKEN_KEYS_DIR}:/token_keys"
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dependencies:
- pyspice
- pip:
- requests
- webgme-bindings
Loading

0 comments on commit d2afe9a

Please sign in to comment.