pyarmor 8.5.11__zip → 9.0.0__zip

{pyarmor-8.5.11 → pyarmor-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.11
+Version: 9.0.0
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor-8.5.11 → pyarmor-9.0.0}/README.md

@@ -66,7 +66,7 @@ Please read the [Pyarmor EULA](LICENSE).
 
 ## Getting Help
 
-1. **Consult the [Pyarmor 8.0 Documentation][doc].**
+1. **Consult the [Pyarmor Documentation][doc].**
 2. **Check the [FAQ][faq] for answers to common questions.**
 3. **Try the documentation [index][genindex] or the [detailed table of contents][mastertoc].**
 4. **If you still can't find the information you need, see [asking questions on GitHub][asking].**
@@ -83,75 +83,28 @@ Please read the [Pyarmor EULA](LICENSE).
 ## Resources
 
 * [Website](https://pyarmor.dashingsoft.com)
-* [Documentation 8.0][doc]
+* [Documentation][doc]
+* [Documentation 8.x](https://pyarmor.readthedocs.io/en/v8.5.12/)
 * [Documentation 7.x](https://pyarmor.readthedocs.io/en/v7.7/)
 
 中文资源
 
 * [Pyarmor 网站](https://pyarmor.dashingsoft.com/index-zh.html)
-* [Pyarmor 8.0 在线文档](https://pyarmor.readthedocs.io/zh/latest/)
+* [Pyarmor 在线文档](https://pyarmor.readthedocs.io/zh/latest/)
+* [Pyarmor 8.x 在线文档](https://pyarmor.readthedocs.io/zh/v8.5.12/)
 * [Pyarmor 7.x 在线文档](https://pyarmor.readthedocs.io/zh/v7.x/)
 
 ## Changelog
 
-Pyarmor 8.0 introduces significant changes. It has been rewritten and new features are implemented through the new commands:
-`gen`, `reg`, `cfg`. These commands only work for Python 3.7 and above.
-
-Users of versions prior to 8.0 should read the [Import Notes][important-notes] section to decide whether to upgrade Pyarmor.
-
 Each major version comes with a separate changelog file, detailing fixed issues, new features, and compatibility issues between different versions.
 
 Make sure to read the changelog carefully before upgrading Pyarmor:
+
 - [Pyarmor 8.x Changelog](docs/ChangeLogs.8)
+- [Pyarmor 9.x Changelog](docs/ChangeLogs.9)
 
 **Full changelogs** at [releases][releases]
 
-**Upcoming features** at [Pyarmor 8.x Release Plan](ReleasePlan.md)
+**Upcoming features** at [Pyarmor Release Plan](ReleasePlan.md)
 
 [releases]: https://github.com/dashingsoft/pyarmor/releases
-
-[important-notes]: #important-notes-for-users-of-pyarmor-prior-to-80
-
-## Important Notes for Users of Pyarmor Prior to 8.0
-
-Going forward, only bug fixes will be provided for older commands, such as `obfuscate` and `licenses`.
-No new features will be added to these commands, but they will continue to be usable.
-
-Upon the release of Pyarmor 8.0, there are three scenarios for existing users:
-
-### 1. Never upgrade to version 8.0+
-
-- **SPP mode will not work**
-  - To use SPP mode, you must upgrade Pyarmor to version 8.0 or later.
-
-- **`pyarmor register` command without arguments returns a `404` error**
-  - This command was used to query registration information in earlier versions of Pyarmor. However, the license server no longer supports this web API. Use `pyarmor -v` to ensure you are not using a trial version.
-
-- **Registering Pyarmor with `pyarmor register pyarmor-regcode-xxxxxx.txt` is limited to 10 uses**:
-  - To use Pyarmor on a new machine, CI server, or Docker, refer to the second method described in the registration file "pyarmor-regcode-xxxxxx.txt":
-```
-Downloading "pyarmor-regfile-xxxxxx.zip" once, use this `.zip` file to register Pyarmor later.
-```
-
-### 2. Upgrade to version 8.0 but only use old features
-
-By default, the `pyarmor` command only accepts the new commands.
-
-To continue using older commands like `obfuscate` and `licenses`, you can:
-- Use `pyarmor-7` instead of `pyarmor`
-- Set the environment variable `PYARMOR_CLI=7` and continue using `pyarmor`
-- Call the entry point `pyarmor.pyarmor:main_entry` in any other way
-
-### 3. Upgrade to version 8.0 and use new features
-
-- **New EULA**:
-  - Adhere to the new [Pyarmor EULA](LICENSE). This is a significant change for users with old personal licenses, as the new license only allows one product.
-
-- **License Upgrades**:
-  - Not all old licenses can be freely upgraded to the new license. Please refer to the [Pyarmor licenses][licenses] for more information.
-
-- **Internet Connection**:
-  - Older commands do not require an internet connection, but new commands do.
-
-- **Python Version Support**:
-  - While older commands support Python 2.7-3.10, new commands only support Python 3.7+.

{pyarmor-8.5.11 → pyarmor-9.0.0}/pyarmor/cli/__init__.py

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

{pyarmor-8.5.11 → pyarmor-9.0.0}/pyarmor/cli/__main__.py

@@ -26,7 +26,7 @@ import sys
 
 from . import logger, CliError
 from .context import Context
-from .register import Register, WebRegister
+from .register import Register, WebRegister, check_license_version
 from .config import Configer
 from .shell import PyarmorShell
 from .plugin import Plugin
@@ -222,6 +222,8 @@ def check_gen_context(ctx, args):
 def cmd_gen(ctx, args):
     options = format_gen_args(ctx, args)
     logger.debug('command options: %s', options)
+    check_license_version(ctx)
+
     ctx.push(options)
     check_gen_context(ctx, args)
 
@@ -238,8 +240,8 @@ def cmd_gen(ctx, args):
         packer = Repacker(ctx, args.pack, options['inputs'], args.output)
         packer.check()
         builder.process(options, packer=packer)
-        packer.build()
         Plugin.post_build(ctx, pack=args.pack)
+        packer.build()
     else:
         builder.process(options)
         Plugin.post_build(ctx)
@@ -304,9 +306,15 @@ def cmd_reg(ctx, args):
             logger.error('invalid registeration file "%s"', regfile)
             raise CliError('please use ".zip" file to register group device')
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         regsvr.register_group_device(regfile, args.device)
         logger.info('The device regfile has been generated successfully')
 
+    elif args.ci:
+        regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
+        regsvr.request_ci_regfile(regfile)
+
     elif regfile.endswith('.zip'):
         reg = Register(ctx)
         logger.info('register "%s"', regfile)
@@ -315,12 +323,13 @@ def cmd_reg(ctx, args):
 
     else:
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         info, msg = regsvr.prepare(regfile, args.product, upgrade=upgrade)
         prompt = 'Are you sure to continue? (yes/no) '
         if args.confirm:
             from time import sleep
             sleep(1.0)
-        elif input(msg + prompt) not in ('y', 'yes'):
+        elif input(msg + prompt) not in ('y', 'yes', 'Y', 'Yes'):
             logger.info('abort registration')
             return
         # Free upgrade to Pyarmor Basic
@@ -625,6 +634,10 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-reg
         '-y', '--confirm', action='store_true',
         help=argparse.SUPPRESS
     )
+    cparser.add_argument(
+        '-C', '--CI', action='store_true', dest='ci',
+        help='request license regfile for CI pipeline'
+    )
 
     cparser.add_argument(
         'regfile', nargs='?', metavar='FILE',
@@ -699,6 +712,7 @@ def print_version(ctx):
     print('\n'.join(info))
 
     reg.check_group_license()
+    check_license_version(ctx, silent=True)
 
 
 def get_home_paths(args):
@@ -715,8 +729,9 @@ def main_entry(argv):
     parser = main_parser()
     args = parser.parse_args(argv)
 
-    if sys.version_info[0] == 2 or sys.version_info[1] < 7:
-        raise CliError('only Python 3.7+ is supported now')
+    x, y = sys.version_info[:2]
+    if not (x == 3 and y > 6 and y < 13):
+        raise CliError('Python %s.%s is not supported' % (x, y))
 
     ctx = Context(*get_home_paths(args))
 

{pyarmor-8.5.11 → pyarmor-9.0.0}/pyarmor/cli/bug.py

@@ -62,7 +62,7 @@ UNUSED_SOLUTION_HINTS = Template('''something is wrong
 
 ENABLE_DEBUG_HINTS = 'please enable debug option `-d` to run it again'
 
-SOLUTION_HINTS = Template('''something is wrong
+SOLUTION_HINTS = Template('''
 *=============================================================*
 *  Please check console log to find out what's wrong          *
 *                                                             *
@@ -118,12 +118,12 @@ def find_solutions(e):
     '''
     logger = logging.getLogger()
     if logger.getEffectiveLevel() > logging.DEBUG:
-        logger.error(ENABLE_DEBUG_HINTS)
         return
 
+    print('\nDebug Information:')
     logger.info('generate bug file "%s"', BUG_FILE)
     generate_bug_report(e)
-    logger.error(SOLUTION_HINTS.substitute(bugfile=BUG_FILE))
+    logger.info(SOLUTION_HINTS.substitute(bugfile=BUG_FILE))
 
 
 if __name__ == '__main__':

{pyarmor-8.5.11 → pyarmor-9.0.0}/pyarmor/cli/context.py

@@ -304,6 +304,7 @@ class Context(object):
         lictype = 'basic' if licinfo['features'] == 1 else \
             'pro' if licinfo['features'] == 7 else \
             'group' if licinfo['features'] == 15 else \
+            'ci' if licinfo['features'] == 23 else \
             'trial' if licinfo['token'] == 0 else 'unknown'
         verinfo = ['%s (%s)' % (rev, lictype)]
 

{pyarmor-8.5.11 → pyarmor-9.0.0}/pyarmor/cli/default.cfg

@@ -1,12 +1,12 @@
 [pyarmor]
 
 ;; Pyarmor version
-major = 8
-minor = 5
-patch = 11
+major = 9
+minor = 0
+patch = 0
 
 ;; Compatible core version
-cli.core = 6.5.3
+cli.core = 7.6.0
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -17,7 +17,7 @@ cli.core = 6.5.3
 timeout = 6
 
 regurl = https://api.dashingsoft.com/product/key/enter/%s/?
-buyurl = https://order.mycommerce.com/product?vendorid=200089125&productid=301044051
+buyurl = https://jondy.github.io/paypal/index.html
 
 [logging]
 
@@ -205,6 +205,7 @@ clear_frame_locals = 0
 ;; Whether encrypt name in statement import
 rft_mix_import_name = 0
 
+;; Unused, now this option isn't used
 ;; Strip leading name package
 strip_package_name = 1