Skip to content

Commit

Permalink
Merge pull request #16 from nxt-dev/dev
Browse files Browse the repository at this point in the history
Release editor-v3.4.0
  • Loading branch information
MichaelAldrich authored Dec 2, 2020
2 parents 8f5c869 + eb41026 commit 3ac68e7
Show file tree
Hide file tree
Showing 35 changed files with 1,106 additions and 293 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
docs/build/
build/
site/
nxt/ui/resources.py
nxt_editor/resources.py*
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ before_install:
install:
- cd ..
- git clone git+ssh://git@github.com/nxt-dev/nxt.git
- git clone https://github.com/nxt-dev/nxt.git
- pip install ./nxt
- pip install ./nxt_editor
- pip install twine
Expand All @@ -38,6 +38,6 @@ script:
fi
- |
if [ "$TRAVIS_BRANCH" = "release" ] && [ "$TRAVIS_EVENT_TYPE" = "push" ]; then
python -m nxt.cli exec nxt/build/packaging.nxt -s /make_and_test_upload
python -m nxt.cli exec nxt/build/packaging.nxt -s /make_and_upload
exit $?
fi
4 changes: 4 additions & 0 deletions build/release.nxt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
]
},
"collapse": {
"/BeginRelease/CheckCommits": false,
"/CreateRelease/UploadMayaPlugin": false,
"/ValidatePushed/Push": false,
"/clone_fresh_source": false
Expand Down Expand Up @@ -192,6 +193,9 @@
"EDITOR": {
"type": "NoneType",
"value": "None"
},
"_graph_path": {
"value": "${file::validate_version_numbers.nxt}"
}
}
}
Expand Down
256 changes: 256 additions & 0 deletions build/validate_version_numbers.nxt
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
{
"version": "1.17",
"alias": "validate_version_numbers",
"color": "#2065be",
"mute": false,
"solo": false,
"references": [
"../../nxt/build/validate_version_numbers.nxt"
],
"meta_data": {
"positions": {
"/CheckoutMaster": [
140.0,
0.0
],
"/CheckoutWorking": [
700.0,
0.0
],
"/GitClone": [
-1200.0,
-220.0
],
"/GitCmd": [
-1600.0,
-200.0
],
"/GitCurBranch": [
-1180.0,
-120.0
],
"/GitPR": [
-1600.0,
-60.0
],
"/GitRelease": [
-1600.0,
-280.0
],
"/GitStatus": [
-1200.0,
-280.0
],
"/GitUpload": [
-1600.0,
240.0
],
"/JsonLoad": [
-1600.0,
60.0
],
"/ParseVersionJSON": [
480.0,
0.0
],
"/ParseVersions": [
340.0,
0.0
],
"/ParseVersions/Parse_EDITOR_Version": [
0.0,
0.0
],
"/PreCheck": [
-160.0,
0.0
],
"/ValidateVersion": [
1040.0,
0.0
],
"/ValidateWorking": [
-20.0,
120.0
],
"/init": [
-340.0,
0.0
],
"/init2": [
-340.0,
-60.0
],
"/make_module_folder": [
-1600.0,
160.0
],
"/node": [
-292.3593249283184,
-295.4476276564344
]
},
"collapse": {
"/CheckoutRelease/CheckoutRelease": false,
"/CheckoutRelease/GitPull": false,
"/CheckoutRelease/ValidateRelease": false,
"/CheckoutWorking/CheckoutWorking": true,
"/CheckoutWorking/ValidateWorking": true,
"/GitCurBranch": true,
"/GitStatus": true,
"/GitUpload": true,
"/ParseVersions": false,
"/ParseVersions/Parse_API_Version": false,
"/make_module_folder": true
}
},
"nodes": {
"/": {
"child_order": [
"CheckCommits",
"ValidatePushed",
"CreateRelease",
"BeginPR",
"ParseGitReturn",
"ParseGitReturn2",
"GitCmd",
"GitCmd2",
"CheckoutRelease",
"JsonLoad2",
"BeginRelease",
"GitCurBranch2",
"CheckoutWorking",
"make_package",
"GenerateHotkeysMD",
"make_module_folder",
"UpdateReleasePR",
"GenerateChangelog",
"ParseVersionJSON",
"ValidateWorking",
"ParseVersions",
"init",
"ValidateVersion"
],
"attrs": {
"EDITOR": {
"type": "NoneType",
"value": "None"
},
"release_editor_version": {
"comment": "Expected EDITOR version number",
"type": "list",
"value": "[0, 0, 0]"
},
"version_attrs": {
"type": "tuple",
"value": "('EDITOR',)"
}
},
"code": [
"# Builtin",
"import subprocess",
"import json",
"# Internal",
"from nxt_editor.constants import EDITOR_VERSION",
"attrs = ('API', 'EDITOR', 'GRAPH')",
"for attr in attrs:",
" val = getattr(self, attr)",
" if val == 'None' or val is None:",
" continue",
" if not val.startswith((\"'\", \"\\\"\")):",
" setattr(STAGE, attr, w(val))",
""
]
},
"/ParseVersions/Parse_API_Version": {
"enabled": false
},
"/ParseVersions/Parse_EDITOR_Version": {
"instance": "../Parse_API_Version",
"enabled": true,
"attrs": {
"file_path": {
"type": "raw",
"value": "${file::../../nxt_editor/nxt_editor/version.json}"
}
}
},
"/ValidateVersion": {
"code": [
"# The index of the int that should incriment in the version num",
"version_data = {",
"'EDITOR': {'rel_type': ${/.EDITOR},",
" 'version': ${/.release_editor_version},",
" 'actual': EDITOR_VERSION.VERSION_TUPLE}",
" }",
"passed = True",
"for rel_cat, rel_dict in version_data.items():",
" actual = rel_dict['actual']",
" release = rel_dict['version']",
" print release",
" rel_type = rel_dict['rel_type']",
" if rel_type is None:",
" continue",
" incriment_idx = self.release_types.get(rel_type)",
" expected = release[:]",
" expected[incriment_idx] += 1",
" for i in range(incriment_idx+1, 3):",
" print('resetting' + str(i))",
" try:",
" expected[i] = 0",
" except IndexError:",
" continue",
" expected = tuple(expected)",
" if expected != actual:",
" passed = False",
" print('Invlaid {} version number! Expected:{} Actual:{}'.format(rel_cat, expected, actual))",
" continue",
" version_str = '.'.join(str(i) for i in actual)",
" version_info = [rel_cat, version_str]",
" print('Pushing to STAGE: ', rel_cat, version_info)",
" setattr(STAGE, rel_cat, version_info)",
" print('{} version number {} is valid {}'.format(rel_cat, actual, rel_type))",
"if not passed:",
" raise Exception('Invlaid version numbers detected! See log')",
"",
""
]
},
"/init": {
"attrs": {
"rel_cats": {
"value": "(${/.EDITOR},)"
}
},
"code": [
"rel_cats = ${rel_cats}",
"if not any(rel_cats):",
" print(${rel_cats})",
" raise Exception('Unable to validate version numbers, no parameters provided!')",
"",
"for mode in rel_cats:",
" if mode is None:",
" continue",
" if mode.lower() not in ('major', 'minor', 'hotfix', 'patch'):",
" raise Exception('Unknown release type \"{}\"'.format(mode))",
"if ${/.GRAPH} is not None and ${/.GRAPH}.lower() == 'hotfix':",
" raise Exception('Cannot hotfix GRAPH versions!')",
"if not '${/.branch}':",
" raise Exception('No working branch provided!')",
"STAGE.hotfix = True",
"hotfix_str = 'hotfix'",
"patch_str = 'patch'",
"",
"if ${EDITOR} and ${EDITOR} not in (hotfix_str, patch_str):",
" STAGE.hotfix = False",
"",
"# Debug tool",
"# for rel_cat, actual in (('API', (0, 1, 1)), ('EDITOR', (2, 0, 0)), ('GRAPH', (1, 15, 0))):",
"# version_str = '.'.join(str(i) for i in actual)",
"# version_info = [rel_cat, version_str]",
"# print('Setting', rel_cat, version_str)",
"# setattr(STAGE, rel_cat, version_info)"
]
}
}
}
62 changes: 62 additions & 0 deletions docs/user_docs/docs/about.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<div style="text-align: center;">
<h4>A brief history & acknowledgment</h4>
</div>

