Skip to content

Commit 0af2280

Browse files
authored
Merge pull request #82 from OCNS/graph
🌆 Sunsetting our fly.dev deployment
2 parents 80514c8 + a36ff91 commit 0af2280

Some content is hidden

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

92 files changed

+2119
-2086
lines changed

.github/workflows/deploy.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ jobs:
2020
run: python tests/validate_data.py
2121
- name: Parsing YAML files (checking for correct relations)
2222
run: python src/data.py
23+
- name: Verify URLs
24+
uses: urlstechie/urlchecker-action@0.0.34
25+
with:
26+
subfolder: simtools
27+
file_types: .yaml
28+
retry_count: 3
29+
force_pass: false

.github/workflows/update_json.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- uses: actions/setup-python@v5
1515
with:
1616
python-version: '3.11'
17-
- name: install yaml
18-
run: python -m pip install pyyaml
17+
- name: install dependencies
18+
run: python -m pip install -r requirements.txt
1919
- name: update json file
2020
run: python yaml2json.py
2121
- name: commit if necessary

CONTRIBUTING.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,3 @@ Now, the pre-commit checks will be run before each commit.
1818

1919
Data on each tool is included in individual files in the `simselect` directory.
2020
To make changes, please fork the repository, make any necessary changes, and open pull requests for community review.
21-
22-
### Deployment
23-
The web app is hosted on [fly.io](https://fly.io/). It gets deployed automatically
24-
via a [GitHub Action](.github/workflows/deploy.yml). When a pull request is merged into ``main``, it will be deployed
25-
to https://simselect-dev.fly.dev. A tagged release will be deployed to https://simselect.fly.dev.

LICENSE.MIT

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2018 - present, iVis@Bilkent.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

Procfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,30 @@ simulator. See OCNS/SoftwareWG#117 For more details, and announcements of the re
1111
meetings.
1212

1313
## Development notes
14-
A fresh virtual environment is suggested for development:
14+
The website is built with ["vanilla JS"](http://vanilla-js.com/) and uses the [cytoscape.js](https://js.cytoscape.org/)
15+
library for graph visualisation. The full code runs in the browser, but in order to make it able to access the data, it
16+
needs to run in a local webserver. You can either use such a webserver as provided by your IDE (e.g. the
17+
[Live Server extension](https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer)) for VS Code,
18+
or use Python's built-in webserver:
19+
```
20+
python -m http.server
21+
```
22+
23+
Python is also used to pre-process and validate the data when simulator descriptions are changed in one of the YAML files.
24+
25+
If you want to work on that part, we suggest a virtual environment for development:
1526
```
1627
python -m venv .venv
1728
source .venv/bin/activate
1829
```
1930
One can also use `conda` and other tools to set up virtual environments.
2031

21-
This project is an app built using [Holoviz Panel](https://panel.holoviz.org/).
22-
You can install it using
32+
To install the dependencies, you can use:
2333
```
2434
python -m pip install -r requirements.txt
2535
```
26-
To run the app, use:
27-
```
28-
panel serve --show src/project_browser.py --static-dirs assets=./assets
29-
```
30-
This will open a browser window with the app.
31-
Firefox/Chrome based browsers are supported.
32-
Please file an issue if the app does not work with your browser.
36+
37+
3338

3439
### Contribution notes
3540
Please install the necessary linters/pre-commit hooks using the `requirements-dev.txt` file:
@@ -47,9 +52,11 @@ pre-commit install
4752
Now, the pre-commit checks will be run before each commit.
4853

4954
## Deployment
50-
The web app is hosted on [fly.io](https://fly.io/). See https://simselect.fly.dev/ for the latest released (tagged) version, and
51-
https://simselect-dev.fly.dev for the latest version directly built from the ``main`` branch.
55+
The website is hosted on https://ocns.github.io/simselect
5256

57+
## Dependencies
58+
The layout is using the fCoSE algorithm by the [i-Vis Research Lab at Bilkent University](http://www.cs.bilkent.edu.tr/~ivis/).
59+
The files in the `assets/js` directory are minified versions of the original files, licensed under the [MIT license](LICENSE.MIT).
5360

5461
## Contributors
5562

assets/api-circle.svg

Lines changed: 69 additions & 0 deletions
Loading

assets/book.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/buttons.css

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)