diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d3df42..ef8fc2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [windows-latest] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index e072070..c2bb4c0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +test + [![Githun CI Status](https://github.com/harfbuzz/uharfbuzz/workflows/Build%20+%20Deploy/badge.svg)](https://github.com/harfbuzz/uharfbuzz/actions?query=workflow%3A%22Build+%2B+Deploy%22) [![PyPI](https://img.shields.io/pypi/v/uharfbuzz.svg)](https://pypi.org/project/uharfbuzz) diff --git a/harfbuzz b/harfbuzz index e60ec9d..d160d93 160000 --- a/harfbuzz +++ b/harfbuzz @@ -1 +1 @@ -Subproject commit e60ec9dcd3b0f94d13b8baf7ba12cd6cf0626064 +Subproject commit d160d9389cb4c5b15ebea9b41eb74018c4358924 diff --git a/pyproject.toml b/pyproject.toml index f7e9ea1..d2ca338 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ build-backend = "setuptools.build_meta" [tool.cibuildwheel] # only build for 64-bit +build = ["cp311-win_amd64"] skip = ["*-manylinux_i686", "*-musllinux_i686"] test-requires = "pytest" @@ -37,3 +38,6 @@ CFLAGS = "-g0" select = "*-musllinux*" before-all = "apk add ccache" environment = {CC = "/usr/lib/ccache/bin/gcc"} + +[tool.cibuildwheel.windows] +build-verbosity = "3" diff --git a/setup.cfg b/setup.cfg index a2d8121..68a352f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,3 +3,6 @@ formats = zip [metadata] license_file = LICENSE + +[build_ext] +#debug = 1 diff --git a/setup.py b/setup.py index 079474c..15d18ea 100755 --- a/setup.py +++ b/setup.py @@ -28,9 +28,13 @@ define_macros.append(('HAVE_UNISTD_H', '1')) define_macros.append(('HAVE_SYS_MMAN_H', '1')) else: - define_macros.append(('HAVE_DIRECTWRITE', '1')) - define_macros.append(('HAVE_UNISCRIBE', '1')) - libraries += ['usp10', 'gdi32', 'user32', 'rpcrt4', 'dwrite'] + extra_compile_args.append('/DEBUG:FULL') + extra_compile_args.append('/Z7') + extra_compile_args.append('/Zc:ternary') + extra_compile_args.append('/bigobj') + extra_compile_args.append('/fsanitize=address') + extra_link_args.append('/DEBUG:FULL') + libraries += ['user32', 'rpcrt4'] if platform.system() == 'Darwin': define_macros.append(('HAVE_CORETEXT', '1')) diff --git a/tests/test_uharfbuzz.py b/tests/test_uharfbuzz.py index ad56956..d81854d 100644 --- a/tests/test_uharfbuzz.py +++ b/tests/test_uharfbuzz.py @@ -326,29 +326,6 @@ def test_shape_set_shaper(self, blankfont): expected = [(0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0)] assert pos == expected - @pytest.mark.skipif(sys.platform != "win32", reason="requires Windows") - def test_shape_set_shaper_directwrite(self, blankfont): - string = "abcde" - buf = hb.Buffer() - buf.add_str(string) - buf.guess_segment_properties() - hb.shape(blankfont, buf, shapers=["directwrite"]) - pos = [g.position for g in buf.glyph_positions] - expected = [(0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0)] - assert pos == expected - - @pytest.mark.xfail - @pytest.mark.skipif(sys.platform != "win32", reason="requires Windows") - def test_shape_set_shaper_uniscribe(self, blankfont): - string = "abcde" - buf = hb.Buffer() - buf.add_str(string) - buf.guess_segment_properties() - hb.shape(blankfont, buf, shapers=["uniscribe"]) - pos = [g.position for g in buf.glyph_positions] - expected = [(0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0), (0, 0, 0, 0)] - assert pos == expected - @pytest.mark.skipif(sys.platform != "darwin", reason="requires macOS") def test_shape_set_shaper_coretext(self, blankfont): string = "abcde"