Skip to content

Commit 115cd9a

Browse files
pandafynemesifier
pandafy
authored and
nemesifier
committed
[qa] Formatted JS, YAML and markdown
1 parent e03cda7 commit 115cd9a

File tree

19 files changed

+287
-416
lines changed

19 files changed

+287
-416
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name: Bug report
33
about: Open a bug report
44
title: "[bug] "
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Describe the bug**
1110
A clear and concise description of the bug or unexpected behavior.
1211

1312
**Steps To Reproduce**
1413
Steps to reproduce the behavior:
14+
1515
1. Go to '...'
1616
2. Click on '....'
1717
3. Scroll down to '....'
@@ -24,7 +24,8 @@ A clear and concise description of what you expected to happen.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**System Informatioon:**
27-
- OS: [e.g. Ubuntu 24.04 LTS]
28-
- Python Version: [e.g. Python 3.11.2]
29-
- Django Version: [e.g. Django 4.2.5]
30-
- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]
27+
28+
- OS: [e.g. Ubuntu 24.04 LTS]
29+
- Python Version: [e.g. Python 3.11.2]
30+
- Django Version: [e.g. Django 4.2.5]
31+
- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Feature request
33
about: Suggest an idea for this project
44
title: "[feature] "
55
labels: enhancement
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
**Is your feature request related to a problem? Please describe.**

‎.github/ISSUE_TEMPLATE/question.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Question
33
about: Please use the Discussion Forum to ask questions
44
title: "[question] "
55
labels: question
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
Please use the [Discussion Forum](https://github.com/orgs/openwisp/discussions) to ask questions.

‎.github/workflows/ci.yml‎

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
32
name: OpenWISP Controller CI Build
43

54
on:
@@ -42,76 +41,76 @@ jobs:
4241
django-version: django~=4.2.0
4342

4443
steps:
45-
- uses: actions/checkout@v4
46-
with:
47-
ref: ${{ github.event.pull_request.head.sha }}
44+
- uses: actions/checkout@v4
45+
with:
46+
ref: ${{ github.event.pull_request.head.sha }}
4847

49-
- name: Cache APT packages
50-
uses: actions/cache@v4
51-
with:
52-
path: /var/cache/apt/archives
53-
key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}
54-
restore-keys: |
55-
apt-${{ runner.os }}-
48+
- name: Cache APT packages
49+
uses: actions/cache@v4
50+
with:
51+
path: /var/cache/apt/archives
52+
key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}
53+
restore-keys: |
54+
apt-${{ runner.os }}-
5655
57-
- name: Disable man page auto-update
58-
run: |
59-
echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
60-
sudo dpkg-reconfigure man-db
56+
- name: Disable man page auto-update
57+
run: |
58+
echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
59+
sudo dpkg-reconfigure man-db
6160
62-
- name: Set up Python ${{ matrix.python-version }}
63-
uses: actions/setup-python@v5
64-
with:
65-
python-version: ${{ matrix.python-version }}
66-
cache: 'pip'
67-
cache-dependency-path: |
68-
**/requirements*.txt
61+
- name: Set up Python ${{ matrix.python-version }}
62+
uses: actions/setup-python@v5
63+
with:
64+
python-version: ${{ matrix.python-version }}
65+
cache: "pip"
66+
cache-dependency-path: |
67+
**/requirements*.txt
6968
70-
- name: Install Dependencies
71-
id: deps
72-
run: |
73-
sudo apt update
74-
sudo apt -qq -y install sqlite3 gdal-bin libproj-dev \
75-
libgeos-dev libspatialite-dev spatialite-bin \
76-
libsqlite3-mod-spatialite
77-
sudo npm install -g prettier
78-
pip install -U pip wheel setuptools
79-
pip install -U -r requirements-test.txt
80-
pip install -U -e .
81-
pip install ${{ matrix.django-version }}
69+
- name: Install Dependencies
70+
id: deps
71+
run: |
72+
sudo apt update
73+
sudo apt -qq -y install sqlite3 gdal-bin libproj-dev \
74+
libgeos-dev libspatialite-dev spatialite-bin \
75+
libsqlite3-mod-spatialite
76+
sudo npm install -g prettier
77+
pip install -U pip wheel setuptools
78+
pip install -U -r requirements-test.txt
79+
pip install -U -e .
80+
pip install ${{ matrix.django-version }}
8281
83-
- name: Start postgres and redis
84-
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
85-
run: docker compose up -d postgres redis
82+
- name: Start postgres and redis
83+
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
84+
run: docker compose up -d postgres redis
8685

87-
- name: QA checks
88-
run: ./run-qa-checks
86+
- name: QA checks
87+
run: ./run-qa-checks
8988

90-
- name: Tests
91-
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
92-
run: |
93-
coverage run runtests.py --parallel || coverage run ./runtests.py
94-
# tests the extension capability
95-
SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb --exclude-tag=selenium_tests \
96-
|| SAMPLE_APP=1 coverage run ./runtests.py --keepdb --exclude-tag=selenium_tests
97-
coverage combine
98-
coverage xml
99-
env:
100-
SELENIUM_HEADLESS: 1
101-
GECKO_LOG: 1
89+
- name: Tests
90+
if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
91+
run: |
92+
coverage run runtests.py --parallel || coverage run ./runtests.py
93+
# tests the extension capability
94+
SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb --exclude-tag=selenium_tests \
95+
|| SAMPLE_APP=1 coverage run ./runtests.py --keepdb --exclude-tag=selenium_tests
96+
coverage combine
97+
coverage xml
98+
env:
99+
SELENIUM_HEADLESS: 1
100+
GECKO_LOG: 1
102101

