mirror of
				https://github.com/inventree/InvenTree.git
				synced 2025-11-03 22:55:43 +00:00 
			
		
		
		
	Enable more Ruff rules (#7930)
* bump version
* Add more checks
* add simplify rules
* Add RUF rules
* small perf imrpovements
* pylint checks
* more style fixes
* fix a number of A002 cases
* fix A001 cases
* disable unsafe fixes
* remove unneeded branches
fixes SIM102
* re-enable .keys for specific case
* Revert "remove unneeded branches"
This reverts commit f74d41bc07.
* fix reference
			
			
This commit is contained in:
		
							
								
								
									
										4
									
								
								.github/scripts/check_js_templates.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/scripts/check_js_templates.py
									
									
									
									
										vendored
									
									
								
							@@ -71,7 +71,7 @@ def check_prohibited_tags(data):
 | 
			
		||||
for filename in pathlib.Path(js_i18n_dir).rglob('*.js'):
 | 
			
		||||
    print(f"Checking file 'translated/{os.path.basename(filename)}':")
 | 
			
		||||
 | 
			
		||||
    with open(filename, 'r') as js_file:
 | 
			
		||||
    with open(filename, encoding='utf-8') as js_file:
 | 
			
		||||
        data = js_file.readlines()
 | 
			
		||||
 | 
			
		||||
    errors += check_invalid_tag(data)
 | 
			
		||||
@@ -81,7 +81,7 @@ for filename in pathlib.Path(js_dynamic_dir).rglob('*.js'):
 | 
			
		||||
    print(f"Checking file 'dynamic/{os.path.basename(filename)}':")
 | 
			
		||||
 | 
			
		||||
    # Check that the 'dynamic' files do not contains any translated strings
 | 
			
		||||
    with open(filename, 'r') as js_file:
 | 
			
		||||
    with open(filename, encoding='utf-8') as js_file:
 | 
			
		||||
        data = js_file.readlines()
 | 
			
		||||
 | 
			
		||||
    invalid_tags = ['blocktrans', 'blocktranslate', 'trans', 'translate']
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								.github/scripts/check_migration_files.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/scripts/check_migration_files.py
									
									
									
									
										vendored
									
									
								
							@@ -20,9 +20,9 @@ for line in str(out.decode()).split('\n'):
 | 
			
		||||
if len(migrations) == 0:
 | 
			
		||||
    sys.exit(0)
 | 
			
		||||
 | 
			
		||||
print('There are {n} unstaged migration files:'.format(n=len(migrations)))
 | 
			
		||||
print(f'There are {len(migrations)} unstaged migration files:')
 | 
			
		||||
 | 
			
		||||
for m in migrations:
 | 
			
		||||
    print(' - {m}'.format(m=m))
 | 
			
		||||
    print(f' - {m}')
 | 
			
		||||
 | 
			
		||||
sys.exit(len(migrations))
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								.github/scripts/version_check.py
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								.github/scripts/version_check.py
									
									
									
									
										vendored
									
									
								
							@@ -89,7 +89,7 @@ def check_version_number(version_string, allow_duplicate=False):
 | 
			
		||||
 | 
			
		||||
        if release > version_tuple:
 | 
			
		||||
            highest_release = False
 | 
			
		||||
            print(f'Found newer release: {str(release)}')
 | 
			
		||||
            print(f'Found newer release: {release!s}')
 | 
			
		||||
 | 
			
		||||
    return highest_release
 | 
			
		||||
 | 
			
		||||
@@ -134,7 +134,7 @@ if __name__ == '__main__':
 | 
			
		||||
 | 
			
		||||
    version = None
 | 
			
		||||
 | 
			
		||||
    with open(version_file, 'r') as f:
 | 
			
		||||
    with open(version_file, encoding='utf-8') as f:
 | 
			
		||||
        text = f.read()
 | 
			
		||||
 | 
			
		||||
        # Extract the InvenTree software version
 | 
			
		||||
@@ -175,10 +175,7 @@ if __name__ == '__main__':
 | 
			
		||||
            print(f"Version number '{version}' does not match tag '{version_tag}'")
 | 
			
		||||
            sys.exit
 | 
			
		||||
 | 
			
		||||
        if highest_release:
 | 
			
		||||
            docker_tags = [version_tag, 'stable']
 | 
			
		||||
        else:
 | 
			
		||||
            docker_tags = [version_tag]
 | 
			
		||||
        docker_tags = [version_tag, 'stable'] if highest_release else [version_tag]
 | 
			
		||||
 | 
			
		||||
    elif GITHUB_REF_TYPE == 'branch':
 | 
			
		||||
        # Otherwise we know we are targeting the 'master' branch
 | 
			
		||||
@@ -202,7 +199,7 @@ if __name__ == '__main__':
 | 
			
		||||
    target_repos = [REPO.lower(), f'ghcr.io/{REPO.lower()}']
 | 
			
		||||
 | 
			
		||||
    # Ref: https://getridbug.com/python/how-to-set-environment-variables-in-github-actions-using-python/
 | 
			
		||||
    with open(os.getenv('GITHUB_ENV'), 'a') as env_file:
 | 
			
		||||
    with open(os.getenv('GITHUB_ENV'), 'a', encoding='utf-8') as env_file:
 | 
			
		||||
        # Construct tag string
 | 
			
		||||
        tag_list = [[f'{r}:{t}' for t in docker_tags] for r in target_repos]
 | 
			
		||||
        tags = ','.join(itertools.chain(*tag_list))
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user