Skip to content

Commit

Permalink
Merge pull request #153 from atlanticwave-sdx/103.topology-in-datamodel
Browse files Browse the repository at this point in the history
Use static topology files from datamodel
  • Loading branch information
sajith authored Aug 21, 2023
2 parents ddf0e5e + 48c7c34 commit 793b4d9
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 1,144 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
with:
python-version: "3.9"
cache: 'pip' # cache pip dependencies
cache-dependency-path: setup.cfg
cache-dependency-path: pyproject.toml

- name: Install dependencies
- name: Install tools
run: |
python -m pip install --upgrade pip
python -m pip install black isort
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ name: Test

on:
push:
branches: [ "main", "develop" ]
branches:
- main
pull_request:
branches: [ "main", "develop" ]
branches:
- main

permissions:
contents: read
Expand Down Expand Up @@ -39,7 +41,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: 'pip' # caching pip dependencies
cache-dependency-path: setup.cfg
cache-dependency-path: pyproject.toml

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ dependencies = [
"prtpy",
"pydot",
"dataclasses-json",
"importlib-resources; python_version < '3.9'",
"sdxdatamodel @ git+https://github.com/atlanticwave-sdx/[email protected]"
"sdx-datamodel @ git+https://github.com/atlanticwave-sdx/[email protected]"
]

[project.urls]
Expand All @@ -42,6 +41,7 @@ Issues = "https://github.com/atlanticwave-sdx/pce/issues"
test = [
"pytest >= 7.1.2",
"pytest-cov >= 3.0.0",
"importlib-resources; python_version < '3.9'",
]
pygraphviz = [
"pygraphviz"
Expand Down
22 changes: 0 additions & 22 deletions src/sdx_pce/data/requests/test_request.json

This file was deleted.

321 changes: 0 additions & 321 deletions src/sdx_pce/data/topologies/amlight.json

This file was deleted.

Loading

0 comments on commit 793b4d9

Please sign in to comment.