Skip to content

Commit 624ffcc

Browse files
committed
Remove regex check and download "Nightly" CastXML
Stop trying to check the version with a regex and instead copy the "Nightly" version of castxml available from data.kitware.com. This Nightly version is master on October 14, 2020
1 parent c59db5c commit 624ffcc

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ jobs:
7575
- name: Setup castxml for Linux
7676
if: matrix.os == 'ubuntu-18.04' && matrix.castxml == 'castxml'
7777
run: |
78-
wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/f43ef30267c850872cf1e8ea8594c5dc6a1beb7c343d63875662ee7c648dac4f9214c915499ef2e1148f2b5f866e4c518ca1a21fb5055baba7d62f4f69097ba0/download | tar zxf - -C ~/
78+
wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/b580374e48d4df68f8ebef6d0e71cd8cc3f2dfa28f0090e07cc043d11cee308aeea480092fe2e93f2d4c58f822a5c013c1c7121964372d28ee4069949a378b4c/download | tar zxf - -C ~/
7979
- name: Setup castxml for Mac
8080
if: matrix.os == 'macos-latest'
8181
run: |
82-
wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/88c9b5954ca7417f7b519f3006dc6fe4bd194af0837168edc30007a41eaae6d4eee97cef2a72747432af14941c7f60333b77c25e208b2540dcde2d61e0d0e6f3/download | tar zxf - -C ~/
82+
wget -q -O - https://data.kitware.com/api/v1/file/hashsum/sha512/e5962372508abd295f8a8110a20142bcbd93c235f72afba34b0abb3918a623f27465a7674b5532320e770f56fddb99019f5c47b254cea9f862a2df35630c2879/download | tar zxf - -C ~/
8383
- name: Setup castxml config
8484
if: matrix.compiler == 'gcc' && matrix.version == '7'
8585
run: mv unittests/configs/gcc7.cfg unittests/xml_generator.cfg;

unittests/test_comments.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# Distributed under the Boost Software License, Version 1.0.
44
# See http://www.boost.org/LICENSE_1_0.txt
55

6-
import re
7-
import subprocess
86
import unittest
97

108
from . import parser_test_case
@@ -40,20 +38,6 @@ def test(self):
4038
if self.config.castxml_epic_version != 1:
4139
# Run this test only with castxml epic version == 1
4240
return
43-
# Try to capture CastXML's patch version: 0.3.<###>
44-
# If the version is <= 0.3.6, return as the functionality doesn't exist
45-
# Else, continue on with the test.
46-
rtn = subprocess.run(
47-
[self.config.xml_generator_path, "--version"],
48-
stdout=subprocess.PIPE
49-
)
50-
version_regex = re.compile(
51-
b"castxml version 0.3.(?P<patch_ver>[0-9]+)"
52-
)
53-
reg_match = re.match(version_regex, rtn.stdout)
54-
if reg_match:
55-
if int(reg_match.group("patch_ver")) <= 6:
56-
return
5741
tnamespace = self.global_ns.namespace("comment")
5842

5943
self.assertIn("comment", dir(tnamespace))

0 commit comments

Comments
 (0)