Skip to content
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.

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

Waf py3.12 compat #778

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ CMakeLists.txt text eol=lf
######################
# Known binary files

# Python builds with WAF
waf binary

# executables, libraries; yes, sometimes they're part of a repository
*.exe binary
*.out binary
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [windows-latest]
python-version: ['3.7']
python-version: ['3.10']
name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.7']
python-version: ['3.10']
name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-2019]
python-version: ['3.7']
python-version: ['3.10']
debugging: ['--enable-debugging', '']
name: ${{ matrix.os }}-${{ matrix.python-version }}-waf${{ matrix.debugging }}
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ def m4subst(tsk):
def m4substFile(input, output, path, dict={}, env=None, chmod=None):
import re
#similar to the subst in misc.py - but outputs to the src directory
m4_re = re.compile('@(\w+)@', re.M)
m4_re = re.compile(r'@(\w+)@', re.M)

infile = join(path.abspath(), input)
dir = path.relpath()
Expand Down
4 changes: 2 additions & 2 deletions build/msvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ def app(txt):
return Task.funex(fun)


re_blank = re.compile('(\n|\r|\\s)*\n', re.M)
re_blank = re.compile(r'(\n|\r|\\s)*\n', re.M)
def rm_blank_lines(txt):
txt = re_blank.sub('\r\n', txt)
return txt
Expand Down Expand Up @@ -372,7 +372,7 @@ def stealth_write(self, data, flags='wb'):
Logs.debug('msvs: skipping %s' % self.abspath())
Node.Node.stealth_write = stealth_write

re_quote = re.compile("[^a-zA-Z0-9-]")
re_quote = re.compile(r"[^a-zA-Z0-9-]")
def quote(s):
return re_quote.sub("_", s)

Expand Down
2 changes: 1 addition & 1 deletion build/swig.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

SWIG_EXTS = ['.swig', '.i']

re_module = re.compile('%module(?:\s*\(.*\))?\s+(\w+)', re.M)
re_module = re.compile(r'%module(?:\s*\(.*\))?\s+(\w+)', re.M)

re_2 = re.compile('%include "(.*)"', re.M)
re_3 = re.compile('#include "(.*)"', re.M)
Expand Down
Binary file modified build/waf
Binary file not shown.
Loading