pyarmor.cli 9.2.0__tar.gz → 9.2.1__tar.gz

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.0
+Version: 9.2.1
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__VERSION__ = '9.2.0'
+__VERSION__ = '9.2.1'
 
 logger = logging.getLogger('cli')
 

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/__main__.py

@@ -325,7 +325,7 @@ def cmd_reg(ctx, args):
 
     else:
         regsvr = WebRegister(ctx)
-        regsvr.check_request_interval()
+        regsvr.check_request_interval(activation=regfile)
         info, msg = regsvr.prepare(regfile, args.product, upgrade=upgrade)
         prompt = 'Are you sure to continue? (yes/no) '
         if args.confirm:

pyarmor_cli-9.2.1/pyarmor/cli/batch.py

@@ -0,0 +1,62 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################
+#                                                           #
+#      Copyright @ 2025 -  Dashingsoft corp.                #
+#      All rights reserved.                                 #
+#                                                           #
+#      Pyarmor                                              #
+#                                                           #
+#      Version: 9.2.1 -                                     #
+#                                                           #
+#############################################################
+#
+#
+#  @File: cli/shell.py
+#
+#  @Author: Jondy Zhao (pyarmor@163.com)
+#
+#  @Create Date: Wed Nov  5 20:22:52 CST 2025
+#
+
+"""This script could run batch pyarmor commands.
+
+For example:
+
+    python3 -m pyarmor.cli.batch build-script.sh
+
+cd abc
+pyarmor
+
+The main purpose is to fix pyarmor CI License send too many request issues.
+
+"""
+import shlex
+import os
+
+from pyarmor.cli.__main__ import main_entry as pyarmor_run
+
+# Do not run `pyarmor reg pyarmor-ci-xxxx.zip` here, run it before this script
+
+build_commands = """
+pyarmor gen main.py
+cd ../package1
+pyarmor gen -R --enable-bcc src/
+cd ../package2
+pyarmor gen -R --enable-jit --private src/
+"""
+
+for cmd in build_commands.splitlines():
+    if cmd.startswith('#'):
+        continue
+
+    if cmd.startswith('cd '):
+        path = cmd[3:].strip()
+        print('Change current path:', path)
+        os.chdir(path)
+
+    elif cmd.startswith('pyarmor '):
+        print('Execute: ', cmd)
+        args = shlex.split(cmd[8:].strip())
+        pyarmor_run(args)

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/command.py

@@ -135,16 +135,6 @@ class Commander:
         #     action="store_const", const='std',
         #     help='genetate standard obfuscated scripts'
         # )
