Merge dev

squarebit-studios · Nov 26, 2024 · d4cd085 · d4cd085
2 parents 9dcb1ad + 6567e1c
commit d4cd085
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -85,7 +85,7 @@ Conda is best installed via [miniconda](https://docs.conda.io/en/latest/minicond
       ```
 
 ## Dependencies
-- Python 3.9
+- [Python 3.9](https://www.python.org/downloads/release/python-390/)
     - [Qt.py](https://github.com/mottosso/Qt.py)
     - [PySide6](https://doc.qt.io/qtforpython-6/gettingstarted.html)  
     - `pip install -e <path to nxt core clone>`

diff --git 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, 

diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@ Only clone this repo if you're [contributing](CONTRIBUTING.md) to the NXT codeba
 <br>
 
 #### Requirements
-- Python >= [2.7.*](https://www.python.org/download/releases/2.7) <= [3.7.*](https://www.python.org/download/releases/3.7)
-- We strongly recommend using a Python [virtual environment](https://docs.python.org/3.7/tutorial/venv.html)
+- Python >= [3.9.*](https://www.python.org/downloads/release/python-390/)
+- We strongly recommend using a Python [virtual environment](https://docs.python.org/3/library/venv.html)
 
 *[Requirements for contributors](CONTRIBUTING.md#python-environment)*  
 

diff --git a/nxt_editor/resources/LICENSE.FEATHERICONS b/nxt_editor/resources/LICENSE.FEATHERICONS
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Cole Bemis
+Copyright (c) 2013-2023 Cole Bemis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/setup.py b/setup.py
@@ -2,25 +2,22 @@
 import json
 import os
 import io
-
 this_dir = os.path.dirname(os.path.realpath(__file__))
-module_dir = os.path.join(this_dir, "nxt_editor")
+module_dir = os.path.join(this_dir, 'nxt_editor')
 
 with io.open(os.path.join(this_dir, "README.md"), "r", encoding="utf-8") as fp:
     long_description = fp.read()
 
-desc = (
-    "A general purpose code compositor designed for rigging, "
-    "scene assembly, and automation. (node execution tree)"
-)
+desc = ("A general purpose code compositor designed for rigging, "
+        "scene assembly, and automation. (node execution tree)")
 
-with open(os.path.join(module_dir, "version.json"), "r") as fp:
+with open(os.path.join(module_dir, "version.json"), 'r') as fp:
     ed_version_data = json.load(fp)
-ed_v_data = ed_version_data["EDITOR"]
-ed_major = ed_v_data["MAJOR"]
-ed_minor = ed_v_data["MINOR"]
-ed_patch = ed_v_data["PATCH"]
-editor_version = "{}.{}.{}".format(ed_major, ed_minor, ed_patch)
+ed_v_data = ed_version_data['EDITOR']
+ed_major = ed_v_data['MAJOR']
+ed_minor = ed_v_data['MINOR']
+ed_patch = ed_v_data['PATCH']
+editor_version = '{}.{}.{}'.format(ed_major, ed_minor, ed_patch)
 setuptools.setup(
     name="nxt-editor",
     version=editor_version,
@@ -31,21 +28,22 @@
     long_description_content_type="text/markdown",
     url="https://github.com/nxt-dev/nxt_editor",
     packages=setuptools.find_packages(),
-    python_requires=">=3.7, <3.12",
-    install_requires=["nxt-core<1.0,>=0.14", "qt.py<3", "PySide6>=6,<6.8"],
+    python_requires='>=3.9, <3.12',
+    install_requires=['nxt-core<1.0,>=0.14',
+                      'qt.py<3',
+                      'PySide6>=6,<6.8'
+                      ],
     package_data={
         # covers text nxt files
         "": ["*.nxt"],
         # Covers builtin, and full depth of resources
-        "nxt_editor": [
-            "version.json",
-            "integration/*",
-            "integration/*/*",
-            "integration/*/*/*",
-            "resources/*",
-            "resources/*/*",
-            "resources/*/*/*",
-            "resources/*/*/*/*",
-        ],
-    },
+        "nxt_editor": ["version.json",
+                       "integration/*",
+                       "integration/*/*",
+                       "integration/*/*/*",
+                       "resources/*",
+                       "resources/*/*",
+                       "resources/*/*/*",
+                       "resources/*/*/*/*"],
+    }
 )