Skip to content

Commit 8f34bab

Browse files
committed
fix: hypens to underscores for python package names
Signed-off-by: campionfellin <campionfellin@gmail.com>
1 parent 0ed3c1d commit 8f34bab

3 files changed

Lines changed: 18 additions & 24 deletions

File tree

src/compile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export async function compile(workdir: string, options: Options) {
6868
if (options.python) {
6969
targets.python = {
7070
distName: 'generated',
71-
module: options.python.moduleName.replace(/-/g, ''),
71+
module: options.python.moduleName.replace(/-/g, '_'),
7272
};
7373
}
7474

src/srcmak.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export async function srcmak(srcdir: string, options: Options = { }) {
3232

3333
// extract code based on selected languages
3434
if (options.python) {
35-
const reldir = options.python.moduleName.replace(/\./g, '/').replace(/-/g, ''); // jsii replaces "." with "/"
35+
const reldir = options.python.moduleName.replace(/\./g, '/').replace(/-/g, '_'); // jsii replaces "." with "/"
3636
const source = path.resolve(path.join(workdir, 'dist/python/src', reldir));
3737
const target = path.join(options.python.outdir, reldir);
3838
await fs.move(source, target, { overwrite: true });

test/__snapshots__/srcmak.test.ts.snap

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ Object {
294294
295295
exports[`python + different entrypoint + submodule 1`] = `
296296
Object {
297-
"mypython_module/submodule/__init__.py": "import abc
297+
"my_python_module/submodule/__init__.py": "import abc
298298
import builtins
299299
import datetime
300300
import enum
@@ -365,7 +365,7 @@ __all__ = [
365365
366366
publication.publish()
367367
",
368-
"mypython_module/submodule/_jsii/__init__.py": "import abc
368+
"my_python_module/submodule/_jsii/__init__.py": "import abc
369369
import builtins
370370
import datetime
371371
import enum
@@ -385,26 +385,20 @@ __all__ = [
385385
386386
publication.publish()
387387
",
388-
"mypython_module/submodule/_jsii/pythonpackage@0.0.0.jsii.tgz": "��ko�H�>�+,ߗF́m^%(��H��ש��X\`��z�S��o��]ڪ:F����kg��$e.MP*9#��c��\\\\&�[Ȥ���9��s9�� ����8�J6��_��0��7�o �a%�NM��a�
389-
IG0c'�@�D��w<J*��^d��!t��
390-
� ��!�\\"��آ�4<�� D�ĝϊ��:�����Z7�T,0�𢳇l����$Ǽ���LV�erj�*�԰� �zB��/!��Ȭ#��2 ���n�@]+���Ŏ��1���@]�h<�S\\\\��\\"�fDɆ�l3����C|�:��������Y��Z7UG�l�,%�#��@B��g�;�$kH��m�!H5��S}���C�4��K^!?�1b�
391-
�ۭh iC����E�h4# #�<�XC�I�x<F62h
392-
~���.~�U>\\\\���h�n�6�%�/�b[�w[��m�8t%U���Z�
393-
(
394-
WcG�}�w��־�h��t�,�6|�G�N��}���FԱ
395-
r�z���u��o���2�ٓ�6�hK���v\`��\\"^��Am=b1�
396-
8Ա����A�G���l�(F�\\\\
397-
I&Ԗ�g��ú�PI���rޮ�ٶm_��mҦ�{�߹��
398-
����3����_�3�5�{�,6�txQF��16&���2�R�#��|J����,�0�e���
399-
K��q�_�;o��-�X'~uM�;A��R��3#�'����Ϧ���_� �K��3�ub ;a�N�ă<C
400-
M�n ��|�
401-
ZZ�M�5�~��H����o�B��-f}UL��A}��2 � WL����7P�\\\\m%��\\"\`\`5 y�y� Ô�>\`�?��T�O������dY�:�:�[�-|S��3hjFL�(K�2�ȭ �A}%� �83W�r]��K
402-
�x��r�1w$��a}%�{�P�ue��yxŊP���)���uM6:.��>���g���Q�J�dɺ���?�H��Tiu��<��{Zj?�|��r�+/k�Vkܷ\`�I:\\\\�4|���S�k��G�}lܫ�SHpm7��<������������q�熞:��=��ۮHD��P��hк��,��B�Y��-��~\\"V{�Zp�2�ct4EM����1]�q�՚ć��S��tT-8rm>����.9j�ǣ��T3������9�#�[r�Z3'V��ܯkʌ*2�i
403-
�j6k�VZ(F{2�S%ݜt�=\\"W��ʮ��\\\\�fb�2�� ��{_�
404-
�>����ã9���=W�Erb�9��#V _7K@�����p�ؒ3�����w��/�wB����Ի&�-������~����%�� �v�1r�@�F϶�X]�Ʊ�tF؝n��ծϵs��lN5h�[:q
405-
�uj6L����\\"q�g�ys�s�!�LT2oJeY�P��aA������1��w�����;�׊�3�_�4��?�����
406-
L�����$�44���� >�{Ui����s����E]mo����.p�� � �a",
407-
"mypython_module/submodule/py.typed": "
388+
"my_python_module/submodule/_jsii/pythonpackage@0.0.0.jsii.tgz": "��ko�H�����K���6��D�������TE�z����5�T����<]Ҫ���ݙ��Ύ��ih��p.;f��y�$�T(��
389+
y�(��K�,�J�I��(yx��>�3QP����o�3j>7]*�� �fc��#�\`�ql����ȵţ���f@�w4]�_��f��� �z9^w+�tm�3@��{'\\\\*0����)[��$��}bB
390+
%��.����X}!&�S�J1*1k�{.#ܥ�� <b/�XSk���� �ZHj�����H0aV�ǫq��g��!K�1j}�Aoo��RW@ۮ�[����w�Z����H
391+
�^�qC�l[������u+��Ո����S_2Ji�C8�,2�Q.RĄ8F�Y iEo�H �IuZ���J�Db��
392+
r�)vx~4���(V���x���kc��X�maM�!
393+
��ź&�V�$i�j���W�4
394+
(wcC�m�7��޶�p����^yn�h�~�yh�uCo��O���=Jl�id���:�⃲V�d�JO��+�c��\\"�и�4�S?~R;1O8�{
395+
��{e'���Zyԅ5N�#�B���[�G8b�>�tk�+��z�m����&��ܻ?���Z���)� }n$p}3]���M��+�3��;��D>0��Z�T�W�����Y�:�f�Dy�{?wj<�ޜ��EWU�,�Pn;t���d<^��ż�]�+��7k��� � ��$��̕>ƈg
396+
�S~��<rv$ww-ё�]�j���%f��qy'� S��t���7!^��1o
397+
y��O�@��,�e�}4�4t������4���!0ק�4σ�qӽ< _'0�ρ(����uNu��R�Me8hε~�W����ڴ��̂1��r&�����|/�Uz׺R�B�J���ed�-��~дt��k�4
398+
�����'KL�e5*�n�p�՜wnj���Y����tn���M��W�5\`�qyц��J�����ܴ��}��� p�u� �x-���sX;ߠ��&��w%�6��S�:�w&�f'P�괧Ơ9��RB_cOW���V?��z�������=NB�мUnF_���a5��~���z����^7W��}� ��^�t�\`دM@�ו@k�Jj�(������$�)��dl�Fe����V��(�]�{L�ؔ���n��zm2��S�(�s7u�;����N��ڽ@m$rR%������PPd���SP y��;�����㆜� ��t��/�B���z4�&�-���/���/ ����3�������,m=�\\"m�8���17
399+
;FR>���׳yAs���IKаS����� 4V������;v���̓Z2Iɼ*
400+
a���?��6��aLϷ1�ŏ��C_x�c��yH���g@\\\\S iAH>��aMf��P�����&��c*M00T} �~'��w���C^�^��'/~9M",
401+
"my_python_module/submodule/py.typed": "
408402
",
409403
}
410404
`;

0 commit comments

Comments
 (0)