Fixing conflicts#1
Closed
SchrodingersGat wants to merge 222 commits intoReza98Sh:feature/multiplePartImage#t2from
Closed
Fixing conflicts#1SchrodingersGat wants to merge 222 commits intoReza98Sh:feature/multiplePartImage#t2from
SchrodingersGat wants to merge 222 commits intoReza98Sh:feature/multiplePartImage#t2from
Conversation
* Bump version number to 1.2.0 (inventree#11299) * Bump version number to 1.2.0 * Update CHANGELOG.md * Update base image in Dockerfile Updated base image to the latest version as of 2026-02-12. * Fix for devcontainer build (inventree#11311) (inventree#11312) - Install yarn a different way (cherry picked from commit 2a61380) Co-authored-by: Oliver <oliver.henry.walters@gmail.com> --------- Co-authored-by: Oliver <oliver.henry.walters@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* [bug] FIx for data migration Prevent writing of default currency to database during migration or backup * Ignore error
… updates (inventree#11321) * chore(deps): bump the dependencies group across 2 directories with 18 updates Bumps the dependencies group with 3 updates in the /docs directory: [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin), [mkdocs-include-markdown-plugin](https://github.com/mondeja/mkdocs-include-markdown-plugin) and [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings). Bumps the dependencies group with 15 updates in the /src/backend directory: | Package | From | To | | --- | --- | --- | | [asgiref](https://github.com/django/asgiref) | `3.11.0` | `3.11.1` | | [babel](https://github.com/python-babel/babel) | `2.17.0` | `2.18.0` | | [blessed](https://github.com/jquast/blessed) | `1.25.0` | `1.29.0` | | [django-money](https://github.com/django-money/django-money) | `3.5.4` | `3.6.0` | | [grpcio](https://github.com/grpc/grpc) | `1.76.0` | `1.78.0` | | [jmespath](https://github.com/jmespath/jmespath.py) | `1.0.1` | `1.1.0` | | [pip-licenses](https://github.com/raimon49/pip-licenses) | `5.5.0` | `5.5.1` | | [psutil](https://github.com/giampaolo/psutil) | `7.2.1` | `7.2.2` | | [pyjwt[crypto]](https://github.com/jpadilla/pyjwt) | `2.10.1` | `2.11.0` | | [tinycss2](https://github.com/Kozea/tinycss2) | `1.4.0` | `1.5.1` | | [wrapt](https://github.com/GrahamDumpleton/wrapt) | `1.17.3` | `2.1.1` | | [coverage[toml]](https://github.com/coveragepy/coveragepy) | `7.13.1` | `7.13.3` | | [django-types](https://github.com/sbdchd/django-types) | `0.22.0` | `0.23.0` | | [pip](https://github.com/pypa/pip) | `26.0` | `26.0.1` | | [rich](https://github.com/Textualize/rich) | `14.2.0` | `14.3.2` | Updates `mkdocs-git-revision-date-localized-plugin` from 1.5.0 to 1.5.1 - [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases) - [Commits](timvink/mkdocs-git-revision-date-localized-plugin@v1.5.0...v1.5.1) Updates `mkdocs-include-markdown-plugin` from 7.2.0 to 7.2.1 - [Release notes](https://github.com/mondeja/mkdocs-include-markdown-plugin/releases) - [Commits](mondeja/mkdocs-include-markdown-plugin@v7.2.0...v7.2.1) Updates `mkdocstrings[python]` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](mkdocstrings/mkdocstrings@1.0.1...1.0.2) Updates `asgiref` from 3.11.0 to 3.11.1 - [Changelog](https://github.com/django/asgiref/blob/main/CHANGELOG.txt) - [Commits](django/asgiref@3.11.0...3.11.1) Updates `babel` from 2.17.0 to 2.18.0 - [Release notes](https://github.com/python-babel/babel/releases) - [Changelog](https://github.com/python-babel/babel/blob/master/CHANGES.rst) - [Commits](python-babel/babel@v2.17.0...v2.18.0) Updates `blessed` from 1.25.0 to 1.29.0 - [Release notes](https://github.com/jquast/blessed/releases) - [Changelog](https://github.com/jquast/blessed/blob/master/docs/history.rst) - [Commits](https://github.com/jquast/blessed/commits) Updates `django-money` from 3.5.4 to 3.6.0 - [Release notes](https://github.com/django-money/django-money/releases) - [Changelog](https://github.com/django-money/django-money/blob/main/docs/changes.rst) - [Commits](django-money/django-money@3.5.4...3.6.0) Updates `grpcio` from 1.76.0 to 1.78.0 - [Release notes](https://github.com/grpc/grpc/releases) - [Commits](grpc/grpc@v1.76.0...v1.78.0) Updates `jmespath` from 1.0.1 to 1.1.0 - [Changelog](https://github.com/jmespath/jmespath.py/blob/develop/CHANGELOG.rst) - [Commits](jmespath/jmespath.py@1.0.1...1.1.0) Updates `pip-licenses` from 5.5.0 to 5.5.1 - [Release notes](https://github.com/raimon49/pip-licenses/releases) - [Changelog](https://github.com/raimon49/pip-licenses/blob/master/CHANGELOG.md) - [Commits](raimon49/pip-licenses@v-5.5.0...v-5.5.1) Updates `psutil` from 7.2.1 to 7.2.2 - [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst) - [Commits](giampaolo/psutil@release-7.2.1...release-7.2.2) Updates `pyjwt[crypto]` from 2.10.1 to 2.11.0 - [Release notes](https://github.com/jpadilla/pyjwt/releases) - [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst) - [Commits](jpadilla/pyjwt@2.10.1...2.11.0) Updates `tinycss2` from 1.4.0 to 1.5.1 - [Release notes](https://github.com/Kozea/tinycss2/releases) - [Changelog](https://github.com/Kozea/tinycss2/blob/main/docs/changelog.rst) - [Commits](Kozea/tinycss2@v1.4.0...v1.5.1) Updates `wrapt` from 1.17.3 to 2.1.1 - [Release notes](https://github.com/GrahamDumpleton/wrapt/releases) - [Changelog](https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst) - [Commits](GrahamDumpleton/wrapt@1.17.3...2.1.1) Updates `coverage[toml]` from 7.13.1 to 7.13.3 - [Release notes](https://github.com/coveragepy/coveragepy/releases) - [Changelog](https://github.com/coveragepy/coveragepy/blob/main/CHANGES.rst) - [Commits](coveragepy/coveragepy@7.13.1...7.13.3) Updates `django-types` from 0.22.0 to 0.23.0 - [Changelog](https://github.com/sbdchd/django-types/blob/main/CHANGELOG.md) - [Commits](https://github.com/sbdchd/django-types/commits) Updates `pip` from 26.0 to 26.0.1 - [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst) - [Commits](pypa/pip@26.0...26.0.1) Updates `rich` from 14.2.0 to 14.3.2 - [Release notes](https://github.com/Textualize/rich/releases) - [Changelog](https://github.com/Textualize/rich/blob/master/CHANGELOG.md) - [Commits](Textualize/rich@v14.2.0...v14.3.2) --- updated-dependencies: - dependency-name: mkdocs-git-revision-date-localized-plugin dependency-version: 1.5.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: mkdocs-include-markdown-plugin dependency-version: 7.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: mkdocstrings[python] dependency-version: 1.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: asgiref dependency-version: 3.11.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: babel dependency-version: 2.18.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: blessed dependency-version: 1.29.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: django-money dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: grpcio dependency-version: 1.78.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: jmespath dependency-version: 1.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pip-licenses dependency-version: 5.5.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: psutil dependency-version: 7.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: pyjwt[crypto] dependency-version: 2.11.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: tinycss2 dependency-version: 1.5.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: wrapt dependency-version: 2.1.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: coverage[toml] dependency-version: 7.13.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: django-types dependency-version: 0.23.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pip dependency-version: 26.0.1 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: rich dependency-version: 14.3.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * fix style * disable performance for now --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com>
* invoke command updates - wait for db before migrating data - improve task state reporting - early return from isGeneratingSchema * Disable warning message (for now) * Fix typo - This caused large delay when restoring data * Remove debug statement * Add warning message if isGeneratingSchema called falls through unexpectedly
* Change default barcode type * Bump plugin version * Adjust unit testing * Tweak unit tests * Tweak docs
this is now done by the org die setting in inventree/.github
* Fix for ready.py - Early exit for isGeneratingSchema when removing stale content types - Prevents blocking on update process * Rearrange
…tree#11336) * refactor(backend): switch release pipeline to new pkgr version * fix wrong assign * fix warnings * also publish to release artifacts
…#11356) * Prevent migration check if performing DB update operations * Prevent settings write during data imports * Prevent exchange rate update during migration processes * Allow exchange rate updates during tests or shell session
- Hide this field if the build does not have any tracked items - Ref: inventree#11324
* [UI] Log console error for invalid field - Help catch form issues during CI * Use console logging
* Batch update of records during migration Reduce issues with very large datasets * Add short-circuit logic * Filter and prefetch
- Cannot have a blank accessor
* Support ordering stock by purchase price * Enhanced error output * Bump API version
* [bug] fix short-circuit for isGeneratingSchema * Additional exclusions * Even more exclusions * More exclusions * Updated comment
…e#11387) Bumps [pypdf](https://github.com/py-pdf/pypdf) from 6.6.2 to 6.7.1. - [Release notes](https://github.com/py-pdf/pypdf/releases) - [Changelog](https://github.com/py-pdf/pypdf/blob/main/CHANGELOG.md) - [Commits](py-pdf/pypdf@6.6.2...6.7.1) --- updated-dependencies: - dependency-name: pypdf dependency-version: 6.7.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Enhanced filtering for parameter templates - Allow filtering by model ID as well as model type * Enhanced filtering for ParameterTemplate - Required for the parameteric data tables - Enable filtering by base model ID - Enable filtering by related model ID * Bump API version * Remove outdated comments * Fix typo * Remove debug statement * Added unit tests * Playwright tests * Fix unit test * Bump requirements * Revert
* Data import flexibility - Allow specification of alternative lookup fields for data import * Observe field filters during data import * Add alternative import fields for Part models * More options for IMPORT_ID_FIELDS * Update src/backend/InvenTree/importer/models.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Bump CHANGELOG * Handle empty input values * Add IMPORT_ID_FIELDS for more models * PK field takes highest priority * Update import docs * Tweak return type * Handle multiple date formats * Add playwright testing --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Add "primary" field to SupplierPart model * Remove "default_supplier" field from the Part model * Ensure only one SupplierPart can be "primary" for a given Part * Update references to "default_supplier" * Add 'primary' field to the SupplierPart API serializer * update SupplierPart table * Use bulk-update operations * Bug fix for data migration * Allow ordering by 'primary' field * Tweak import message * Edit 'primary' field in UI * Fix checks in save() methods * Better table updates * Update CHANGELOG * Bump API version * Fix unit test * Add unit test for API * Playwright tests
* make INVENTREE_WEB_PORT more usefull * Update contrib/container/docker-compose.yml Co-authored-by: Philipp Fruck <dev@p-fruck.de> * revert change * Fix indentation for environment variable in docker-compose --------- Co-authored-by: Philipp Fruck <dev@p-fruck.de>
* Check for null plugin config * Handle potential errors
- Generates a lot of scary logs during update process Co-authored-by: Matthias Mair <code@mjmair.com>
* Add "item_type" to BuildAutoAllocationSerializer * Update frontend to allow selection * Stub for allocating tracked items * Code for auto-allocating tracked outputs * Refactor auto-allocation code * UI updates * Bump API version * Auto refresh tracked items * Update CHANGELOG.md * docs entry * Add unit test * Add playwright testing
* Add custom logo and splash to playwright fixtures * Render custom logo in frontend * Add playwright tests for customization settings * Separate playwright run for customization * Update ci file * Update playwright config file * Do not call get_custom_file from withing settings.py - django app not fully initialized yet - can cause loops * Disable default tests (for now) * Re-enable normal tests * Update qc checks * Order of operations? * Debug output * Use env * Add more debug info * More debug * Further debug * Add collectstatic check * Run normal tests too * Remove debug prints
- Change one renderer from jinja to django - Move the other to a sandboxed environment
… updates (inventree#11390) * chore(deps): bump the dependencies group across 2 directories with 19 updates Bumps the dependencies group with 1 update in the /docs directory: [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings). Bumps the dependencies group with 18 updates in the /src/backend directory: | Package | From | To | | --- | --- | --- | | [gunicorn](https://github.com/benoitc/gunicorn) | `25.0.3` | `25.1.0` | | [setuptools](https://github.com/pypa/setuptools) | `80.10.2` | `82.0.0` | | [blessed](https://github.com/jquast/blessed) | `1.29.0` | `1.30.0` | | [boto3](https://github.com/boto/boto3) | `1.42.47` | `1.42.48` | | [botocore](https://github.com/boto/botocore) | `1.42.47` | `1.42.48` | | [cssselect2](https://github.com/Kozea/cssselect2) | `0.8.0` | `0.9.0` | | [django-dbbackup](https://github.com/Archmonger/django-dbbackup) | `5.1.2` | `5.2.0` | | [django-flags](https://github.com/cfpb/django-flags) | `5.1.0` | `5.2.0` | | [icalendar](https://github.com/collective/icalendar) | `6.3.2` | `7.0.0` | | [platformdirs](https://github.com/tox-dev/platformdirs) | `4.5.1` | `4.7.1` | | [redis](https://github.com/redis/redis-py) | `7.1.0` | `7.1.1` | | [tinycss2](https://github.com/Kozea/tinycss2) | `1.4.0` | `1.5.1` | | [wrapt](https://github.com/GrahamDumpleton/wrapt) | `1.17.3` | `2.1.1` | | [zopfli](https://github.com/fonttools/py-zopfli) | `0.4.0` | `0.4.1` | | [coverage[toml]](https://github.com/coveragepy/coveragepy) | `7.13.3` | `7.13.4` | | [filelock](https://github.com/tox-dev/py-filelock) | `3.20.3` | `3.21.2` | | [pip-tools](https://github.com/jazzband/pip-tools) | `7.5.2` | `7.5.3` | | [pytest-codspeed](https://github.com/CodSpeedHQ/pytest-codspeed) | `4.2.0` | `4.3.0` | Updates `mkdocstrings[python]` from 1.0.2 to 1.0.3 - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](mkdocstrings/mkdocstrings@1.0.2...1.0.3) Updates `gunicorn` from 25.0.3 to 25.1.0 - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](benoitc/gunicorn@25.0.3...25.1.0) Updates `setuptools` from 80.10.2 to 82.0.0 - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](pypa/setuptools@v80.10.2...v82.0.0) Updates `blessed` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/jquast/blessed/releases) - [Changelog](https://github.com/jquast/blessed/blob/master/docs/history.rst) - [Commits](https://github.com/jquast/blessed/commits/1.30) Updates `boto3` from 1.42.47 to 1.42.48 - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.42.47...1.42.48) Updates `botocore` from 1.42.47 to 1.42.48 - [Commits](boto/botocore@1.42.47...1.42.48) Updates `cssselect2` from 0.8.0 to 0.9.0 - [Release notes](https://github.com/Kozea/cssselect2/releases) - [Changelog](https://github.com/Kozea/cssselect2/blob/main/docs/changelog.rst) - [Commits](Kozea/cssselect2@0.8.0...0.9.0) Updates `django-dbbackup` from 5.1.2 to 5.2.0 - [Release notes](https://github.com/Archmonger/django-dbbackup/releases) - [Changelog](https://github.com/Archmonger/django-dbbackup/blob/master/CHANGELOG.md) - [Commits](Archmonger/django-dbbackup@5.1.2...5.2.0) Updates `django-flags` from 5.1.0 to 5.2.0 - [Release notes](https://github.com/cfpb/django-flags/releases) - [Changelog](https://github.com/cfpb/django-flags/blob/main/docs/releasenotes.md) - [Commits](cfpb/django-flags@5.1.0...5.2.0) Updates `icalendar` from 6.3.2 to 7.0.0 - [Release notes](https://github.com/collective/icalendar/releases) - [Changelog](https://github.com/collective/icalendar/blob/main/CHANGES.rst) - [Commits](collective/icalendar@v6.3.2...v7.0.0) Updates `platformdirs` from 4.5.1 to 4.7.1 - [Release notes](https://github.com/tox-dev/platformdirs/releases) - [Changelog](https://github.com/tox-dev/platformdirs/blob/main/docs/changelog.rst) - [Commits](tox-dev/platformdirs@4.5.1...4.7.1) Updates `redis` from 7.1.0 to 7.1.1 - [Release notes](https://github.com/redis/redis-py/releases) - [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES) - [Commits](redis/redis-py@v7.1.0...v7.1.1) Updates `tinycss2` from 1.4.0 to 1.5.1 - [Release notes](https://github.com/Kozea/tinycss2/releases) - [Changelog](https://github.com/Kozea/tinycss2/blob/main/docs/changelog.rst) - [Commits](Kozea/tinycss2@v1.4.0...v1.5.1) Updates `wrapt` from 1.17.3 to 2.1.1 - [Release notes](https://github.com/GrahamDumpleton/wrapt/releases) - [Changelog](https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst) - [Commits](GrahamDumpleton/wrapt@1.17.3...2.1.1) Updates `zopfli` from 0.4.0 to 0.4.1 - [Release notes](https://github.com/fonttools/py-zopfli/releases) - [Commits](fonttools/py-zopfli@v0.4.0...v0.4.1) Updates `coverage[toml]` from 7.13.3 to 7.13.4 - [Release notes](https://github.com/coveragepy/coveragepy/releases) - [Changelog](https://github.com/coveragepy/coveragepy/blob/main/CHANGES.rst) - [Commits](coveragepy/coveragepy@7.13.3...7.13.4) Updates `filelock` from 3.20.3 to 3.21.2 - [Release notes](https://github.com/tox-dev/py-filelock/releases) - [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst) - [Commits](tox-dev/filelock@3.20.3...3.21.2) Updates `pip-tools` from 7.5.2 to 7.5.3 - [Release notes](https://github.com/jazzband/pip-tools/releases) - [Changelog](https://github.com/jazzband/pip-tools/blob/main/CHANGELOG.md) - [Commits](jazzband/pip-tools@v7.5.2...v7.5.3) Updates `pytest-codspeed` from 4.2.0 to 4.3.0 - [Release notes](https://github.com/CodSpeedHQ/pytest-codspeed/releases) - [Changelog](https://github.com/CodSpeedHQ/pytest-codspeed/blob/master/CHANGELOG.md) - [Commits](CodSpeedHQ/pytest-codspeed@v4.2.0...v4.3.0) --- updated-dependencies: - dependency-name: mkdocstrings[python] dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: gunicorn dependency-version: 25.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: setuptools dependency-version: 82.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: blessed dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: boto3 dependency-version: 1.42.48 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: botocore dependency-version: 1.42.48 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: cssselect2 dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: django-dbbackup dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: django-flags dependency-version: 5.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: icalendar dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: platformdirs dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: redis dependency-version: 7.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: tinycss2 dependency-version: 1.5.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: wrapt dependency-version: 2.1.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: zopfli dependency-version: 0.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: coverage[toml] dependency-version: 7.13.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: filelock dependency-version: 3.21.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pip-tools dependency-version: 7.5.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: pytest-codspeed dependency-version: 4.3.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * bump related reqs * bump a bit further * fix style --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com> Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
… updates (inventree#11714) * chore(deps): bump the dependencies group across 3 directories with 19 updates Bumps the dependencies group with 1 update in the /contrib/dev_reqs directory: [requests](https://github.com/psf/requests). Bumps the dependencies group with 2 updates in the /docs directory: [mkdocs-include-markdown-plugin](https://github.com/mondeja/mkdocs-include-markdown-plugin) and [mkdocs-redirects](https://github.com/ProperDocs/properdocs-redirects). Bumps the dependencies group with 17 updates in the /src/backend directory: | Package | From | To | | --- | --- | --- | | [requests](https://github.com/psf/requests) | `2.33.0` | `2.33.1` | | [bleach](https://github.com/mozilla/bleach) | `4.1.0` | `6.3.0` | | [blessed](https://github.com/jquast/blessed) | `1.34.0` | `1.38.0` | | [boto3](https://github.com/boto/boto3) | `1.42.77` | `1.42.82` | | [botocore](https://github.com/boto/botocore) | `1.42.77` | `1.42.82` | | [charset-normalizer](https://github.com/jawah/charset_normalizer) | `3.4.6` | `3.4.7` | | [googleapis-common-protos](https://github.com/googleapis/google-cloud-python) | `1.73.1` | `1.74.0` | | [grpcio](https://github.com/grpc/grpc) | `1.78.0` | `1.80.0` | | [importlib-metadata](https://github.com/python/importlib_metadata) | `8.7.1` | `9.0.0` | | [pillow](https://github.com/python-pillow/Pillow) | `12.1.1` | `12.2.0` | | [pip-licenses](https://github.com/raimon49/pip-licenses) | `5.5.1` | `5.5.5` | | [protobuf](https://github.com/protocolbuffers/protobuf) | `6.33.6` | `7.34.1` | | [sentry-sdk](https://github.com/getsentry/sentry-python) | `2.56.0` | `2.57.0` | | [tzdata](https://github.com/python/tzdata) | `2025.3` | `2026.1` | | [wrapt](https://github.com/GrahamDumpleton/wrapt) | `1.17.3` | `2.1.2` | | [django-stubs](https://github.com/typeddjango/django-stubs) | `6.0.1` | `6.0.2` | | [django-stubs-ext](https://github.com/typeddjango/django-stubs) | `6.0.1` | `6.0.2` | Updates `requests` from 2.33.0 to 2.33.1 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.33.0...v2.33.1) Updates `mkdocs-include-markdown-plugin` from 7.2.1 to 7.2.2 - [Release notes](https://github.com/mondeja/mkdocs-include-markdown-plugin/releases) - [Commits](mondeja/mkdocs-include-markdown-plugin@v7.2.1...v7.2.2) Updates `mkdocs-redirects` from 1.2.2 to 1.2.3 - [Release notes](https://github.com/ProperDocs/properdocs-redirects/releases) - [Commits](ProperDocs/mkdocs-redirects@v1.2.2...v1.2.3) Updates `requests` from 2.33.0 to 2.33.1 - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.33.0...v2.33.1) Updates `bleach` from 4.1.0 to 6.3.0 - [Changelog](https://github.com/mozilla/bleach/blob/main/CHANGES) - [Commits](mozilla/bleach@v4.1.0...v6.3.0) Updates `blessed` from 1.34.0 to 1.38.0 - [Release notes](https://github.com/jquast/blessed/releases) - [Changelog](https://github.com/jquast/blessed/blob/master/docs/history.rst) - [Commits](jquast/blessed@1.34...1.38) Updates `boto3` from 1.42.77 to 1.42.82 - [Release notes](https://github.com/boto/boto3/releases) - [Commits](boto/boto3@1.42.77...1.42.82) Updates `botocore` from 1.42.77 to 1.42.82 - [Commits](boto/botocore@1.42.77...1.42.82) Updates `charset-normalizer` from 3.4.6 to 3.4.7 - [Release notes](https://github.com/jawah/charset_normalizer/releases) - [Changelog](https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md) - [Commits](jawah/charset_normalizer@3.4.6...3.4.7) Updates `googleapis-common-protos` from 1.73.1 to 1.74.0 - [Release notes](https://github.com/googleapis/google-cloud-python/releases) - [Changelog](https://github.com/googleapis/google-cloud-python/blob/main/packages/google-cloud-documentai/CHANGELOG.md) - [Commits](googleapis/google-cloud-python@googleapis-common-protos-v1.73.1...googleapis-common-protos-v1.74.0) Updates `grpcio` from 1.78.0 to 1.80.0 - [Release notes](https://github.com/grpc/grpc/releases) - [Commits](grpc/grpc@v1.78.0...v1.80.0) Updates `importlib-metadata` from 8.7.1 to 9.0.0 - [Release notes](https://github.com/python/importlib_metadata/releases) - [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst) - [Commits](python/importlib_metadata@v8.7.1...v9.0.0) Updates `pillow` from 12.1.1 to 12.2.0 - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@12.1.1...12.2.0) Updates `pip-licenses` from 5.5.1 to 5.5.5 - [Release notes](https://github.com/raimon49/pip-licenses/releases) - [Changelog](https://github.com/raimon49/pip-licenses/blob/master/CHANGELOG.md) - [Commits](raimon49/pip-licenses@v-5.5.1...v-5.5.5) Updates `protobuf` from 6.33.6 to 7.34.1 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Commits](https://github.com/protocolbuffers/protobuf/commits) Updates `sentry-sdk` from 2.56.0 to 2.57.0 - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-python@2.56.0...2.57.0) Updates `tzdata` from 2025.3 to 2026.1 - [Release notes](https://github.com/python/tzdata/releases) - [Changelog](https://github.com/python/tzdata/blob/master/NEWS.md) - [Commits](python/tzdata@2025.3...2026.1) Updates `wrapt` from 1.17.3 to 2.1.2 - [Release notes](https://github.com/GrahamDumpleton/wrapt/releases) - [Changelog](https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst) - [Commits](GrahamDumpleton/wrapt@1.17.3...2.1.2) Updates `django-stubs` from 6.0.1 to 6.0.2 - [Release notes](https://github.com/typeddjango/django-stubs/releases) - [Commits](typeddjango/django-stubs@6.0.1...6.0.2) Updates `django-stubs-ext` from 6.0.1 to 6.0.2 - [Release notes](https://github.com/typeddjango/django-stubs/releases) - [Commits](typeddjango/django-stubs@6.0.1...6.0.2) --- updated-dependencies: - dependency-name: requests dependency-version: 2.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: mkdocs-include-markdown-plugin dependency-version: 7.2.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: mkdocs-redirects dependency-version: 1.2.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: requests dependency-version: 2.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: bleach dependency-version: 6.3.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: blessed dependency-version: 1.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: boto3 dependency-version: 1.42.82 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: botocore dependency-version: 1.42.82 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: charset-normalizer dependency-version: 3.4.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: googleapis-common-protos dependency-version: 1.74.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: grpcio dependency-version: 1.80.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: importlib-metadata dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: pillow dependency-version: 12.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: pip-licenses dependency-version: 5.5.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: protobuf dependency-version: 7.34.1 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: sentry-sdk dependency-version: 2.57.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: tzdata dependency-version: '2026.1' dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: wrapt dependency-version: 2.1.2 dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: django-stubs dependency-version: 6.0.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies - dependency-name: django-stubs-ext dependency-version: 6.0.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * fix style --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com>
…ee#11715) * chore(deps): bump pypdf from 6.9.2 to 6.10.0 in /src/backend Bumps [pypdf](https://github.com/py-pdf/pypdf) from 6.9.2 to 6.10.0. - [Release notes](https://github.com/py-pdf/pypdf/releases) - [Changelog](https://github.com/py-pdf/pypdf/blob/main/CHANGELOG.md) - [Commits](py-pdf/pypdf@6.9.2...6.10.0) --- updated-dependencies: - dependency-name: pypdf dependency-version: 6.10.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * fix style --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com>
…tree#11708) Bumps [axios](https://github.com/axios/axios) from 1.13.6 to 1.15.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.13.6...v1.15.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.15.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- Allow it to be dismissed again
* Add some more convenience functions for report helpers * Add "reverse" tag * Add unit tests * Add lstrip and rstrip * Fix unit tests
* Linkify search results - Closes inventree#11717 * Divide search results
- The isGeneratingSchema command is potentially expensive - Cache the result (per thread)
…#11617) * move to router based path building * fix url names * fix import * fix test helper * fix test * more test fixes * fix api response * remove url patch * bump api version * reduce diff * Fix version tag * fix schema generation errors * adjust texts * fix tests * add test for notification behavior / readakk * add todo for wrong endpoint * rename * adjust docstring * fix outstanding permission todo - this pattern should be changed in the API
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Lazy evaluation of optional serializer fields - Add OptionalField dataclass - Pass serializer class and kwargs separately * Refactor BuildLineSerializer class * Simplify gathering * Refactor BuildSerializer * Refactor other Build serializers * Refactor Part serializers * Refactoring more serializers to use OptionalField * More refactoring * Cleanup for mixin class * Ensure any optional fields we added in are not missed * Fixes * Rehydrate optional fields for metadata * Add TreePathSerializer class * Further improvements: - Handle case where optional field shadows model property - Consider read_only and write_only fields * Adjust unit tests * Fix for "build_relational_field" - Handle case where optional field shadows model relation * Fix case where multiple fields can share same filter * additional unit tests * Bump API version * Remove top-level detection - Request object is only available for the top-level serializer anyway * Cache serializer to prevent multiple __init__ calls * Revert caching change - Breaks search results * Simplify field removal * Adjust unit test * Remove docstring comment which is no longer true * Ensure read-only fields are skipped for data import * Use SAFE_METHODS * Do not convert to lowercase * Updated docstring * Remove FilterableSerializerField mixin - Annotation now performed using OptionalField - Code can be greatly simplified * Ensure all fields are returned when generating schema * Fix order of operations * Add assertion to unit test * fix style * Fix api_version * Remove duplicate API entries * Remove duplicate API entries * Fix formatting in api_version.py * Tweak ManufacturerPart serializer * Revert formatting change --------- Co-authored-by: Matthias Mair <code@mjmair.com>
teyit fails with python versions >= 3.12 see isidentical/teyit#23
* move action to post endpoint * use default return code * remove custom permissions on notifications endpoint * add api bump * update link * fix assertation * fix test to use post - this was refactored
* Move useFilterSet state to the @lib * Refactor useTable hook into @lib * Refactor string helper functions * Refactor constructFormUrl func * Refactor Boundary component * Refactor StoredTableState * More refactoring * Refactor CopyButton and CopyableCell * Pass table render func to plugins * Provide internal wrapper function, while allowing the "api" and "navigate" functions to be provided by the caller * Adds <InvenTreeTable /> component which is exposed to plugins * Update frontend versioning * Update docs * Handle condition where UI does not provide table rendering function * Move queryFilters out of custom state * Fix exported type * Extract searchParams - Cannot be used outside of router component - Only provide when the table is generated internally * Bump UI version * Fix for right-click context menu - Function needs to be defined with the context menu provider
- Expose additional type hints
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
- Clear our non-breaking-space characters - These can break SVG rendering in the browser - Ref: inventree#11655
…entree#11743) * chore(deps-dev): bump pytest from 9.0.2 to 9.0.3 in /src/backend Bumps [pytest](https://github.com/pytest-dev/pytest) from 9.0.2 to 9.0.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@9.0.2...9.0.3) --- updated-dependencies: - dependency-name: pytest dependency-version: 9.0.3 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * fix style --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com>
) Bumps the dependencies group with 3 updates: [docker/login-action](https://github.com/docker/login-action), [CodSpeedHQ/action](https://github.com/codspeedhq/action) and [ad-m/github-push-action](https://github.com/ad-m/github-push-action). Updates `docker/login-action` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@b45d80f...4907a6d) Updates `CodSpeedHQ/action` from 4.12.1 to 4.13.0 - [Release notes](https://github.com/codspeedhq/action/releases) - [Changelog](https://github.com/CodSpeedHQ/action/blob/main/CHANGELOG.md) - [Commits](CodSpeedHQ/action@1c8ae48...db35df7) Updates `ad-m/github-push-action` from 1.0.0 to 1.1.0 - [Release notes](https://github.com/ad-m/github-push-action/releases) - [Commits](ad-m/github-push-action@77c5b41...4cc7477) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: CodSpeedHQ/action dependency-version: 4.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies - dependency-name: ad-m/github-push-action dependency-version: 1.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthias Mair <code@mjmair.com>
…entree#11756) Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.3.3 to 3.4.0. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](cure53/DOMPurify@3.3.3...3.4.0) --- updated-dependencies: - dependency-name: dompurify dependency-version: 3.4.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Author
|
Ugh, looks like I've done the git sequencing wrong, I'll close and try again. |
Open
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@Reza98Sh I have merged master back into your branch and fixed some conflicts which should make life easier. If this is acceptable, you will have to merge this PR into your branch first