Skip to content

Commit f615fff

Browse files
authored
Merge branch 'CastXML:develop' into windows
2 parents d3feea2 + e6f4b19 commit f615fff

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

.github/workflows/tests.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,76 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
# UBUNTU 24.04 - CASTXML EPIC 0
17+
# UBUNTU 22.04 - CASTXML EPIC 0
1818
- os: ubuntu-22.04
1919
compiler: gcc
2020
version: "11"
21-
python-version: "3.9"
21+
python-version: "3.13"
2222
castxml: "castxml"
2323
castxml-epic: 0
2424
cppstd: "-std=c++98"
2525

2626
- os: ubuntu-22.04
2727
compiler: gcc
2828
version: "11"
29+
python-version: "3.13"
30+
castxml: "castxml"
31+
castxml-epic: 1
32+
cppstd: "-std=c++98"
33+
34+
# UBUNTU 24.04 - CASTXML EPIC 0
35+
- os: ubuntu-24.04
36+
compiler: gcc
37+
version: "13"
38+
python-version: "3.9"
39+
castxml: "castxml"
40+
castxml-epic: 0
41+
cppstd: "-std=c++98"
42+
43+
- os: ubuntu-24.04
44+
compiler: gcc
45+
version: "13"
2946
python-version: "3.10"
3047
castxml: "castxml"
3148
castxml-epic: 0
3249
cppstd: "-std=c++98"
3350

34-
- os: ubuntu-22.04
51+
- os: ubuntu-24.04
3552
compiler: gcc
36-
version: "11"
53+
version: "13"
3754
python-version: "3.11"
3855
castxml: "castxml"
3956
castxml-epic: 0
4057
cppstd: "-std=c++98"
4158

42-
- os: ubuntu-22.04
59+
- os: ubuntu-24.04
4360
compiler: gcc
44-
version: "11"
61+
version: "13"
4562
python-version: "3.12"
4663
castxml: "castxml"
4764
castxml-epic: 0
4865
cppstd: "-std=c++98"
4966

50-
- os: ubuntu-22.04
67+
- os: ubuntu-24.04
5168
compiler: gcc
52-
version: "11"
69+
version: "13"
5370
python-version: "3.13"
5471
castxml: "castxml"
5572
castxml-epic: 0
5673
cppstd: "-std=c++98"
5774

5875
# UBUNTU 24.04 - CASTXML EPIC 1
59-
- os: ubuntu-22.04
76+
- os: ubuntu-24.04
6077
compiler: gcc
61-
version: "11"
78+
version: "13"
6279
python-version: "3.13"
6380
castxml: "castxml"
6481
castxml-epic: 1
6582
cppstd: "-std=c++98"
6683

67-
- os: ubuntu-22.04
84+
- os: ubuntu-24.04
6885
compiler: gcc
69-
version: "11"
86+
version: "13"
7087
python-version: "3.13"
7188
castxml: "castxml"
7289
castxml-epic: 1
@@ -109,7 +126,7 @@ jobs:
109126
run: pycodestyle . --exclude=docs
110127

111128
- name: Setup castxml for Linux
112-
if: matrix.os == 'ubuntu-22.04' && matrix.castxml == 'castxml'
129+
if: contains(matrix.os, 'ubuntu') && matrix.castxml == 'castxml'
113130
run: |
114131
wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/bdbb67a10c5f8d1b738cd19cb074f409d4803e8077cb8c1072ef4eaf738fa871a73643f9c8282d58cae28d188df842c82ad6620b6d590b0396a0172a27438dce/download | tar zxf - -C ~/
115132
- name: Setup castxml for Mac

README.rst

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Install instructions can be found `here <http://pygccxml.readthedocs.io/en/maste
2727
Compatibility
2828
-------------
2929

30-
pygccxml is compatible with Python 3.7, 3.8, 3.9, 3.10, 3.11 and pypy3.
30+
pygccxml is compatible with Python 3.9, 3.10, 3.11, 3.12, 3.13 and pypy3.
3131

3232
Documentation and examples
3333
--------------------------
@@ -73,15 +73,11 @@ The stable version can be found on the master branch.
7373

7474
The develop branch contains the latest improvements but can be unstable. Pull Requests should be done on the develop branch.
7575

76-
Testing and code coverage
77-
-------------------------
78-
79-
The builds are done using the Github Actions infrastructure.
76+
Testing
77+
-------
8078

8179
Running the test suite is done with:
8280

8381
.. code-block::
8482
85-
python3 -m unittests.test_all
86-
87-
Code coverage is also available. It is automatically updated after each commit and can be found `here <https://codecov.io/gh/iMichka/pygccxml>`_.
83+
pytest tests

src/pygccxml/parser/project_reader.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,13 @@ def _relink_declarated_types(self, leaved_classes, declarated_types):
548548
if name == "rebind<std::__tree_node" + \
549549
"<std::basic_string<char>, void *> >":
550550
continue
551+
if name == "type":
552+
continue
551553

552554
msg = []
553555
msg.append(
554556
"Unable to find out actual class definition: '%s'." %
555-
decl_wrapper_type.declaration._name)
557+
name)
556558
msg.append((
557559
"Class definition has been changed from one " +
558560
"compilation to an other."))

0 commit comments

Comments
 (0)