103-
- name: Show gecko web driver log on failures
104-
if: ${{ failure() }}
105-
run: cat geckodriver.log
102+
- name: Show gecko web driver log on failures
103+
if: ${{ failure() }}
104+
run: cat geckodriver.log
106105

107-
- name: Upload Coverage
108-
if: ${{ success() }}
109-
uses: coverallsapp/github-action@v2
110-
with:
111-
parallel: true
112-
format: cobertura
113-
flag-name: python-${{ matrix.env.env }}
114-
github-token: ${{ secrets.GITHUB_TOKEN }}
106+
- name: Upload Coverage
107+
if: ${{ success() }}
108+
uses: coverallsapp/github-action@v2
109+
with:
110+
parallel: true
111+
format: cobertura
112+
flag-name: python-${{ matrix.env.env }}
113+
github-token: ${{ secrets.GITHUB_TOKEN }}
115114

116115
coveralls:
117116
needs: build

‎.github/workflows/pypi.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
permissions:
1818
id-token: write
1919
steps:
20-
- uses: actions/checkout@v4
21-
- name: Set up Python
22-
uses: actions/setup-python@v5
23-
with:
24-
python-version: '3.10'
25-
- name: Install dependencies
26-
run: |
27-
pip install -U pip
28-
pip install build
29-
- name: Build package
30-
run: python -m build
31-
- name: Publish package distributions to PyPI
32-
uses: pypa/[email protected]
20+
- uses: actions/checkout@v4
21+
- name: Set up Python
22+
uses: actions/setup-python@v5
23+
with:
24+
python-version: "3.10"
25+
- name: Install dependencies
26+
run: |
27+
pip install -U pip
28+
pip install build
29+
- name: Build package
30+
run: python -m build
31+
- name: Publish package distributions to PyPI
32+
uses: pypa/[email protected]

‎openwisp_controller/config/fixtures/test_templates.json‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
[
2-
{
3-
"pk": "d083b494-8e16-4054-9537-fb9eba914861",
4-
"model": "config.template",
5-
"fields": {
6-
"name": "dhcp",
7-
"backend": "netjsonconfig.OpenWrt",
8-
"config": {
9-
"interfaces": [
10-
{
11-
"name": "eth0",
12-
"type": "ethernet",
13-
"addresses": [
14-
{
15-
"proto": "dhcp",
16-
"family": "ipv4"
17-
}
18-
]
19-
}
20-
]
21-
},
22-
"created": "2015-05-16T20:02:52.483Z",
23-
"modified": "2015-05-16T19:33:41.621Z"
24-
}
25-
},
26-
{
27-
"pk": "d083b494-8e16-4054-9537-fb9eba914862",
28-
"model": "config.template",
29-
"fields": {
2+
{
3+
"pk": "d083b494-8e16-4054-9537-fb9eba914861",
4+
"model": "config.template",
5+
"fields": {
6+
"name": "dhcp",
7+
"backend": "netjsonconfig.OpenWrt",
8+
"config": {
9+
"interfaces": [
10+
{
11+
"name": "eth0",
12+
"type": "ethernet",
13+
"addresses": [
14+
{
15+
"proto": "dhcp",
16+
"family": "ipv4"
17+
}
18+
]
19+
}
20+
]
21+
},
22+
"created": "2015-05-16T20:02:52.483Z",
23+
"modified": "2015-05-16T19:33:41.621Z"
24+
}
25+
},
26+
{
27+
"pk": "d083b494-8e16-4054-9537-fb9eba914862",
28+
"model": "config.template",
29+
"fields": {
30+
"name": "radio0",
31+
"backend": "netjsonconfig.OpenWrt",
32+
"config": {
33+
"radios": [
34+
{
3035
"name": "radio0",
31-
"backend": "netjsonconfig.OpenWrt",
32-
"config": {
33-
"radios": [
34-
{
35-
"name": "radio0",
36-
"phy": "phy0",
37-
"driver": "mac80211",
38-
"protocol": "802.11n",
39-
"channel": 11,
40-
"channel_width": 20,
41-
"tx_power": 8,
42-
"country": "IT"
43-
}
44-
]
45-
},
46-
"created": "2015-05-16T20:02:52.483Z",
47-
"modified": "2015-05-16T19:33:41.621Z"
48-
}
36+
"phy": "phy0",
37+
"driver": "mac80211",
38+
"protocol": "802.11n",
39+
"channel": 11,
40+
"channel_width": 20,
41+
"tx_power": 8,
42+
"country": "IT"
43+
}
44+
]
45+
},
46+
"created": "2015-05-16T20:02:52.483Z",
47+
"modified": "2015-05-16T19:33:41.621Z"
4948
}
49+
}
5050
]

‎openwisp_controller/config/static/config/css/admin.css‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,7 @@ input.readonly {
195195
white-space: pre;
196196
color: #777;
197197
}
198-
div.change-form
199-
#device_form
200-
div.inline-group.tab-content
201-
> fieldset.module
202-
> h2,
198+
div.change-form #device_form div.inline-group.tab-content > fieldset.module > h2,
203199
div.change-form
204200
#device_form
205201
div.inline-group.tab-content

0 commit comments

Comments
 (0)