inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-03-11 14:44:18 +00:00
Code Activity

Bump software version to 1.2.1 (#11313)

Browse Source 
* Bump software version to 1.2.1

* Fix style issues

* [CI] Allow more test time

* Disable performance testing

---------

Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
Oliver
2026-02-16 12:46:45 +11:00
committed by GitHub
parent ccf5b39bf1
commit 9b11cd294e
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/qc_checks.yaml vendored
View File

@@ -23,6 +23,8 @@ env:
INVENTREE_SITE_URL: http://localhost:8000 INVENTREE_SITE_URL: http://localhost:8000
INVENTREE_DEBUG: true INVENTREE_DEBUG: true
use_performance: false
permissions: permissions:
contents: read contents: read
@@ -78,7 +80,7 @@ jobs:
- name: Which runner to use? - name: Which runner to use?
id: runner-perf id: runner-perf
# decide if we are running in inventree/inventree -> use codspeed-macro runner else ubuntu-24.04 # decide if we are running in inventree/inventree -> use codspeed-macro runner else ubuntu-24.04
run: echo "runner=$([[ '${{ github.repository }}' == 'inventree/InvenTree' ]] && echo 'codspeed-macro' || echo 'ubuntu-24.04')" >> $GITHUB_OUTPUT run: echo "runner=$([[ '${{ github.repository }}' == 'inventree/InvenTree' ]] && '${{ env.use_performance }}' == 'true' ]] && echo 'codspeed-macro' || echo 'ubuntu-24.04')" >> $GITHUB_OUTPUT
pre-commit: pre-commit:
name: Style [pre-commit] name: Style [pre-commit]

2
src/backend/InvenTree/InvenTree/version.py
View File

@@ -17,7 +17,7 @@ from django.conf import settings
from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION
# InvenTree software version # InvenTree software version
INVENTREE_SW_VERSION = '1.2.0' INVENTREE_SW_VERSION = '1.2.1'
# Minimum supported Python version # Minimum supported Python version
MIN_PYTHON_VERSION = (3, 11) MIN_PYTHON_VERSION = (3, 11)

11
src/backend/InvenTree/common/models.py
View File

@@ -1216,7 +1216,9 @@ class InvenTreeSetting(BaseInvenTreeSetting):
even if that key does not exist. even if that key does not exist.
""" """
SETTINGS: dict[str, InvenTreeSettingsKeyType] from common.setting.system import SYSTEM_SETTINGS
SETTINGS: dict[str, InvenTreeSettingsKeyType] = SYSTEM_SETTINGS
CHECK_SETTING_KEY = True CHECK_SETTING_KEY = True
@@ -1282,9 +1284,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
The keys must be upper-case The keys must be upper-case
""" """
from common.setting.system import SYSTEM_SETTINGS
SETTINGS = SYSTEM_SETTINGS
typ = 'inventree' typ = 'inventree'
@@ -1310,6 +1309,8 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
import common.setting.user import common.setting.user
SETTINGS = common.setting.user.USER_SETTINGS
CHECK_SETTING_KEY = True CHECK_SETTING_KEY = True
class Meta: class Meta:
@@ -1321,8 +1322,6 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
models.UniqueConstraint(fields=['key', 'user'], name='unique key and user') models.UniqueConstraint(fields=['key', 'user'], name='unique key and user')
] ]
SETTINGS = common.setting.user.USER_SETTINGS
typ = 'user' typ = 'user'
extra_unique_fields = ['user'] extra_unique_fields = ['user']

4
src/backend/InvenTree/stock/test_api.py
View File

@@ -962,7 +962,9 @@ class StockItemListTest(StockAPITestCase):
# Note: While the export is quick on pgsql, it is still quite slow on sqlite3 # Note: While the export is quick on pgsql, it is still quite slow on sqlite3
with self.export_data( with self.export_data(
self.list_url, max_query_count=50, max_query_time=9.0 self.list_url,
max_query_count=50,
max_query_time=12.0, # Test time increased due to worker variability
) as data_file: ) as data_file:
data = self.process_csv(data_file) data = self.process_csv(data_file)