!!! Note "Sunrise Productions"
We would like to acknowledge [Sunrise Productions](https://sunriseproductions.tv/) for providing us a studio incubator for 2019 and 2020.
Sunrise kept food on the table and believed in nxt before it was fully realized. Without their support we would never have made it this far.

!!! Note "SVAD Productions"
We would like to acknowledge the [School of Visual Art and Design](https://www.southern.edu/visualartanddesign/) NXT began in 2017 as a research project at SVAD.
Originally with the goal to make it the core rigging framework, nxt quickly grew into the backbone of pipeline.
We are grateful for SVAD providing the resources, education, and sponsorship to get us started.

<div style="text-align: center;">
<h4>Special Thanks</h4>
</div>

<table style="text-align: center">
<tr>
<th>Walt Yoder</th>
<th>mGear (Miquel Campos)</th>
</tr>
<tr>
<th>Matt Schiller</th>
<th></th>
</tr>
</table>

---

<div style="text-align: center;">
<h1>The open nxt project</h1>
</div>

In simple terms, we want nxt to be too good to hide. If we can deliver on the potential we, the contributors, know is contained in nxt, we can provide great wins across
many parts of the computer graphics pipeline. The full realization of nxt can only come at the scale of a public release.

Some of the most important technologies in our industry are open source, including [unreal engine](https://www.unrealengine.com/en-US/),
[python](https://www.python.org/), [qt](https://www.qt.io/), [centos](https://wiki.centos.org/FrontPage),
and the newest and perhaps biggest upcoming technology in the industry [pixar usd](http://graphics.pixar.com/usd/docs/index.html).
What all these tools have in common (excepting the newcomer usd) is how ubiquitous and wide reaching they are. Open source tools invite developers to bend them, tweak them,
and customize them to fit the exact needs of their users. The entertainment industry is full of amazing developers who are excited to build great things.
We believe nxt will become a stronger and better tool because it is open source.

We invite and will seek out opportunities to refine and hone this vision with the help and partnership of everyone who wants nxt to be great.

---

<div style="text-align: center;">
<h1>The nxt contributors</h1>
</div>

<table style="text-align: left;">
<tr>
<th><img src="../images/lucas_bw.png" style="width:100px;" alt="Lucas"/> <b>Lucas Brown</b> - Developer</th>
<th><img src="../images/michael_bw.png" style="width:100px;" alt="Michael"/> <b>Michael Aldrich</b> - Developer</th>
</tr>
<tr>
<th><img src="../images/aaron_bw.png" style="width:100px;" alt="Aaron"/> <b>Aaron Adams</b> - Visionary & Founder</th>
<th><img src="../images/zach_bw.png" style="width:100px;" alt="Zach"/> <b>Zach Gray</b> - Contributor</th>
</tr>
</table>
Loading

0 comments on commit 3ac68e7

Please sign in to comment.