Merge branch 'master' of https://github.com/intersystems/iknow

isc-adang · Sep 29, 2023 · 1e65b7a · 1e65b7a
2 parents 0f9bf2f + 3eb226d
commit 1e65b7a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 29 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -40,7 +40,7 @@ jobs:
       REF_TESTING_PASSED: ${{ steps.tests.outputs.REF_TESTING_PASSED }}
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: get list of dependencies
         run: actions/dependencies.sh
       - name: download cached ICU installation
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: get list of dependencies
         run: actions/dependencies.sh
       - name: download cached ICU installation
@@ -124,7 +124,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: get list of dependencies
         run: actions/dependencies.sh
       - name: download cached ICU installation
@@ -161,10 +161,10 @@ jobs:
     runs-on: macos-13
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: set up environment
         run: |
-          echo "XCODE_SELECTED=/Applications/Xcode_14.3.app" >> $GITHUB_ENV
+          echo "XCODE_SELECTED=/Applications/Xcode_15.0.app" >> $GITHUB_ENV
           echo "HOMEBREW_NO_AUTO_UPDATE=1" >> $GITHUB_ENV
           echo "HOMEBREW_NO_INSTALL_CLEANUP=1" >> $GITHUB_ENV
           echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
@@ -210,10 +210,10 @@ jobs:
       REF_TESTING_PASSED: ${{ steps.tests.outputs.REF_TESTING_PASSED }}
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: set up environment
         run: |
-          echo "XCODE_SELECTED=/Applications/Xcode_14.3.app" >> $GITHUB_ENV
+          echo "XCODE_SELECTED=/Applications/Xcode_15.0.app" >> $GITHUB_ENV
           echo "HOMEBREW_NO_AUTO_UPDATE=1" >> $GITHUB_ENV
           echo "HOMEBREW_NO_INSTALL_CLEANUP=1" >> $GITHUB_ENV
           echo "MACOSX_DEPLOYMENT_TARGET=10.9" >> $GITHUB_ENV
@@ -272,7 +272,7 @@ jobs:
       REF_TESTING_PASSED: ${{ steps.tests.outputs.REF_TESTING_PASSED }}
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: set up environment
         run: |
           mkdir -p $HOME/ccache_exe
@@ -341,7 +341,7 @@ jobs:
     if: needs.manylinux2014_x86_64.outputs.REF_TESTING_PASSED == '0' || needs.macos_10_9_universal.outputs.REF_TESTING_PASSED == '0' || needs.windows_x86_64.outputs.REF_TESTING_PASSED == '0'
     steps:
       - name: create comment
-        uses: peter-evans/commit-comment@v2
+        uses: peter-evans/commit-comment@v3
         with:
           body: >-
             **Error**: Reference testing failed. See the build artifacts at
@@ -359,7 +359,7 @@ jobs:
       FORCE_DEPLOY: ${{ github.event.inputs.FORCE_DEPLOY }}
     steps:
       - name: check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 21  # github.event.commits has limit of 20 commits, so we need at least 21 to perform diffs
       - name: download cached pip files
@@ -402,7 +402,7 @@ jobs:
         run: actions/deploy.sh
       - name: warn if version.py was changed but not in last commit
         if: env.WARN_COMMIT
-        uses: peter-evans/commit-comment@v2
+        uses: peter-evans/commit-comment@v3
         with:
           sha: ${{ env.WARN_COMMIT }}
           body: >-

diff --git a/actions/dependencies.sh b/actions/dependencies.sh
@@ -15,15 +15,15 @@ ICU_URL_WIN=https://github.com/unicode-org/icu/releases/download/release-73-2/ic
 ICU_URL_SRC=https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz
 JSON_VERSION=3.11.2
 JSON_URL=https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip
