summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-05-02 19:28:24 +0200
committerGitHub <noreply@github.com>2023-05-02 13:28:24 -0400
commit68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7 (patch)
treecee10dbb815a265686c0552f4da2c384ee500f0b /.github
parent131e1c09379d346a468e754e06b498c6bf8394b7 (diff)
downloadspack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.gz
spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.bz2
spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.xz
spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.zip
GitHub Actions: do not install six in CI (#37361)
* GitHub Actions: do not install six in CI * Remove workflow code that was commented out * Remove any use of "six" from packages
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/audit.yaml2
-rw-r--r--.github/workflows/unit_tests.yaml8
-rw-r--r--.github/workflows/valid-style.yml2
-rw-r--r--.github/workflows/windows_python.yml81
4 files changed, 9 insertions, 84 deletions
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
index 062e91b0f7..bdff71220b 100644
--- a/.github/workflows/audit.yaml
+++ b/.github/workflows/audit.yaml
@@ -25,7 +25,7 @@ jobs:
python-version: ${{inputs.python_version}}
- name: Install Python packages
run: |
- pip install --upgrade pip six setuptools pytest coverage[toml]
+ pip install --upgrade pip setuptools pytest coverage[toml]
- name: Package audits (with coverage)
if: ${{ inputs.with_coverage == 'true' }}
run: |
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
index 628cab9749..3a37dc7984 100644
--- a/.github/workflows/unit_tests.yaml
+++ b/.github/workflows/unit_tests.yaml
@@ -62,7 +62,7 @@ jobs:
cmake bison libbison-dev kcov
- name: Install Python packages
run: |
- pip install --upgrade pip six setuptools pytest pytest-xdist pytest-cov
+ pip install --upgrade pip setuptools pytest pytest-xdist pytest-cov
pip install --upgrade flake8 "isort>=4.3.5" "mypy>=0.900" "click" "black"
- name: Setup git configuration
run: |
@@ -107,7 +107,7 @@ jobs:
sudo apt-get install -y coreutils kcov csh zsh tcsh fish dash bash
- name: Install Python packages
run: |
- pip install --upgrade pip six setuptools pytest coverage[toml] pytest-xdist
+ pip install --upgrade pip setuptools pytest coverage[toml] pytest-xdist
- name: Setup git configuration
run: |
# Need this for the git tests to succeed.
@@ -163,7 +163,7 @@ jobs:
sudo apt-get -y install coreutils cvs gfortran graphviz gnupg2 mercurial ninja-build kcov
- name: Install Python packages
run: |
- pip install --upgrade pip six setuptools pytest coverage[toml] pytest-cov clingo pytest-xdist
+ pip install --upgrade pip setuptools pytest coverage[toml] pytest-cov clingo pytest-xdist
- name: Setup git configuration
run: |
# Need this for the git tests to succeed.
@@ -193,7 +193,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install Python packages
run: |
- pip install --upgrade pip six setuptools
+ pip install --upgrade pip setuptools
pip install --upgrade pytest coverage[toml] pytest-xdist pytest-cov
- name: Setup Homebrew packages
run: |
diff --git a/.github/workflows/valid-style.yml b/.github/workflows/valid-style.yml
index 573330bc37..085f7fab60 100644
--- a/.github/workflows/valid-style.yml
+++ b/.github/workflows/valid-style.yml
@@ -44,7 +44,7 @@ jobs:
cache: 'pip'
- name: Install Python packages
run: |
- python3 -m pip install --upgrade pip six setuptools types-six black==23.1.0 mypy isort clingo flake8
+ python3 -m pip install --upgrade pip setuptools types-six black==23.1.0 mypy isort clingo flake8
- name: Setup git configuration
run: |
# Need this for the git tests to succeed.
diff --git a/.github/workflows/windows_python.yml b/.github/workflows/windows_python.yml
index 92ac3b2f52..33c2d17db5 100644
--- a/.github/workflows/windows_python.yml
+++ b/.github/workflows/windows_python.yml
@@ -23,7 +23,7 @@ jobs:
python-version: 3.9
- name: Install Python packages
run: |
- python -m pip install --upgrade pip six pywin32 setuptools pytest-cov clingo
+ python -m pip install --upgrade pip pywin32 setuptools pytest-cov clingo
- name: Create local develop
run: |
./.github/workflows/setup_git.ps1
@@ -47,7 +47,7 @@ jobs:
python-version: 3.9
- name: Install Python packages
run: |
- python -m pip install --upgrade pip six pywin32 setuptools coverage pytest-cov clingo
+ python -m pip install --upgrade pip pywin32 setuptools coverage pytest-cov clingo
- name: Create local develop
run: |
./.github/workflows/setup_git.ps1
@@ -71,85 +71,10 @@ jobs:
python-version: 3.9
- name: Install Python packages
run: |
- python -m pip install --upgrade pip six pywin32 setuptools coverage
+ python -m pip install --upgrade pip pywin32 setuptools coverage
- name: Build Test
run: |
spack compiler find
spack external find cmake
spack external find ninja
spack -d install abseil-cpp
- # TODO: johnwparent - reduce the size of the installer operations
- # make-installer:
- # runs-on: windows-latest
- # steps:
- # - name: Disable Windows Symlinks
- # run: |
- # git config --global core.symlinks false
- # shell:
- # powershell
- # - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- # with:
- # fetch-depth: 0
- # - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
- # with:
- # python-version: 3.9
- # - name: Install Python packages
- # run: |
- # python -m pip install --upgrade pip six pywin32 setuptools
- # - name: Add Light and Candle to Path
- # run: |
- # $env:WIX >> $GITHUB_PATH
- # - name: Run Installer
- # run: |
- # ./share/spack/qa/setup_spack_installer.ps1
- # spack make-installer -s . -g SILENT pkg
- # echo "installer_root=$((pwd).Path)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
- # env:
- # ProgressPreference: SilentlyContinue
- # - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
- # with:
- # name: Windows Spack Installer Bundle
- # path: ${{ env.installer_root }}\pkg\Spack.exe
- # - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
- # with:
- # name: Windows Spack Installer
- # path: ${{ env.installer_root}}\pkg\Spack.msi
- # execute-installer:
- # needs: make-installer
- # runs-on: windows-latest
- # defaults:
- # run:
- # shell: pwsh
- # steps:
- # - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
- # with:
- # python-version: 3.9
- # - name: Install Python packages
- # run: |
- # python -m pip install --upgrade pip six pywin32 setuptools
- # - name: Setup installer directory
- # run: |
- # mkdir -p spack_installer
- # echo "spack_installer=$((pwd).Path)\spack_installer" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
- # - uses: actions/download-artifact@v3
- # with:
- # name: Windows Spack Installer Bundle
- # path: ${{ env.spack_installer }}
- # - name: Execute Bundled Installer
- # run: |
- # $proc = Start-Process ${{ env.spack_installer }}\spack.exe "/install /quiet" -Passthru
- # $handle = $proc.Handle # cache proc.Handle
- # $proc.WaitForExit();
- # $LASTEXITCODE
- # env:
- # ProgressPreference: SilentlyContinue
- # - uses: actions/download-artifact@v3
- # with:
- # name: Windows Spack Installer
- # path: ${{ env.spack_installer }}
- # - name: Execute MSI
- # run: |
- # $proc = Start-Process ${{ env.spack_installer }}\spack.msi "/quiet" -Passthru
- # $handle = $proc.Handle # cache proc.Handle
- # $proc.WaitForExit();
- # $LASTEXITCODE