Skip to content

Commit

Permalink
refactor: Run pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisburr authored and TaykYoku committed Oct 19, 2021
1 parent 468cd8e commit 4ad573a
Show file tree
Hide file tree
Showing 159 changed files with 14,375 additions and 14,427 deletions.
2 changes: 0 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ WebApp/static/core/js/views/tabs/TabPanel.js
WebApp/static/core/js/utils/DiracGridPanel.js
WebAppDIRAC/WebApp/static/core/js/utils/Tabtheme.js
WebApp/static/core/js/utils/Tabtheme.js


52 changes: 25 additions & 27 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
{
"parserOptions": {
"ecmaVersion": 6,
},
"plugins": [
"@sencha/extjs"
],
"extends": [
// "eslint:recommended",
"plugin:@sencha/extjs/recommended"
],
"settings": {
"extjs": {
// "version": "4"
"fromVersion": "4.2.6",
"toVersion": "6.6.0"
}
},
"globals": {
"Ext": true,
"SimpleTasks": true,
"SimpleTasksSettings": true
},
"env": {
"browser": true
},
"rules": {
// "@sencha/extjs/no-removed-method-call": 2
"parserOptions": {
"ecmaVersion": 6
},
"plugins": ["@sencha/extjs"],
"extends": [
// "eslint:recommended",
"plugin:@sencha/extjs/recommended"
],
"settings": {
"extjs": {
// "version": "4"
"fromVersion": "4.2.6",
"toVersion": "6.6.0"
}
},
"globals": {
"Ext": true,
"SimpleTasks": true,
"SimpleTasksSettings": true
},
"env": {
"browser": true
},
"rules": {
// "@sencha/extjs/no-removed-method-call": 2
}
}
14 changes: 7 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

# Contribution Guidelines for DIRAC


## Pull Requests

When making a `Pull Request` please explain what and why things were
Expand All @@ -22,11 +20,13 @@ If you notice an issue, consider first creating an issue and then refering to it
in your pull-request and commit messages with `#[issue-id]`.

## Coding Conventions
For the python code:
* You should follow the [DIRAC Coding Conventions](https://dirac.readthedocs.io/en/latest/DeveloperGuide/CodingConvention/index.html).
* Your code should not introduce any new pylint warnings, and fix as many existing warnings as possible.
* Use autopep8

For the python code:

- You should follow the [DIRAC Coding Conventions](https://dirac.readthedocs.io/en/latest/DeveloperGuide/CodingConvention/index.html).
- Your code should not introduce any new pylint warnings, and fix as many existing warnings as possible.
- Use autopep8

## Git workflow

The DIRAC Development Model is described in the [documentation](https://dirac.readthedocs.io/en/latest/DeveloperGuide/DevelopmentModel/index.html) with detailed instructions on the git workflow listed [here](https://dirac.readthedocs.io/en/latest/DeveloperGuide/DevelopmentModel/ContributingCode/index.html). For additional help on the git(hub) workflow please see this [tutorial](https://github.com/andresailer/tutorial#working-updating-pushing).
The DIRAC Development Model is described in the [documentation](https://dirac.readthedocs.io/en/latest/DeveloperGuide/DevelopmentModel/index.html) with detailed instructions on the git workflow listed [here](https://dirac.readthedocs.io/en/latest/DeveloperGuide/DevelopmentModel/ContributingCode/index.html). For additional help on the git(hub) workflow please see this [tutorial](https://github.com/andresailer/tutorial#working-updating-pushing).
40 changes: 20 additions & 20 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'DIRACGrid/WebAppDIRAC'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.9'
- name: Install pre-commit
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.9"
- name: Install pre-commit
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure

pyLint:
runs-on: ubuntu-latest
Expand All @@ -25,17 +25,17 @@ jobs:
shell: bash -l {0}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2
with:
repository: DIRACGrid/DIRAC
path: .DIRAC
ref: integration
- uses: actions/checkout@v2
- uses: actions/checkout@v2
with:
repository: DIRACGrid/DIRAC
path: .DIRAC
ref: integration

- name: Prepare environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: .DIRAC/environment.yml
- name: Prepare environment with Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
environment-file: .DIRAC/environment.yml

- name: Run tests
run: pylint -E src/WebAppDIRAC
- name: Run tests
run: pylint -E src/WebAppDIRAC
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-python@v2
with:
python-version: '3.9'
python-version: "3.9"
- name: Install dependencies
run: pip install build readme_renderer diraccfg packaging requests
- name: Validate README for PyPI
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
src/WebAppDIRAC/WebApp/static/core/js/utils/canvg-1.3
src/WebAppDIRAC/WebApp/static/core/js/utils/FileSaver
src/WebAppDIRAC/WebApp/static/core/js/utils/FileSaver
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"useTabs": false,
"printWidth": 150,
"singleQuote": false
}
}
2 changes: 1 addition & 1 deletion release.notes
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ CHANGE: (#408) add diraccfg to the requirements

[v4r0p32]

FIX: (#405) PilotMonitor showJobs feature now provide all the jobs bound to a pilot-job reference
FIX: (#405) PilotMonitor showJobs feature now provide all the jobs bound to a pilot-job reference
Loading

0 comments on commit 4ad573a

Please sign in to comment.