-PYVERSIONS_WIN="3.7.9 3.8.10 3.9.13 3.10.11 3.11.4"
-PYVERSIONS_MACOSUNIVERSAL="3.8.10 3.9.13 3.10.11 3.11.4"
-PYURLS_MACOSUNIVERSAL="https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg https://www.python.org/ftp/python/3.11.4/python-3.11.4-macos11.pkg"
-CCACHE_VERSION=4.8.2
-CCACHE_URL=https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2-windows-x86_64.zip
-CYTHON_VERSION=0.29.36
-MANYLINUX2014_X86_64_TAG=2023-07-06-73b0312
-MANYLINUX2014_AARCH64_TAG=2023-07-06-73b0312
-MANYLINUX2014_PPC64LE_TAG=2023-07-06-73b0312
+PYVERSIONS_WIN="3.7.9 3.8.10 3.9.13 3.10.11 3.11.5"
+PYVERSIONS_MACOSUNIVERSAL="3.8.10 3.9.13 3.10.11 3.11.5"
+PYURLS_MACOSUNIVERSAL="https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg https://www.python.org/ftp/python/3.11.5/python-3.11.5-macos11.pkg"
+CCACHE_VERSION=4.8.3
+CCACHE_URL=https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3-windows-x86_64.zip
+CYTHON_VERSION=3.0.2
+MANYLINUX2014_X86_64_TAG=2023-09-24-36b93e4
+MANYLINUX2014_AARCH64_TAG=2023-09-24-36b93e4
+MANYLINUX2014_PPC64LE_TAG=2023-09-24-36b93e4
 # END DEPENDENCY-AUTOUPDATE SECTION
 
 

diff --git a/build/make/platforms/macosuniversal.mak b/build/make/platforms/macosuniversal.mak
@@ -144,7 +144,7 @@ endif
 #Strict flags
 ifeq ($(STRICT),1)
 #"long long" is used in sysTypes.h
-OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option -Wno-parentheses -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-local-typedef -Wno-unknown-warning-option -Wno-deprecated-copy -Wno-unused-but-set-variable -Wno-deprecated-declarations
+OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option -Wno-parentheses -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-local-typedef -Wno-unknown-warning-option -Wno-deprecated-copy -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-invalid-utf8
 #OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option
 LIBRARYFLAGS +=  -Werror -Wall -Wextra -Werror
 EXECUTABLEFLAGS += -Werror -Wall -Wextra

diff --git a/build/make/platforms/macx64.mak b/build/make/platforms/macx64.mak
@@ -144,7 +144,7 @@ endif
 #Strict flags
 ifeq ($(STRICT),1)
 #"long long" is used in sysTypes.h
-OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option -Wno-parentheses -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-local-typedef -Wno-unknown-warning-option -Wno-deprecated-copy -Wno-unused-but-set-variable -Wno-deprecated-declarations
+OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option -Wno-parentheses -Wno-missing-field-initializers -Wno-unused-parameter -Wno-unused-local-typedef -Wno-unknown-warning-option -Wno-deprecated-copy -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-invalid-utf8
 #OBJECTFLAGS += -Wno-long-long -Werror -Wall -Wextra -pedantic-errors -fdiagnostics-show-option
 LIBRARYFLAGS +=  -Werror -Wall -Wextra -Werror
 EXECUTABLEFLAGS += -Werror -Wall -Wextra

diff --git a/modules/iknowpy/iknowpy/engine.pxd b/modules/iknowpy/iknowpy/engine.pxd
@@ -24,7 +24,6 @@ cdef extern from "../../engine/src/engine.h" namespace "iknowdata" nogil:
 		Generic3 = 15
 
 cdef extern from "../../engine/src/engine.h" namespace "iknowdata::Entity" nogil:
-	const size_t kNoConcept = <size_t>(-1)
 	enum eType:
 		NonRelevant = 0,
 		Concept

