Skip to content

Commit

Permalink
Updated JavaScript dependencies and GitHub workflows.
Browse files Browse the repository at this point in the history
  • Loading branch information
cedricbonhomme committed Aug 8, 2022
1 parent 428a5da commit 340bace
Show file tree
Hide file tree
Showing 32 changed files with 562 additions and 174 deletions.
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
root = true

[*]
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true
end_of_line = lf
charset = utf-8
max_line_length = 88

[*.{yml,yaml,json,js,css,html}]
indent_size = 2

[*.{md,rst}]
trim_trailing_whitespace = false

# tabs 2 spaces for makefiles
[Makefile]
indent_style = tab
indent_size = 2
16 changes: 16 additions & 0 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: pre-commit
on:
pull_request:
push:
branches: [master]
jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- run: |
pip install reorder-python-imports
pip install pyupgrade
pip install black
- uses: pre-commit/[email protected]
29 changes: 29 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.1
hooks:
- id: pyupgrade
args: ["--py37-plus"]
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.0.1
hooks:
- id: reorder-python-imports
additional_dependencies: ["setuptools>60.9"]
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear
- flake8-implicit-str-concat
args: ["--max-line-length=100"]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: fix-byte-order-marker
- id: trailing-whitespace
- id: end-of-file-fixer
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
version-checker Changelog
=========================

## 0.0.3 (2022-08-08)

- Major update of the project with small improvements.


## 0.0.2 (2018-07-26)

- RSA is used to decrypt the version of the software sent by the client;
Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Contributions are welcome.

Before starting to contribute please install the Git hook scripts:

```bash
$ git clone https://github.com/monarc-project/version-checker
$ cd version-checker/
$ poetry install
$ pre-commit install
```
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
<http://www.gnu.org/licenses/>.
1 change: 0 additions & 1 deletion INSTALL/INSTALL.Heroku.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ $ heroku run init
$ heroku run python src/manager.py create_admin <username> <password>
$ heroku ps:scale web=1
```

9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,15 @@ curl http://127.0.0.1:5000/admin/logs/export?software=MONARC&software_version=2.
The result will be a CSV file.


## Contributing

Please read the [CONTRIBUTING](CONTRIBUTING.md) instructions.


## License

This software is licensed under
[GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.html)

- Copyright (C) 2018-2021 Cédric Bonhomme
- Copyright (C) 2018-2021 SMILE gie securitymadein.lu
- Copyright (C) 2018-2022 Cédric Bonhomme
- Copyright (C) 2018-2022 SECURITYMADEIN.LU
58 changes: 32 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"author": "Cédric Bonhomme",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@fortawesome/fontawesome-free": "^6.1.1",
"@fortawesome/fontawesome-free": "^6.1.2",
"bootstrap": "^4.0.1",
"chart.js": "^3.8.0",
"chart.js": "^3.9.1",
"datatables.net-bs4": "^1.12.1",
"iso-639-1": "^2.1.15",
"jquery": "^3.6.0",
Expand Down
Loading

0 comments on commit 340bace

Please sign in to comment.