mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-12 10:05:39 +00:00
[CI] Enable python autoformat (#6169)
* Squashed commit of the following: commitf5cf7b2e78Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:36:57 2024 +0100 fixed reqs commit9d845bee98Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:32:35 2024 +0100 disable autofix/format commitaff5f27148Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:28:50 2024 +0100 adjust checks commit47271cf1efAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:28:22 2024 +0100 reorder order of operations commite1bf178b40Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:01:09 2024 +0100 adapted ruff settings to better fit code base commitad7d88a6f4Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:59:45 2024 +0100 auto fixed docstring commita2e54a760eAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:46:35 2024 +0100 fix getattr useage commitcb80c73bc6Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:25:09 2024 +0100 fix requirements file commitb7780bbd21Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:42:28 2024 +0100 fix removed sections commit71f1681f55Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:41:21 2024 +0100 fix djlint syntax commita0bcf1bcceAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:35:28 2024 +0100 remove flake8 from code base commit22475b31ccAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:34:56 2024 +0100 remove flake8 from code base commit0413350f14Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:24:39 2024 +0100 moved ruff section commitd90c48a0bfAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:24:24 2024 +0100 move djlint config to pyproject commitc5ce55d511Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:20:39 2024 +0100 added isort again commit42a41d23afAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:19:02 2024 +0100 move config section commit8569233181Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:17:52 2024 +0100 fix codespell error commit2897c6704dAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 17:29:21 2024 +0100 replaced flake8 with ruff mostly for speed improvements * enable autoformat * added autofixes * switched to single quotes everywhere * switched to ruff for import sorting * fix wrong url response * switched to pathlib for lookup * fixed lookup * Squashed commit of the following: commitd3b795824bAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 22:56:17 2024 +0100 fixed source path commit0bac0c19b8Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 22:47:53 2024 +0100 fixed req commit9f61f01d9cAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 22:45:18 2024 +0100 added missing toml req commit91b71ed24aAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:49:50 2024 +0100 moved isort config commit12460b0419Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:43:22 2024 +0100 remove flake8 section from setup.cfg commitf5cf7b2e78Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:36:57 2024 +0100 fixed reqs commit9d845bee98Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:32:35 2024 +0100 disable autofix/format commitaff5f27148Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:28:50 2024 +0100 adjust checks commit47271cf1efAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:28:22 2024 +0100 reorder order of operations commite1bf178b40Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 20:01:09 2024 +0100 adapted ruff settings to better fit code base commitad7d88a6f4Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:59:45 2024 +0100 auto fixed docstring commita2e54a760eAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:46:35 2024 +0100 fix getattr useage commitcb80c73bc6Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 19:25:09 2024 +0100 fix requirements file commitb7780bbd21Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:42:28 2024 +0100 fix removed sections commit71f1681f55Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:41:21 2024 +0100 fix djlint syntax commita0bcf1bcceAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:35:28 2024 +0100 remove flake8 from code base commit22475b31ccAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:34:56 2024 +0100 remove flake8 from code base commit0413350f14Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:24:39 2024 +0100 moved ruff section commitd90c48a0bfAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:24:24 2024 +0100 move djlint config to pyproject commitc5ce55d511Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:20:39 2024 +0100 added isort again commit42a41d23afAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:19:02 2024 +0100 move config section commit8569233181Author: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 18:17:52 2024 +0100 fix codespell error commit2897c6704dAuthor: Matthias Mair <code@mjmair.com> Date: Sun Jan 7 17:29:21 2024 +0100 replaced flake8 with ruff mostly for speed improvements * fix coverage souce format --------- Co-authored-by: Oliver Walters <oliver.henry.walters@gmail.com>
This commit is contained in:
Matthias Mair
GitHub
@ -11,7 +11,7 @@ import requests
|
||||
|
||||
def fetch_rtd_versions():
|
||||
"""Get a list of RTD docs versions to build the version selector"""
|
||||
print("Fetching documentation versions from ReadTheDocs")
|
||||
print('Fetching documentation versions from ReadTheDocs')
|
||||
|
||||
versions = []
|
||||
|
||||
@ -20,7 +20,7 @@ def fetch_rtd_versions():
|
||||
response = requests.get(url, headers=headers)
|
||||
|
||||
if response.status_code != 200:
|
||||
print(f"Error fetching RTD versions: {response.status_code}")
|
||||
print(f'Error fetching RTD versions: {response.status_code}')
|
||||
return
|
||||
|
||||
data = json.loads(response.text)
|
||||
@ -39,11 +39,7 @@ def fetch_rtd_versions():
|
||||
if version == 'latest':
|
||||
continue
|
||||
|
||||
versions.append({
|
||||
'version': version,
|
||||
'title': version,
|
||||
'aliases': aliases,
|
||||
})
|
||||
versions.append({'version': version, 'title': version, 'aliases': aliases})
|
||||
|
||||
if data['next']:
|
||||
make_request(data['next'], headers)
|
||||
@ -52,21 +48,24 @@ def fetch_rtd_versions():
|
||||
token = os.environ.get('RTD_TOKEN', None)
|
||||
if token:
|
||||
headers = {'Authorization': f'Token {token}'}
|
||||
url = "https://readthedocs.org/api/v3/projects/inventree/versions/?active=true&limit=50"
|
||||
url = 'https://readthedocs.org/api/v3/projects/inventree/versions/?active=true&limit=50'
|
||||
make_request(url, headers)
|
||||
else:
|
||||
print("No RTD token found - skipping RTD version fetch")
|
||||
print('No RTD token found - skipping RTD version fetch')
|
||||
|
||||
# Sort versions by version number
|
||||
versions = sorted(versions, key=lambda x: StrictVersion(x['version']), reverse=True)
|
||||
|
||||
# Add "latest" version first
|
||||
if not any((x['title'] == 'latest' for x in versions)):
|
||||
versions.insert(0, {
|
||||
'title': 'Development',
|
||||
'version': 'latest',
|
||||
'aliases': ['main', 'latest', 'development',],
|
||||
})
|
||||
versions.insert(
|
||||
0,
|
||||
{
|
||||
'title': 'Development',
|
||||
'version': 'latest',
|
||||
'aliases': ['main', 'latest', 'development'],
|
||||
},
|
||||
)
|
||||
|
||||
# Ensure we have the 'latest' version
|
||||
current_version = os.environ.get('READTHEDOCS_VERSION', None)
|
||||
@ -80,7 +79,7 @@ def fetch_rtd_versions():
|
||||
|
||||
output_filename = os.path.join(os.path.dirname(__file__), 'versions.json')
|
||||
|
||||
print("Discovered the following versions:")
|
||||
print('Discovered the following versions:')
|
||||
print(versions)
|
||||
|
||||
with open(output_filename, 'w') as file:
|
||||
@ -105,14 +104,14 @@ def get_release_data():
|
||||
return json.loads(f.read())
|
||||
|
||||
# Download release information via the GitHub API
|
||||
print("Fetching InvenTree release information from api.github.com:")
|
||||
print('Fetching InvenTree release information from api.github.com:')
|
||||
releases = []
|
||||
|
||||
# Keep making API requests until we run out of results
|
||||
page = 1
|
||||
|
||||
while 1:
|
||||
url = f"https://api.github.com/repos/inventree/inventree/releases?page={page}&per_page=150"
|
||||
url = f'https://api.github.com/repos/inventree/inventree/releases?page={page}&per_page=150'
|
||||
|
||||
response = requests.get(url, timeout=30)
|
||||
assert response.status_code == 200
|
||||
@ -164,12 +163,12 @@ def on_config(config, *args, **kwargs):
|
||||
rtd_version = os.environ['READTHEDOCS_VERSION']
|
||||
rtd_language = os.environ['READTHEDOCS_LANGUAGE']
|
||||
|
||||
site_url = f"https://docs.inventree.org/{rtd_language}/{rtd_version}"
|
||||
assets_dir = f"/{rtd_language}/{rtd_version}/assets"
|
||||
site_url = f'https://docs.inventree.org/{rtd_language}/{rtd_version}'
|
||||
assets_dir = f'/{rtd_language}/{rtd_version}/assets'
|
||||
|
||||
print("Building within READTHEDOCS environment!")
|
||||
print(f" - Version: {rtd_version}")
|
||||
print(f" - Language: {rtd_language}")
|
||||
print('Building within READTHEDOCS environment!')
|
||||
print(f' - Version: {rtd_version}')
|
||||
print(f' - Language: {rtd_language}')
|
||||
|
||||
# Add *all* readthedocs related keys
|
||||
readthedocs = {}
|
||||
@ -188,7 +187,7 @@ def on_config(config, *args, **kwargs):
|
||||
|
||||
else:
|
||||
print("'READTHEDOCS' environment variable not found")
|
||||
print("Building for localhost configuration!")
|
||||
print('Building for localhost configuration!')
|
||||
|
||||
assets_dir = '/assets'
|
||||
site_url = config['site_url']
|
||||
@ -206,7 +205,6 @@ def on_config(config, *args, **kwargs):
|
||||
releases = []
|
||||
|
||||
for item in release_data:
|
||||
|
||||
# Ignore draft releases
|
||||
if item['draft']:
|
||||
continue
|
||||
@ -217,15 +215,11 @@ def on_config(config, *args, **kwargs):
|
||||
re.match(r'^\d+\.\d+\.\d+$', tag)
|
||||
|
||||
if not re.match:
|
||||
print(f"Found badly formatted release: {tag}")
|
||||
print(f'Found badly formatted release: {tag}')
|
||||
continue
|
||||
|
||||
# Check if there is a local file with release information
|
||||
local_path = os.path.join(
|
||||
os.path.dirname(__file__),
|
||||
'releases',
|
||||
f'{tag}.md',
|
||||
)
|
||||
local_path = os.path.join(os.path.dirname(__file__), 'releases', f'{tag}.md')
|
||||
|
||||
if os.path.exists(local_path):
|
||||
item['local_path'] = local_path
|
||||
@ -244,7 +238,7 @@ def on_config(config, *args, **kwargs):
|
||||
|
||||
releases.append(item)
|
||||
|
||||
print(f"- found {len(releases)} releases.")
|
||||
print(f'- found {len(releases)} releases.')
|
||||
|
||||
# Sort releases by descending date
|
||||
config['releases'] = sorted(releases, key=lambda it: it['date'], reverse=True)
|
||||
|
||||
@ -15,13 +15,9 @@ def define_env(env):
|
||||
|
||||
assets = []
|
||||
|
||||
allowed = [
|
||||
'.png',
|
||||
'.jpg',
|
||||
]
|
||||
allowed = ['.png', '.jpg']
|
||||
|
||||
for asset in os.listdir(directory):
|
||||
|
||||
if any(asset.endswith(x) for x in allowed):
|
||||
assets.append(os.path.join(subdir, asset))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user