Skip to content

Commit

Permalink
Merge branch 'development' into dependabot/github_actions/actions/che…
Browse files Browse the repository at this point in the history
…ckout-4
  • Loading branch information
zingale authored Jan 21, 2024
2 parents 0ee4f35 + a6d40d4 commit bd743d1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 53 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/check-ifdefs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,9 @@ jobs:
fetch-depth: 0

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@v3
with:
# this path is specific to Ubuntu
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
python-version: '3.11'

- name: Run check-ifdefs
run: |
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@v3
with:
# this path is specific to Ubuntu
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
python-version: '3.11'
cache: "pip"

- name: Install dependencies
run: pip install codespell
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/docs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,10 @@ jobs:
sudo apt install pandoc doxygen
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Cache pip
uses: actions/cache@v3
with:
# this path is specific to Ubuntu
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
python-version: '3.11'
cache: "pip"

- name: Install dependencies
run: pip install -r ./requirements.txt
Expand Down
22 changes: 3 additions & 19 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,10 @@ jobs:
sudo apt install pandoc doxygen
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.8'

- name: Upgrade pip
run: |
# install pip=>20.1 to use "pip cache dir"
python3 -m pip install --upgrade pip
- name: Get pip cache dir
id: pip-cache
run: echo "::set-output name=dir::$(pip cache dir)"

- name: Cache dependencies
uses: actions/cache@v1
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
python-version: '3.11'
cache: "pip"

- name: Install dependencies
run: python3 -m pip install -r ./requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion Source/param/parse_maestro_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def parse_params(infile, out_directory):

for p in params_nm:
cq.write(p.get_default_string())
cq.write(p.get_query_string("C++"))
cq.write(p.get_query_string())
cq.write("\n")

cq.close()
Expand Down

0 comments on commit bd743d1

Please sign in to comment.