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.

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

Jump to bottom

Release 1.8.19 #87

Merged
merged 5 commits into from
Dec 18, 2023
Merged

Release 1.8.19 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69d1731
attempt at deploy script to work from 3p-packages-source
siliconvoodoo Dec 7, 2023
a91195d
Attempt at fixing package making scripts. In face of "testapp.py", li…
siliconvoodoo Dec 7, 2023
20de71f
Trying to understand why the 3p package still fails using explicit im…
siliconvoodoo Dec 7, 2023
c4b8855
Radical attempt
siliconvoodoo Dec 7, 2023
f91d063
try to cater to 3p environment
siliconvoodoo Dec 15, 2023
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
2 changes: 1 addition & 1 deletion prepare_solution_win.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ REM

set platform=win
set architecture=x64
set generator="Visual Studio 16 2019"
set generator="Visual Studio 17 2022"

set curr_dir=%~dp0
set src_path=%curr_dir%\src
Expand Down
2 changes: 1 addition & 1 deletion test.and.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import re
import importlib
sys.path.append("tests")
from clr import *
from tests.clr import *

testList = ['Syntax', 'Semantic', 'Advanced', 'Samples']

Expand Down
10 changes: 9 additions & 1 deletion tests/testapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@
import io
from argparse import ArgumentParser
from os.path import join, normpath, basename
from clr import *
import inspect
clrpath = os.path.join(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))), "clr.py")
print(f"clr path is {clrpath}")
import importlib.util
spec = importlib.util.spec_from_file_location("clr", clrpath)
clrmodule = importlib.util.module_from_spec(spec)
sys.modules["clr"] = clrmodule
spec.loader.exec_module(clrmodule)
globals().update({v: vars(clrmodule)[v] for v in ["fg", "bg", "style"]})
import re
import testfuncs
import importlib
Expand Down
Loading