diff --git a/modules/iknowpy/setup.py b/modules/iknowpy/setup.py
@@ -833,7 +833,7 @@ def is_canonical_version(version):
         version=version,
         python_requires='>=3.7',
         setup_requires=[
-            'cython',
+            'cython>=3',
             'wheel',
             'setuptools>=20.6.8',
             'pefile; sys_platform == "win32"',
@@ -850,8 +850,7 @@ def is_canonical_version(version):
                 extra_compile_args=extra_compile_args,
                 extra_link_args=extra_link_args
             )],
-            annotate=annotate,
-            compiler_directives={'language_level': '3', 'binding': True}
+            annotate=annotate
         ),
         cmdclass={
             'clean': CleanCommand,

diff --git a/reference_materials/reference/test/ja_test.raw b/reference_materials/reference/test/ja_test.raw
@@ -19435,7 +19435,6 @@ C1ホルモンの変化
 Rです
 P人間の体 は 加齢 とともに 腎臓 や 呼吸 心筋の機能 が 低下してきます が 一番大きな影響 を もたらす は ホルモンの変化 です
 S今、実年齢のほかに「血管年齢」とか「骨年齢」、「見た目年齢」などいろいろな（生物学的）年齢の指標<が>あるんですけど、生物学的な年齢<が>実年齢より若い人<は>、その後も健康的な生活<を>長く送っている例<が>多いですね。
-<attr type="time" literal="生物学的な年齢" token="年">
 <attr type="entity_vector" "多い" "例" "若い人" "健康的な生活" "実年齢" "生物学的な年齢" "年齢の指標" "生物学的" "見た目年齢" "骨年齢" "血管年齢" "実年齢" "いろいろな">
 R今
 C1実年齢
@@ -28202,9 +28201,9 @@ C1指示あり
 P当直医確認 し 夕のノボラビッド4単位 施行し おにぎり接種可 との 指示あり
 S当社（本社：東京都千代田区、社長：月岡　隆）の子会社である出光スノーレ石油開発株式会社（※）（本社：東京都千代田区、社長：辻　行介）は、ノルウェー現地法人出光ペトロリアムノルゲ（Idemitsu　Petroleum　Norge　AS、社長：高橋　照之、以下　IPN）<を>通じ、２０１３年９月にノルウェー政府<が>実施した２０１３年度年次公開鉱区入札に参加し、１月２１日、１鉱区（PL７５６として６５０７／７，１０ブロック）の権益<を>取得しました。
 <attr type="time" literal="２０１３年９月" token="２０１３年９月">
-<attr type="time" literal="２０１３年度年次公開鉱区入札" token="２０１３年度">
+<attr type="frequency" literal="２０１３年度年次公開鉱区入札" token="２０１３年度年次">
 <attr type="time" literal="１月２１日" token="１月２１日">
-<attr type="entity_vector" "権益" "６５０７／７，１０ブロック" "PL７５６" "１鉱区" "ノルウェー政府" "IPN" "照之" "高橋" "社長" "Idemitsu　Petroleum　Norge　AS" "ノルウェー現地法人出光ペトロリアムノルゲ" "行介" "辻" "社長" "東京都千代田区" "本社" "出光スノーレ石油開発株式会社" "子会社" "隆" "月岡" "社長" "東京都千代田区" "本社" "当社" "１月２１日" "２０１３年度年次公開鉱区入札" "２０１３年９月">
+<attr type="entity_vector" "権益" "６５０７／７，１０ブロック" "PL７５６" "１鉱区" "２０１３年度年次公開鉱区入札" "ノルウェー政府" "IPN" "照之" "高橋" "社長" "Idemitsu　Petroleum　Norge　AS" "ノルウェー現地法人出光ペトロリアムノルゲ" "行介" "辻" "社長" "東京都千代田区" "本社" "出光スノーレ石油開発株式会社" "子会社" "隆" "月岡" "社長" "東京都千代田区" "本社" "当社" "１月２１日" "２０１３年９月">
 C1当社
 C1本社
 C1東京都千代田区