diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 22abb673..9aa0b35a 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -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 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 9aa724a3..beea9ef2 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -21,7 +21,7 @@ jobs: run: shell: bash -l {0} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: token: ${{ secrets.PAT || github.token }} - run: | @@ -29,7 +29,7 @@ jobs: 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 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d46ca4f6..367e0357 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -6,6 +6,6 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v6 with: repo-token: "${{ secrets.PAT }}" diff --git a/.github/workflows/pr-sweep.yml b/.github/workflows/pr-sweep.yml index 7e8a8ed5..356d0dd7 100644 --- a/.github/workflows/pr-sweep.yml +++ b/.github/workflows/pr-sweep.yml @@ -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 }} diff --git a/setup.cfg b/setup.cfg index e172f015..3c242d50 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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