From 2a88e1aa5ca5b5a39818a766f024b0ed93183f74 Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Sat, 8 Apr 2023 21:57:55 +0900 Subject: [PATCH 1/9] Back to development: 0.7 --- CHANGES.rst | 6 ++++++ src/hypua2jamo/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 79e7ac8..cb543b0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,12 @@ Changes ======= +0.7 (unreleased) +---------------- + +- Nothing changed yet. + + 0.6 (2023-04-02) ---------------- diff --git a/src/hypua2jamo/__init__.py b/src/hypua2jamo/__init__.py index dff180a..8c9c7f3 100644 --- a/src/hypua2jamo/__init__.py +++ b/src/hypua2jamo/__init__.py @@ -20,7 +20,7 @@ import logging -__version__ = '0.6' +__version__ = '0.7.dev0' logger = logging.getLogger(__name__) From d9a2b70f3cd2bcee53191f106f5c4936e1932f0d Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Sat, 8 Apr 2023 21:59:08 +0900 Subject: [PATCH 2/9] appveyor: twine upload --skip-existing --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2be5950..4b12fc3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -114,6 +114,6 @@ artifacts: name: wheel deploy_script: - - ps: if ($env:APPVEYOR_REPO_TAG -eq $TRUE) { pip install twine; twine upload dist/*.whl } + - ps: if ($env:APPVEYOR_REPO_TAG -eq $TRUE) { pip install twine; twine upload --skip-existing dist/*.whl } deploy: on From 236c8832ed992242bfbf375d8b76b7eec75cd8b8 Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Sun, 9 Apr 2023 01:28:09 +0900 Subject: [PATCH 3/9] requirements/dev: cython 0.29.34 --- requirements/dev.in | 2 +- requirements/dev.txt | 2 +- src/hypua2jamo/_cython2.c | 62 +++++++++++++++++++-------------------- src/hypua2jamo/_cython3.c | 62 +++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 75c7dcf..2a00a2c 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -2,7 +2,7 @@ argcomplete >= 1.9.4 babel >= 2.6.0 bleach >= 3.1.4 coloredlogs >= 10.0 -cython >= 0.29.32 +cython >= 0.29.34 jupyter ktug-hanyang-pua == 0.1.2 notebook >= 5.7.8 diff --git a/requirements/dev.txt b/requirements/dev.txt index 494a635..a0fcc54 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -77,7 +77,7 @@ coverage==5.5 # via -r requirements/test.in cryptography==40.0.1 # via secretstorage -cython==0.29.33 +cython==0.29.34 # via -r requirements/dev.in debugpy==1.6.6 # via ipykernel diff --git a/src/hypua2jamo/_cython2.c b/src/hypua2jamo/_cython2.c index 7f07549..6cd213a 100644 --- a/src/hypua2jamo/_cython2.c +++ b/src/hypua2jamo/_cython2.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.32 */ +/* Generated by Cython 0.29.34 */ #ifndef PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN @@ -9,8 +9,8 @@ #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) #error Cython requires Python 2.6+ or Python 3.3+. #else -#define CYTHON_ABI "0_29_32" -#define CYTHON_HEX_VERSION 0x001D20F0 +#define CYTHON_ABI "0_29_34" +#define CYTHON_HEX_VERSION 0x001D22F0 #define CYTHON_FUTURE_DIVISION 0 #include #ifndef offsetof @@ -87,7 +87,7 @@ #undef CYTHON_USE_EXC_INFO_STACK #define CYTHON_USE_EXC_INFO_STACK 0 #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC - #define CYTHON_UPDATE_DESCRIPTOR_DOC (PYPY_VERSION_HEX >= 0x07030900) + #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 #endif #elif defined(PYSTON_VERSION) #define CYTHON_COMPILING_IN_PYPY 0 @@ -203,7 +203,7 @@ #undef CYTHON_USE_PYLONG_INTERNALS #define CYTHON_USE_PYLONG_INTERNALS 0 #elif !defined(CYTHON_USE_PYLONG_INTERNALS) - #define CYTHON_USE_PYLONG_INTERNALS 1 + #define CYTHON_USE_PYLONG_INTERNALS (PY_VERSION_HEX < 0x030C00A5) #endif #ifndef CYTHON_USE_PYLIST_INTERNALS #define CYTHON_USE_PYLIST_INTERNALS 1 @@ -242,7 +242,7 @@ #define CYTHON_USE_TP_FINALIZE (PY_VERSION_HEX >= 0x030400a1) #endif #ifndef CYTHON_USE_DICT_VERSIONS - #define CYTHON_USE_DICT_VERSIONS (PY_VERSION_HEX >= 0x030600B1) + #define CYTHON_USE_DICT_VERSIONS ((PY_VERSION_HEX >= 0x030600B1) && (PY_VERSION_HEX < 0x030C00A5)) #endif #if PY_VERSION_HEX >= 0x030B00A4 #undef CYTHON_USE_EXC_INFO_STACK @@ -552,11 +552,11 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { #endif #if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND) #define CYTHON_PEP393_ENABLED 1 - #if defined(PyUnicode_IS_READY) - #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\ - 0 : _PyUnicode_Ready((PyObject *)(op))) + #if PY_VERSION_HEX >= 0x030C0000 + #define __Pyx_PyUnicode_READY(op) (0) #else - #define __Pyx_PyUnicode_READY(op) (0) + #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\ + 0 : _PyUnicode_Ready((PyObject *)(op))) #endif #define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_LENGTH(u) #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i) @@ -565,14 +565,14 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { #define __Pyx_PyUnicode_DATA(u) PyUnicode_DATA(u) #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i) #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch) - #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE) - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000 - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length)) - #else - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) - #endif + #if PY_VERSION_HEX >= 0x030C0000 + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) #else - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) + #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000 + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length)) + #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) + #endif #endif #else #define CYTHON_PEP393_ENABLED 0 @@ -1379,18 +1379,18 @@ static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UIN /* GetModuleGlobalName.proto */ #if CYTHON_USE_DICT_VERSIONS -#define __Pyx_GetModuleGlobalName(var, name) {\ +#define __Pyx_GetModuleGlobalName(var, name) do {\ static PY_UINT64_T __pyx_dict_version = 0;\ static PyObject *__pyx_dict_cached_value = NULL;\ (var) = (likely(__pyx_dict_version == __PYX_GET_DICT_VERSION(__pyx_d))) ?\ (likely(__pyx_dict_cached_value) ? __Pyx_NewRef(__pyx_dict_cached_value) : __Pyx_GetBuiltinName(name)) :\ __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\ -} -#define __Pyx_GetModuleGlobalNameUncached(var, name) {\ +} while(0) +#define __Pyx_GetModuleGlobalNameUncached(var, name) do {\ PY_UINT64_T __pyx_dict_version;\ PyObject *__pyx_dict_cached_value;\ (var) = __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\ -} +} while(0) static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value); #else #define __Pyx_GetModuleGlobalName(var, name) (var) = __Pyx__GetModuleGlobalName(name) @@ -5766,7 +5766,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { } static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) { - if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error); + if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 1, __pyx_L1_error) return 0; __pyx_L1_error:; @@ -6097,7 +6097,7 @@ if (!__Pyx_RefNanny) { Py_INCREF(__pyx_b); __pyx_cython_runtime = PyImport_AddModule((char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(0, 1, __pyx_L1_error) Py_INCREF(__pyx_cython_runtime); - if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error); + if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error) /*--- Initialize various global constants etc. ---*/ if (__Pyx_InitGlobals() < 0) __PYX_ERR(0, 1, __pyx_L1_error) #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT) @@ -6740,13 +6740,7 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject } PyErr_SetObject(type, value); if (tb) { -#if CYTHON_COMPILING_IN_PYPY - PyObject *tmp_type, *tmp_value, *tmp_tb; - PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb); - Py_INCREF(tb); - PyErr_Restore(tmp_type, tmp_value, tb); - Py_XDECREF(tmp_tb); -#else +#if CYTHON_FAST_THREAD_STATE PyThreadState *tstate = __Pyx_PyThreadState_Current; PyObject* tmp_tb = tstate->curexc_traceback; if (tb != tmp_tb) { @@ -6754,6 +6748,12 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject tstate->curexc_traceback = tb; Py_XDECREF(tmp_tb); } +#else + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb); + Py_INCREF(tb); + PyErr_Restore(tmp_type, tmp_value, tb); + Py_XDECREF(tmp_tb); #endif } bad: @@ -7347,7 +7347,7 @@ static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name) /* CLineInTraceback */ #ifndef CYTHON_CLINE_IN_TRACEBACK -static int __Pyx_CLineForTraceback(CYTHON_NCP_UNUSED PyThreadState *tstate, int c_line) { +static int __Pyx_CLineForTraceback(CYTHON_UNUSED PyThreadState *tstate, int c_line) { PyObject *use_cline; PyObject *ptype, *pvalue, *ptraceback; #if CYTHON_COMPILING_IN_CPYTHON diff --git a/src/hypua2jamo/_cython3.c b/src/hypua2jamo/_cython3.c index 1356f53..e07c9ac 100644 --- a/src/hypua2jamo/_cython3.c +++ b/src/hypua2jamo/_cython3.c @@ -1,4 +1,4 @@ -/* Generated by Cython 0.29.32 */ +/* Generated by Cython 0.29.34 */ #ifndef PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN @@ -9,8 +9,8 @@ #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03030000) #error Cython requires Python 2.6+ or Python 3.3+. #else -#define CYTHON_ABI "0_29_32" -#define CYTHON_HEX_VERSION 0x001D20F0 +#define CYTHON_ABI "0_29_34" +#define CYTHON_HEX_VERSION 0x001D22F0 #define CYTHON_FUTURE_DIVISION 1 #include #ifndef offsetof @@ -87,7 +87,7 @@ #undef CYTHON_USE_EXC_INFO_STACK #define CYTHON_USE_EXC_INFO_STACK 0 #ifndef CYTHON_UPDATE_DESCRIPTOR_DOC - #define CYTHON_UPDATE_DESCRIPTOR_DOC (PYPY_VERSION_HEX >= 0x07030900) + #define CYTHON_UPDATE_DESCRIPTOR_DOC 0 #endif #elif defined(PYSTON_VERSION) #define CYTHON_COMPILING_IN_PYPY 0 @@ -203,7 +203,7 @@ #undef CYTHON_USE_PYLONG_INTERNALS #define CYTHON_USE_PYLONG_INTERNALS 0 #elif !defined(CYTHON_USE_PYLONG_INTERNALS) - #define CYTHON_USE_PYLONG_INTERNALS 1 + #define CYTHON_USE_PYLONG_INTERNALS (PY_VERSION_HEX < 0x030C00A5) #endif #ifndef CYTHON_USE_PYLIST_INTERNALS #define CYTHON_USE_PYLIST_INTERNALS 1 @@ -242,7 +242,7 @@ #define CYTHON_USE_TP_FINALIZE (PY_VERSION_HEX >= 0x030400a1) #endif #ifndef CYTHON_USE_DICT_VERSIONS - #define CYTHON_USE_DICT_VERSIONS (PY_VERSION_HEX >= 0x030600B1) + #define CYTHON_USE_DICT_VERSIONS ((PY_VERSION_HEX >= 0x030600B1) && (PY_VERSION_HEX < 0x030C00A5)) #endif #if PY_VERSION_HEX >= 0x030B00A4 #undef CYTHON_USE_EXC_INFO_STACK @@ -552,11 +552,11 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { #endif #if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND) #define CYTHON_PEP393_ENABLED 1 - #if defined(PyUnicode_IS_READY) - #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\ - 0 : _PyUnicode_Ready((PyObject *)(op))) + #if PY_VERSION_HEX >= 0x030C0000 + #define __Pyx_PyUnicode_READY(op) (0) #else - #define __Pyx_PyUnicode_READY(op) (0) + #define __Pyx_PyUnicode_READY(op) (likely(PyUnicode_IS_READY(op)) ?\ + 0 : _PyUnicode_Ready((PyObject *)(op))) #endif #define __Pyx_PyUnicode_GET_LENGTH(u) PyUnicode_GET_LENGTH(u) #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i) @@ -565,14 +565,14 @@ static CYTHON_INLINE void * PyThread_tss_get(Py_tss_t *key) { #define __Pyx_PyUnicode_DATA(u) PyUnicode_DATA(u) #define __Pyx_PyUnicode_READ(k, d, i) PyUnicode_READ(k, d, i) #define __Pyx_PyUnicode_WRITE(k, d, i, ch) PyUnicode_WRITE(k, d, i, ch) - #if defined(PyUnicode_IS_READY) && defined(PyUnicode_GET_SIZE) - #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000 - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length)) - #else - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) - #endif + #if PY_VERSION_HEX >= 0x030C0000 + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) #else - #define __Pyx_PyUnicode_IS_TRUE(u) (0 != PyUnicode_GET_LENGTH(u)) + #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x03090000 + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : ((PyCompactUnicodeObject *)(u))->wstr_length)) + #else + #define __Pyx_PyUnicode_IS_TRUE(u) (0 != (likely(PyUnicode_IS_READY(u)) ? PyUnicode_GET_LENGTH(u) : PyUnicode_GET_SIZE(u))) + #endif #endif #else #define CYTHON_PEP393_ENABLED 0 @@ -1379,18 +1379,18 @@ static CYTHON_INLINE int __Pyx_object_dict_version_matches(PyObject* obj, PY_UIN /* GetModuleGlobalName.proto */ #if CYTHON_USE_DICT_VERSIONS -#define __Pyx_GetModuleGlobalName(var, name) {\ +#define __Pyx_GetModuleGlobalName(var, name) do {\ static PY_UINT64_T __pyx_dict_version = 0;\ static PyObject *__pyx_dict_cached_value = NULL;\ (var) = (likely(__pyx_dict_version == __PYX_GET_DICT_VERSION(__pyx_d))) ?\ (likely(__pyx_dict_cached_value) ? __Pyx_NewRef(__pyx_dict_cached_value) : __Pyx_GetBuiltinName(name)) :\ __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\ -} -#define __Pyx_GetModuleGlobalNameUncached(var, name) {\ +} while(0) +#define __Pyx_GetModuleGlobalNameUncached(var, name) do {\ PY_UINT64_T __pyx_dict_version;\ PyObject *__pyx_dict_cached_value;\ (var) = __Pyx__GetModuleGlobalName(name, &__pyx_dict_version, &__pyx_dict_cached_value);\ -} +} while(0) static PyObject *__Pyx__GetModuleGlobalName(PyObject *name, PY_UINT64_T *dict_version, PyObject **dict_cached_value); #else #define __Pyx_GetModuleGlobalName(var, name) (var) = __Pyx__GetModuleGlobalName(name) @@ -5766,7 +5766,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { } static CYTHON_SMALL_CODE int __Pyx_InitGlobals(void) { - if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error); + if (__Pyx_InitStrings(__pyx_string_tab) < 0) __PYX_ERR(0, 1, __pyx_L1_error) __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) __PYX_ERR(0, 1, __pyx_L1_error) return 0; __pyx_L1_error:; @@ -6097,7 +6097,7 @@ if (!__Pyx_RefNanny) { Py_INCREF(__pyx_b); __pyx_cython_runtime = PyImport_AddModule((char *) "cython_runtime"); if (unlikely(!__pyx_cython_runtime)) __PYX_ERR(0, 1, __pyx_L1_error) Py_INCREF(__pyx_cython_runtime); - if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error); + if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) __PYX_ERR(0, 1, __pyx_L1_error) /*--- Initialize various global constants etc. ---*/ if (__Pyx_InitGlobals() < 0) __PYX_ERR(0, 1, __pyx_L1_error) #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT) @@ -6740,13 +6740,7 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject } PyErr_SetObject(type, value); if (tb) { -#if CYTHON_COMPILING_IN_PYPY - PyObject *tmp_type, *tmp_value, *tmp_tb; - PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb); - Py_INCREF(tb); - PyErr_Restore(tmp_type, tmp_value, tb); - Py_XDECREF(tmp_tb); -#else +#if CYTHON_FAST_THREAD_STATE PyThreadState *tstate = __Pyx_PyThreadState_Current; PyObject* tmp_tb = tstate->curexc_traceback; if (tb != tmp_tb) { @@ -6754,6 +6748,12 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject tstate->curexc_traceback = tb; Py_XDECREF(tmp_tb); } +#else + PyObject *tmp_type, *tmp_value, *tmp_tb; + PyErr_Fetch(&tmp_type, &tmp_value, &tmp_tb); + Py_INCREF(tb); + PyErr_Restore(tmp_type, tmp_value, tb); + Py_XDECREF(tmp_tb); #endif } bad: @@ -7347,7 +7347,7 @@ static CYTHON_INLINE PyObject *__Pyx__GetModuleGlobalName(PyObject *name) /* CLineInTraceback */ #ifndef CYTHON_CLINE_IN_TRACEBACK -static int __Pyx_CLineForTraceback(CYTHON_NCP_UNUSED PyThreadState *tstate, int c_line) { +static int __Pyx_CLineForTraceback(CYTHON_UNUSED PyThreadState *tstate, int c_line) { PyObject *use_cline; PyObject *ptype, *pvalue, *ptraceback; #if CYTHON_COMPILING_IN_CPYTHON From c850ef16b13fbf0b82f6087e4cfe69de5dd2298c Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Sun, 9 Apr 2023 01:45:44 +0900 Subject: [PATCH 4/9] requirements/dev: more-itertools (removed) Fix #34 --- requirements/dev.txt | 4 +--- requirements/test.in | 1 - requirements/test.txt | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index a0fcc54..aad1265 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -221,9 +221,7 @@ mdurl==0.1.2 mistune==2.0.5 # via nbconvert more-itertools==5.0.0 - # via - # -r requirements/test.in - # jaraco-classes + # via jaraco-classes nbclassic==0.5.3 # via notebook nbclient==0.7.2 diff --git a/requirements/test.in b/requirements/test.in index 3d57584..1c3eedc 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -1,3 +1,2 @@ cffi >= 1.0.0 coverage >= 5.5, < 6.0 -more-itertools < 6 diff --git a/requirements/test.txt b/requirements/test.txt index 3c6d626..fe32a2a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -11,9 +11,5 @@ cffi==1.15.1 # -r requirements/test.in coverage==5.5 # via -r requirements/test.in -more-itertools==5.0.0 - # via -r requirements/test.in pycparser==2.21 # via cffi -six==1.16.0 - # via more-itertools From 8586132a4e5e391f3cacefbe90506499f2d0794e Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Sun, 9 Apr 2023 19:58:31 +0900 Subject: [PATCH 5/9] requirements/dev: tox 4.4.11, notebook 6.5.4 --- requirements/dev.in | 4 ++-- requirements/dev.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 2a00a2c..b89cfe7 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -5,11 +5,11 @@ coloredlogs >= 10.0 cython >= 0.29.34 jupyter ktug-hanyang-pua == 0.1.2 -notebook >= 5.7.8 +notebook >= 6.5.4 parsec >= 3.4 pip-tools >= 6.12.1 restview >= 2.9.1 -tox >= 3.4.0 +tox >= 4.4.11 wheel >= 0.31.1 zc.buildout >= 2.12.2 zest.releaser >= 6.15.2 diff --git a/requirements/dev.txt b/requirements/dev.txt index aad1265..4683459 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -97,7 +97,7 @@ executing==1.2.0 # via stack-data fastjsonschema==2.16.3 # via nbformat -filelock==3.10.6 +filelock==3.11.0 # via # tox # virtualenv @@ -244,7 +244,7 @@ nest-asyncio==1.5.6 # ipykernel # nbclassic # notebook -notebook==6.5.3 +notebook==6.5.4 # via # -r requirements/dev.in # jupyter @@ -445,7 +445,7 @@ tornado==6.2 # nbclassic # notebook # terminado -tox==4.4.8 +tox==4.4.11 # via -r requirements/dev.in traitlets==5.9.0 # via From 5db4075cf0c88589d2ddf20f419835a58d1617ea Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Mon, 22 May 2023 05:02:26 +0900 Subject: [PATCH 6/9] requirements/dev: argcomplete 3.0.8, pip-tools 6.13.0, tox 4.5.1 --- requirements/dev.in | 6 +++--- requirements/dev.txt | 10 +++++----- requirements/docs.in | 2 +- tox.ini | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index b89cfe7..6484ad2 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,4 +1,4 @@ -argcomplete >= 1.9.4 +argcomplete >= 3.0.8 babel >= 2.6.0 bleach >= 3.1.4 coloredlogs >= 10.0 @@ -7,9 +7,9 @@ jupyter ktug-hanyang-pua == 0.1.2 notebook >= 6.5.4 parsec >= 3.4 -pip-tools >= 6.12.1 +pip-tools >= 6.13.0 restview >= 2.9.1 -tox >= 4.4.11 +tox >= 4.5.1 wheel >= 0.31.1 zc.buildout >= 2.12.2 zest.releaser >= 6.15.2 diff --git a/requirements/dev.txt b/requirements/dev.txt index 4683459..41aecf4 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -10,7 +10,7 @@ alabaster==0.7.13 # sphinx anyio==3.6.2 # via jupyter-server -argcomplete==3.0.5 +argcomplete==3.0.8 # via -r requirements/dev.in argon2-cffi==21.3.0 # via @@ -250,7 +250,7 @@ notebook==6.5.4 # jupyter notebook-shim==0.2.2 # via nbclassic -packaging==23.0 +packaging==23.1 # via # build # ipykernel @@ -274,7 +274,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.12.3 +pip-tools==6.13.0 # via -r requirements/dev.in pkginfo==1.9.6 # via twine @@ -398,7 +398,7 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.4 # via beautifulsoup4 -sphinx==6.1.3 +sphinx==7.0.1 # via # -r requirements/docs.in # repoze-sphinx-autointerface @@ -445,7 +445,7 @@ tornado==6.2 # nbclassic # notebook # terminado -tox==4.4.11 +tox==4.5.1 # via -r requirements/dev.in traitlets==5.9.0 # via diff --git a/requirements/docs.in b/requirements/docs.in index 6139385..03f65ee 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,6 +1,6 @@ alabaster >= 0.7.11 repoze.sphinx.autointerface requests >= 2.20.0 -sphinx >= 1.8.1 +sphinx >= 7.0.1 sphinx-argparse >= 0.2.2 sphinx-intl >= 0.9.11 diff --git a/tox.ini b/tox.ini index cfc0330..7f13fe5 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,8 @@ skip_install = deps = -r{toxinidir}/requirements/docs.txt changedir = {toxinidir} +allowlist_externals = + make whitelist_externals = make commands = From 45b2fced09c83637e322e7d76522abb35caaf377 Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Mon, 22 May 2023 05:06:24 +0900 Subject: [PATCH 7/9] Fix hypua2jamo script - set default verbose level (to 0) - fix output encoding --- src/hypua2jamo/cli.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hypua2jamo/cli.py b/src/hypua2jamo/cli.py index 6e7e4a3..75c6420 100644 --- a/src/hypua2jamo/cli.py +++ b/src/hypua2jamo/cli.py @@ -115,9 +115,9 @@ def main(): with io.open(args.FILE, 'r', encoding='utf-8') as fp: for encoded in (translate(line) for line in fp): - sys.stdout.write(encoded.encode('utf-8')) + sys.stdout.write(encoded) encoded = translate('', final=True) - sys.stdout.write(encoded.encode('utf-8')) + sys.stdout.write(encoded) def main_argparse(): @@ -131,6 +131,7 @@ def main_argparse(): parser.add_argument( '-v', '--verbose', action='count', + default=0, help=_('increase verbosity') ) parser.add_argument( From cfc7f6af8601fe08e5feae8a41a6bb656e98fde8 Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Mon, 22 May 2023 05:11:21 +0900 Subject: [PATCH 8/9] CHANGES.rst: updated --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index cb543b0..5d9ddef 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes 0.7 (unreleased) ---------------- -- Nothing changed yet. +- Fix `hypua2jamo` script to work. 0.6 (2023-04-02) From 3f799c07dbc2388992230793541c75e3093cbf52 Mon Sep 17 00:00:00 2001 From: mete0r <137794+mete0r@users.noreply.github.com> Date: Mon, 22 May 2023 05:11:57 +0900 Subject: [PATCH 9/9] Preparing release 0.7 --- CHANGES.rst | 2 +- src/hypua2jamo/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5d9ddef..44fa6ec 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,7 +1,7 @@ Changes ======= -0.7 (unreleased) +0.7 (2023-05-22) ---------------- - Fix `hypua2jamo` script to work. diff --git a/src/hypua2jamo/__init__.py b/src/hypua2jamo/__init__.py index 8c9c7f3..206480d 100644 --- a/src/hypua2jamo/__init__.py +++ b/src/hypua2jamo/__init__.py @@ -20,7 +20,7 @@ import logging -__version__ = '0.7.dev0' +__version__ = '0.7' logger = logging.getLogger(__name__)