mirror of
https://github.com/inventree/InvenTree.git
synced 2026-03-11 06:34:27 +00:00
Bump software version to 1.2.1 (#11313)
* 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:
4
.github/workflows/qc_checks.yaml
vendored
4
.github/workflows/qc_checks.yaml
vendored
@@ -23,6 +23,8 @@ env:
|
||||
INVENTREE_SITE_URL: http://localhost:8000
|
||||
INVENTREE_DEBUG: true
|
||||
|
||||
use_performance: false
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
@@ -78,7 +80,7 @@ jobs:
|
||||
- name: Which runner to use?
|
||||
id: runner-perf
|
||||
# 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:
|
||||
name: Style [pre-commit]
|
||||
|
||||
@@ -17,7 +17,7 @@ from django.conf import settings
|
||||
from .api_version import INVENTREE_API_TEXT, INVENTREE_API_VERSION
|
||||
|
||||
# InvenTree software version
|
||||
INVENTREE_SW_VERSION = '1.2.0'
|
||||
INVENTREE_SW_VERSION = '1.2.1'
|
||||
|
||||
# Minimum supported Python version
|
||||
MIN_PYTHON_VERSION = (3, 11)
|
||||
|
||||
@@ -1216,7 +1216,9 @@ class InvenTreeSetting(BaseInvenTreeSetting):
|
||||
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
|
||||
|
||||
@@ -1282,9 +1284,6 @@ class InvenTreeSetting(BaseInvenTreeSetting):
|
||||
|
||||
The keys must be upper-case
|
||||
"""
|
||||
from common.setting.system import SYSTEM_SETTINGS
|
||||
|
||||
SETTINGS = SYSTEM_SETTINGS
|
||||
|
||||
typ = 'inventree'
|
||||
|
||||
@@ -1310,6 +1309,8 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
|
||||
|
||||
import common.setting.user
|
||||
|
||||
SETTINGS = common.setting.user.USER_SETTINGS
|
||||
|
||||
CHECK_SETTING_KEY = True
|
||||
|
||||
class Meta:
|
||||
@@ -1321,8 +1322,6 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
|
||||
models.UniqueConstraint(fields=['key', 'user'], name='unique key and user')
|
||||
]
|
||||
|
||||
SETTINGS = common.setting.user.USER_SETTINGS
|
||||
|
||||
typ = 'user'
|
||||
extra_unique_fields = ['user']
|
||||
|
||||
|
||||
@@ -962,7 +962,9 @@ class StockItemListTest(StockAPITestCase):
|
||||
|
||||
# Note: While the export is quick on pgsql, it is still quite slow on sqlite3
|
||||
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:
|
||||
data = self.process_csv(data_file)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user