Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,11 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name != 'push' || github.repository == 'DIRACGrid/WebAppDIRAC'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
with:
python-version: "3.11"
- 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
if: github.event_name != 'push' || github.repository == 'DIRACGrid/WebAppDIRAC'
defaults:
# Activate the conda environment automatically in each step
run:
shell: bash -l {0}

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

- name: Get DIRAC
run: |
[ ! -d "DIRAC" ] && cp -r .DIRAC/src/DIRAC DIRAC

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

- name: Run tests
run: pylint -E src/WebAppDIRAC
4 changes: 2 additions & 2 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
token: ${{ secrets.PAT || github.token }}
- run: |
git fetch --prune --unshallow
git config --global user.email "ci@diracgrid.org"
git config --global user.name "DIRACGrid CI"
git clone https://github.com/DIRACGrid/DIRAC.git ../DIRAC
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Installing dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v6
with:
repo-token: "${{ secrets.PAT }}"
2 changes: 1 addition & 1 deletion .github/workflows/pr-sweep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
concurrency: pr-sweep
if: github.repository == 'DIRACGrid/WebAppDIRAC'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
fetch-depth: 0
token: ${{ secrets.PAT }}
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ where=src
[options.extras_require]
server =
# These dependecies are made optional to make it easier to build extensions
dirac ~=9.0.0a0
dirac[server] ~=9.0.0
DIRACWebAppResources ~=1.0
testing =
autopep8 ==1.3.3
Expand Down
Loading