Skip to content

Ugly fix for #153 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ugly fix for #153 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1b4916
Ugly fix for #153
dbroemmel Jul 4, 2023
727f27d
Implement nicer fix
dbroemmel Sep 2, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create resource cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./fortran_tests/before/*/
key: resources-${{ github.event_name }}
Expand All @@ -39,19 +39,19 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Load resources
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./fortran_tests/before/*/
key: resources-${{ github.event_name }}

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand All @@ -60,7 +60,11 @@ jobs:

- name: Run tests
run: |
coverage run --source=fprettify setup.py test
if [ "$python" == "3.8" ] || [ "$python" == "3.9" ] || [ "$python" == "3.10" ] ; then
coverage run --source=fprettify setup.py test
else
coverage run --source=fprettify -m unittest ./run_tests.py
fi

- name: Coverage upload
run: coveralls --service=github
Expand All @@ -75,7 +79,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand Down
5 changes: 3 additions & 2 deletions fprettify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,16 +1554,17 @@ def reformat_ffile_combined(infile, outfile, impose_indent=True, indent_size=3,
lines, pre_ampersand, ampersand_sep = remove_pre_ampersands(
lines, is_special, orig_filename, stream.line_nr)

linebreak_pos = get_linebreak_pos(lines, filter_fypp=not indent_fypp)

f_line = f_line.strip(' ')

if impose_replacements:
f_line = replace_relational_single_fline(f_line, cstyle)
lines = [replace_relational_single_fline(l, cstyle) for l in lines]

if impose_case:
f_line = replace_keywords_single_fline(f_line, case_dict)

linebreak_pos = get_linebreak_pos(lines, filter_fypp=not indent_fypp)

if impose_whitespace:
lines = format_single_fline(
f_line, whitespace, whitespace_dict, linebreak_pos, ampersand_sep,
Expand Down
6 changes: 3 additions & 3 deletions fprettify/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def test_relation_replacement(self):
"'==== heading",
"if (vtk%my_rank .eq. 0) write (vtk%filehandle_par, '(\"<DataArray",
"'(\"</Collection>\",",
"if (abc(1) .lt. -bca .or. &\n qwe .gt. ewq) then"]
"if (abc(1)<=-bca .or. &\n qwe .gt. ewq) then"]
f_outstring = ["if (min .lt. max .and. min .lt. thres)",
"if (min .gt. max .and. min .gt. thres)",
"if (min .eq. max .and. min .eq. thres)",
Expand All @@ -391,7 +391,7 @@ def test_relation_replacement(self):
"'==== heading",
"if (vtk%my_rank .eq. 0) write (vtk%filehandle_par, '(\"<DataArray",
"'(\"</Collection>\",",
"if (abc(1) .lt. -bca .or. &\n qwe .gt. ewq) then"]
"if (abc(1) .le. -bca .or. &\n qwe .gt. ewq) then"]
c_outstring = ["if (min < max .and. min < thres)",
"if (min > max .and. min > thres)",
"if (min == max .and. min == thres)",
Expand All @@ -401,7 +401,7 @@ def test_relation_replacement(self):
"'==== heading",
"if (vtk%my_rank == 0) write (vtk%filehandle_par, '(\"<DataArray",
"'(\"</Collection>\",",
"if (abc(1) < -bca .or. &\n qwe > ewq) then"]
"if (abc(1) <= -bca .or. &\n qwe > ewq) then"]
for i in range(0, len(instring)):
self.assert_fprettify_result(['--enable-replacements', '--c-relations'], instring[i], c_outstring[i])
self.assert_fprettify_result(['--enable-replacements'], instring[i], f_outstring[i])
Expand Down
Loading