-        # group.add_argument(
-        #     '--ecc', dest='target', default='std',
-        #     action="store_const", const='ecc',
-        #     help='genetate scripts with embedded C code'
-        # )
-        # group.add_argument(
-        #     '--vmc', dest='target', default='std',
-        #     action="store_const", const='vmc',
-        #     help='genetate scripts with vm C code'
-        # )
         group.add_argument(
             '--rft', dest='target', default='std',
             action="store_const", const='rft',
@@ -158,7 +148,27 @@ class Commander:
         group.add_argument(
             '--mini-rft', dest='target', default='std',
             action="store_const", const='mini-rft',
-            help='genetate high performance refactor scripts'
+            help='generate scripts by combining --rft and --mini'
+        )
+        group.add_argument(
+            '--vmc', dest='target', default='std',
+            action="store_const", const='vmc',
+            help='genetate scripts with vmc code'
+        )
+        group.add_argument(
+            '--vmc-rft', dest='target', default='std',
+            action="store_const", const='vmc-rft',
+            help='generate scripts by combining --rft and --vmc'
+        )
+        group.add_argument(
+            '--ecc', dest='target', default='std',
+            action="store_const", const='ecc',
+            help='genetate scripts with embedded C code'
+        )
+        group.add_argument(
+            '--ecc-rft', dest='target', default='std',
+            action="store_const", const='ecc',
+            help='generate scripts by combining --rft and --ecc'
         )
         group.add_argument(
             '--list', dest='target', default='std',
@@ -412,6 +422,8 @@ class Commander:
             logger.info('build target %s ...', args.target)
             output = args.output if args.output else 'dist'
             self._build(project, args.target, output)
+            if args.target.startswith('std'):
+                self._cmd_gen(args)
             logger.info('build target %s end', args.target)
 
     def _build(self, project, target, output, value=None):
@@ -420,6 +432,25 @@ class Commander:
         m = Pytransform3.init(self.ctx)
         m.pre_build(args)
 
+    def _cmd_gen(self, args):
+        """If build target is std, then call `pyarmor gen`
+
+        It will obfuscate the scripts with `pyarmor_runtime.so`
+
+        Most of obfuscated options are got from config file, not from
+        command line
+
+        Option `--pack` may be still got from command line
+        """
+        from .generate import Builder
+        from .plugin import Plugin
+
+        ctx = self.ctx
+        builder = Builder(ctx)
+        Plugin.install(ctx)
+        builder.process(args)
+        Plugin.post_build(ctx)
+
     def cmd_env(self, ctx, args):
         """Check and change pyarmor settings
 

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/default.cfg

@@ -3,14 +3,14 @@
 ;; Pyarmor version
 major = 9
 minor = 2
-patch = 0
+patch = 1
 
-;; Compatible core version
+;; Compatible core version for package: pyarmor.cli.core
 cli.core = 8.1.0
-mini.core = 2.0
 
-;; ecc.core = 1.0
-;; vmc.core = 1.0
+;; Compatible core version for package: pyarmor.mini
+;; Which is required to run MINI, VMC, or ECC mode scripts
+mini.core = 3.0
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/register.py

@@ -498,7 +498,7 @@ class WebRegister(Register):
         conn.request("GET", url[k:])
         return conn.getresponse()
 
-    def check_request_interval(self, delta=30.0):
+    def check_request_interval(self, delta=30.0, activation=False):
         """Make sure no more than 2 requests in 1 minute"""
         tspath = os.path.join(self.ctx.reg_path, 'last_register')
         try:
@@ -509,8 +509,10 @@ class WebRegister(Register):
             from time import sleep, time
             d = delta - (time() - st.st_mtime)
             if d > 0:
-                logger.warning('caution: this activation file can only '
-                               'be used no more than 10 times')
+                if activation:
+                    logger.warning(
+                        'caution: this activation file "%s" can only '
+                        'be used no more than 10 times', activation)
                 logger.info('waiting for %d seconds', d)
             while time() - st.st_mtime < delta:
                 logger.info('waiting ...')

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor/cli/resource.py

@@ -109,22 +109,34 @@ class FileResource(Resource):
         return self.pyext.lower() == '.pyc'
 
     def _get_encoding(self, encoding):
+        # Maybe: from tokenize import detect_encoding
         from codecs import BOM_UTF8
         from re import search as research
+
+        def find_encoding(line):
+            try:
+                pat = r'coding[=:]\s*([-\w.]+)'
+                n = line.find(b'\n')
+                if n > -1:
+                    m = research(pat, line[:n].decode())
+                    if m:
+                        return m.group(1)
+                    if line[n+1] == 35:
+                        k = n + 1
+                        n = line.find(b'\n', k)
+                        m = research(pat, line[k:n].decode())
+                        if m:
+                            return m.group(1)
+            except Exception:
+                # Ignore decoding error or index error
+                pass
+
         with open(self.fullpath, 'rb') as f:
             line = f.read(80)
             if line and line[:3] == BOM_UTF8:
                 return 'utf-8'
             if line and line[0] == 35:
-                n = line.find(b'\n')
-                m = research(r'coding[=:]\s*([-\w.]+)', line[:n].decode())
-                if m:
-                    return m.group(1)
-                if n > -1 and len(line) > (n+1) and line[n+1] == 35:
-                    k = n + 1
-                    n = line.find(b'\n', k)
-                    m = research(r'coding[=:]\s*([-\w.]+)', line[k:n].decode())
-                    return m and m.group(1)
+                encoding = find_encoding(line) or encoding
         return encoding
 
     def readlines(self, encoding=None):

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor.cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.0
+Version: 9.2.1
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/pyarmor.cli.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ pyarmor.cli.egg-info/requires.txt
 pyarmor.cli.egg-info/top_level.txt
 pyarmor/cli/__init__.py
 pyarmor/cli/__main__.py
+pyarmor/cli/batch.py
 pyarmor/cli/bootstrap.py
 pyarmor/cli/bug.py
 pyarmor/cli/command.py

{pyarmor_cli-9.2.0 → pyarmor_cli-9.2.1}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-__VERSION__ = ' 9.2.0'
+__VERSION__ = ' 9.2.1'
 
 with open('README.rst') as f:
     long_description = f.read()