From e7810e1bf9b81ae8f87549d2f2339d446f5c495a Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+ImLucasBrown@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:27:04 -0600 Subject: [PATCH 01/11] added 3.11 to uniittest matrix, added `xcb-cursor0` to the linux tests for GUI tests work (I hope) --- .github/workflows/unittests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index c23ed16..6ffc989 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] fail-fast: true runs-on: ${{ matrix.os }} @@ -49,6 +49,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y \ + xcb-cursor0 \ libxkbcommon-x11-0 \ libxrender1 \ libxext6 \ @@ -88,4 +89,4 @@ jobs: - name: Run Unittests from CLI if: env.QT_DEPENDENCIES != 'true' - run: python -m nxt.cli test \ No newline at end of file + run: python -m nxt.cli test From 7cc8177b0b6e09e8102a1ec181221405bf33d92c Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+ImLucasBrown@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:30:10 -0600 Subject: [PATCH 02/11] Update unittests.yml --- .github/workflows/unittests.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 6ffc989..da67c6d 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -49,25 +49,17 @@ jobs: run: | sudo apt-get update sudo apt-get install -y \ - xcb-cursor0 \ libxkbcommon-x11-0 \ - libxrender1 \ - libxext6 \ - libxcb1 \ + libxcb-cursor0 \ libxcb-icccm4 \ libxcb-image0 \ libxcb-keysyms1 \ - libxcb-randr0 \ - libxcb-render0 \ libxcb-render-util0 \ libxcb-shape0 \ - libxcb-shm0 \ - libxcb-sync1 \ libxcb-xfixes0 \ + libxcb-randr0 \ libxcb-xinerama0 \ - libxcb-xkb1 \ - libqt5x11extras5 \ - xvfb + libxcb-util1 - name: Ensure PIP run: python -m ensurepip --upgrade From 2e106cb23921080da55e84bba76c7a865f2f686c Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+ImLucasBrown@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:31:20 -0600 Subject: [PATCH 03/11] Update unittests.yml From 7b20f7910e8a30cc9d8206501657e721ff79d91c Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+ImLucasBrown@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:36:35 -0600 Subject: [PATCH 04/11] * Raised Python version ceiling to `3.11` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2ce3974..1549eb8 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ long_description_content_type="text/markdown", url="https://github.com/nxt-dev/nxt", packages=setuptools.find_packages(), - python_requires='>=3.7, <3.11', + python_requires='>=3.7, <3.12', entry_points={ 'console_scripts': [ 'nxt=nxt.cli:main', From 38d91471cd445f138b863ddc89916696610abee2 Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+ImLucasBrown@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:46:33 -0600 Subject: [PATCH 05/11] Update unittests.yml --- .github/workflows/unittests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index da67c6d..6e0c70c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -59,7 +59,9 @@ jobs: libxcb-xfixes0 \ libxcb-randr0 \ libxcb-xinerama0 \ - libxcb-util1 + libxcb-util1 \ + libegl1 \ + xvfb - name: Ensure PIP run: python -m ensurepip --upgrade From 510d5e09385576173dec71b0d1408306e48cc51f Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:06:36 -0600 Subject: [PATCH 06/11] fixed doc string with escape sequence for py 3.12 --- nxt/stage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxt/stage.py b/nxt/stage.py index 88de056..c3c3c97 100644 --- a/nxt/stage.py +++ b/nxt/stage.py @@ -408,7 +408,7 @@ def get_stash_data(self, layer): @staticmethod def legalize_name(name): - """Returns given `name` without leading numeral, and matching + r"""Returns given `name` without leading numeral, and matching `\w` regex: (a-z, A-Z, 0-9, _) Replaces illegal characters with underscore. """ From 579e0c49137fda53d2c50e6002a68fb801fd832c Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:29:37 -0600 Subject: [PATCH 07/11] ! Changed the RPC flag. If launching the editor you must pass `-rpc` if you wish to start the RPC server with NXT. - Removed `-no-rpc` flag as editor's RPC server defaults to off now. --- nxt/cli.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nxt/cli.py b/nxt/cli.py index 02b2bd3..1a15fd9 100644 --- a/nxt/cli.py +++ b/nxt/cli.py @@ -92,7 +92,7 @@ def editor(args): else: paths = [args.path] os.environ[NXT_DCC_ENV_VAR] = STANDALONE - sys.exit(nxt_editor.launch_editor(paths, start_rpc=not args.no_rpc)) + sys.exit(nxt_editor.launch_editor(paths, start_rpc=args.rpc)) def execute(args): @@ -167,9 +167,9 @@ def main(): gui_parser.set_defaults(which='ui') gui_parser.add_argument('path', type=str, nargs='?', help='file(s) to open', default='') - no_rpc_help = ('Start editor without setting up an rpc server during ' - 'startup.') - gui_parser.add_argument('-no-rpc', help=no_rpc_help, + rpc_help = ('Start editor with an rpc server running in the ' + 'background.') + gui_parser.add_argument('-rpc', help=rpc_help, action='store_true') exec_parser = subs.add_parser('exec', help='Execute graph. See: exec -h') From 960e3e372e8f5fde402a5f659b22c4419f8e7c00 Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:21:02 -0600 Subject: [PATCH 08/11] version up for release --- nxt/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxt/version.json b/nxt/version.json index 54b9793..c60841a 100644 --- a/nxt/version.json +++ b/nxt/version.json @@ -1,7 +1,7 @@ { "API": { "MAJOR": 0, - "MINOR": 17, + "MINOR": 18, "PATCH": 0 }, "GRAPH": { From c1ffdde2f47d9171e934b80592af2672a43c9a2e Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:00:14 -0600 Subject: [PATCH 09/11] removed mention of Py2 from release footer --- build/release_footer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/release_footer.md b/build/release_footer.md index fb55e90..6ba0076 100644 --- a/build/release_footer.md +++ b/build/release_footer.md @@ -3,5 +3,5 @@ This release saves `${graph_version}` graphs. This release includes backwards compatibility for graph versions as old as `0.45` . # Pip Installation -From a Python(2 or 3) environment run the following command: +From a Python 3 environment run the following command: `pip install nxt-core` \ No newline at end of file From 376bfd71eb34fe93d440434b662c6e43c7cd7193 Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:55:14 -0600 Subject: [PATCH 10/11] updated license date --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index be2edfa..d6a9913 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2020 The nxt Authors +Copyright (c) 2015-2025 The nxt Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, From 9449c61d8b493420fd8c358bc6ce6aaa004ac87c Mon Sep 17 00:00:00 2001 From: Lucas Brown <54835354+imlucasbrown@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:57:12 -0600 Subject: [PATCH 11/11] removed older version of Python from matrix test --- .github/workflows/unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 6e0c70c..b2b88d9 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] fail-fast: true runs-on: ${{ matrix.os }}