Merge remote-tracking branch 'origin/dev'

.github/workflows/nuitka.yml

@@ -21,11 +21,11 @@ jobs:
    - name: Set up Visual Studio environment
      if: success()
      uses: seanmiddleditch/gha-setup-vsdevenv@v1
-   - name: Set up Python 3.7.5 (x64)
+   - name: Set up Python 3.7.7 (x64)
      if: success()
      uses: actions/setup-python@v1
      with:
-      python-version: 3.7.5
+      python-version: 3.7.7
       architecture: x64
    - uses: dschep/install-pipenv-action@v1
      if: success()

Pipfile

@@ -9,8 +9,8 @@ pylint = "*"
 
 [packages]
 lxml = "==4.4.2"
-nuitka = "==0.6.6"
+nuitka = "==0.6.7"
 psutil = "==5.6.7"
 
 [requires]
-python_version = "3.7.5"
+python_version = "3.7.7"

pyro/PapyrusProject.xsd

@@ -92,7 +92,7 @@
     <xs:simpleType name="gameType">
         <xs:restriction base="xs:string">
             <xs:pattern value="[sS][sS][eE]"/>
-            <xs:pattern value="[tT][eE][sS]5"/>
+            <xs:pattern value="[tT][eE][sS][5vV]"/>
             <xs:pattern value="[fF][oO]4"/>
         </xs:restriction>
     </xs:simpleType>

pyro/ProjectBase.py

@@ -12,7 +12,12 @@ class ProjectBase:
 
     options: ProjectOptions = None
 
-    game_types: dict = {'sse': 'Skyrim Special Edition', 'tesv': 'Skyrim', 'fo4': 'Fallout 4'}
+    game_types: dict = {
+        'sse': 'Skyrim Special Edition',
+        'tes5': 'Skyrim',
+        'tesv': 'Skyrim',
+        'fo4': 'Fallout 4'
+    }
     variables: dict = {}
 
     program_path: str = ''
@@ -125,7 +130,7 @@ def get_registry_path(self, game_type: str = '') -> str:
                 game_name = 'Fallout4'
             elif game_type == 'sse':
                 game_name = 'Skyrim Special Edition'
-            elif game_type == 'tesv':
+            elif game_type in ('tes5', 'tesv'):
                 game_name = 'Skyrim'
             else:
                 raise ValueError('Cannot determine registry path from game type')
@@ -217,7 +222,7 @@ def get_game_type(self) -> str:
                 return 'sse'
             if game_path.endswith('skyrim'):
                 ProjectBase.log.warning('Using game type: Skyrim (determined from game path)')
-                return 'tesv'
+                return 'tes5'
 
         if self.options.registry_path:
             registry_path_parts = self.options.registry_path.casefold().split(os.sep)
@@ -229,7 +234,7 @@ def get_game_type(self) -> str:
                 return 'sse'
             if 'skyrim' in registry_path_parts:
                 ProjectBase.log.warning('Using game type: Skyrim (determined from registry path)')
-                return 'tesv'
+                return 'tes5'
 
         if self.import_paths:
             for import_path in reversed(self.import_paths):
@@ -242,7 +247,7 @@ def get_game_type(self) -> str:
                     return 'sse'
                 if 'skyrim' in path_parts:
                     ProjectBase.log.warning('Using game type: Skyrim (determined from import paths)')
-                    return 'tesv'
+                    return 'tes5'
 
         if self.options.flags_path:
             flags_path = self.options.flags_path.casefold()
@@ -254,7 +259,7 @@ def get_game_type(self) -> str:
                     self.get_game_path('sse')
                 except FileNotFoundError:
                     ProjectBase.log.warning('Using game type: Skyrim (determined from flags path)')
-                    return 'tesv'
+                    return 'tes5'
                 else:
                     ProjectBase.log.warning('Using game type: Skyrim Special Edition (determined from flags path)')
                     return 'sse'

pyro/__main__.py

@@ -58,8 +58,8 @@
     _game_arguments = _parser.add_argument_group('game arguments')
     _game_arguments.add_argument('-g', '--game-type',
                                  action='store', type=str,
-                                 choices={'fo4', 'tesv', 'sse'},
-                                 help='set game type (choices: fo4, tesv, sse)')
+                                 choices={'fo4', 'tes5', 'tesv', 'sse'},
+                                 help='set game type (choices: fo4, tes5, sse)')
 
     _game_path_arguments = _game_arguments.add_mutually_exclusive_group()
     _game_path_arguments.add_argument('--game-path',

pyro/setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='Pyro',
-    description='A parallelized incremental build system for TESV, SSE, and FO4 projects',
+    description='A parallelized incremental build system for TES5, SSE, and FO4 projects',
     author='fireundubh',
     author_email='[email protected]',
     license='MIT License',