diff --git a/.devops/testing_ci.yml b/.devops/testing_ci.yml index 67d12d6503..e9e53e9a24 100644 --- a/.devops/testing_ci.yml +++ b/.devops/testing_ci.yml @@ -38,8 +38,8 @@ steps: - script: | python -m pip install --upgrade pip setuptools wheel - pip install -r requirements.txt - pip install -r requirements-dev.txt + pip install --require-hashes -r requirements.txt + pip install --require-hashes -r requirements-dev.txt pip install unittest-xml-reporting coverage invoke sudo apt-get install poppler-utils sudo apt-get install libpoppler-dev diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 7bbce3a397..44ba540d33 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -84,7 +84,7 @@ runs: - name: Install dev requirements if: ${{ inputs.dev-install == 'true' ||inputs.install == 'true' }} shell: bash - run: uv pip install -r src/backend/requirements-dev.txt + run: uv pip install --require-hashes -r src/backend/requirements-dev.txt - name: Run invoke install if: ${{ inputs.install == 'true' }} shell: bash diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d1d67fb3f4..0a6bdd5b8f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,10 @@ updates: directory: / schedule: interval: weekly + groups: + dependencies: + patterns: + - "*" # Include all dependencies - package-ecosystem: docker directory: /contrib/container @@ -24,13 +28,25 @@ updates: directory: /src/backend schedule: interval: weekly + groups: + dependencies: + patterns: + - "*" # Include all dependencies - package-ecosystem: pip directory: /src/backend schedule: interval: weekly + groups: + dependencies: + patterns: + - "*" # Include all dependencies - package-ecosystem: npm directory: /src/frontend schedule: interval: weekly + groups: + dependencies: + patterns: + - "*" # Include all dependencies diff --git a/.github/requirements.in b/.github/requirements.in new file mode 100644 index 0000000000..5d479962c1 --- /dev/null +++ b/.github/requirements.in @@ -0,0 +1,3 @@ +# Packages needed for CI + requests==2.31.0 + pyyaml==6.0.1 diff --git a/.github/requirements.txt b/.github/requirements.txt new file mode 100644 index 0000000000..73856016a7 --- /dev/null +++ b/.github/requirements.txt @@ -0,0 +1,161 @@ +# This file was autogenerated by uv via the following command: +# uv pip compile .github/requirements.in -o .github/requirements.txt --python-version=3.9 --no-strip-extras --generate-hashes +certifi==2024.2.2 \ + --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ + --hash=sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1 + # via requests +charset-normalizer==3.3.2 \ + --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \ + --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \ + --hash=sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786 \ + --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \ + --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \ + --hash=sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185 \ + --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \ + --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \ + --hash=sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519 \ + --hash=sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898 \ + --hash=sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269 \ + --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \ + --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \ + --hash=sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6 \ + --hash=sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8 \ + --hash=sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a \ + --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \ + --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \ + --hash=sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714 \ + --hash=sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2 \ + --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \ + --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \ + --hash=sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d \ + --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \ + --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \ + --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \ + --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \ + --hash=sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d \ + --hash=sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a \ + --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \ + --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \ + --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \ + --hash=sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0 \ + --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \ + --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \ + --hash=sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac \ + --hash=sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25 \ + --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \ + --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \ + --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \ + --hash=sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2 \ + --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \ + --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \ + --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \ + --hash=sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99 \ + --hash=sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c \ + --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \ + --hash=sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811 \ + --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \ + --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \ + --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \ + --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \ + --hash=sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04 \ + --hash=sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c \ + --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \ + --hash=sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458 \ + --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \ + --hash=sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99 \ + --hash=sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985 \ + --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \ + --hash=sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238 \ + --hash=sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f \ + --hash=sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d \ + --hash=sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796 \ + --hash=sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a \ + --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \ + --hash=sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8 \ + --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \ + --hash=sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5 \ + --hash=sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5 \ + --hash=sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711 \ + --hash=sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4 \ + --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \ + --hash=sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c \ + --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \ + --hash=sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4 \ + --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \ + --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \ + --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \ + --hash=sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c \ + --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \ + --hash=sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8 \ + --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \ + --hash=sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b \ + --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \ + --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \ + --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \ + --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \ + --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \ + --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561 + # via requests +idna==3.7 \ + --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \ + --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0 + # via requests +pyyaml==6.0.1 \ + --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \ + --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \ + --hash=sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df \ + --hash=sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741 \ + --hash=sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206 \ + --hash=sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27 \ + --hash=sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595 \ + --hash=sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62 \ + --hash=sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98 \ + --hash=sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696 \ + --hash=sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290 \ + --hash=sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9 \ + --hash=sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d \ + --hash=sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6 \ + --hash=sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867 \ + --hash=sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47 \ + --hash=sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486 \ + --hash=sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6 \ + --hash=sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3 \ + --hash=sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007 \ + --hash=sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938 \ + --hash=sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 \ + --hash=sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c \ + --hash=sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735 \ + --hash=sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d \ + --hash=sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28 \ + --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \ + --hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \ + --hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \ + --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \ + --hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \ + --hash=sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd \ + --hash=sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3 \ + --hash=sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0 \ + --hash=sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 \ + --hash=sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c \ + --hash=sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c \ + --hash=sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924 \ + --hash=sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34 \ + --hash=sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 \ + --hash=sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859 \ + --hash=sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 \ + --hash=sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54 \ + --hash=sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a \ + --hash=sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b \ + --hash=sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab \ + --hash=sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa \ + --hash=sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c \ + --hash=sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585 \ + --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \ + --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 +urllib3==2.2.1 \ + --hash=sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d \ + --hash=sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19 + # via requests diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 0696e6694c..7c5b9d9384 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -24,10 +24,6 @@ on: branches: - "master" -env: - requests_version: 2.31.0 - pyyaml_version: 6.0.1 - permissions: contents: read @@ -80,8 +76,7 @@ jobs: python-version: ${{ env.python_version }} - name: Version Check run: | - pip install requests==${{ env.requests_version }} - pip install pyyaml==${{ env.pyyaml_version }} + pip install --require-hashes -r .github/requirements.txt python3 .github/scripts/version_check.py echo "git_commit_hash=$(git rev-parse --short HEAD)" >> $GITHUB_ENV echo "git_commit_date=$(git show -s --format=%ci)" >> $GITHUB_ENV diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml index 3458c686b2..1b778950bb 100644 --- a/.github/workflows/qc_checks.yaml +++ b/.github/workflows/qc_checks.yaml @@ -104,7 +104,7 @@ jobs: uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # pin@v3.0.1 - name: Check Version run: | - pip install requests==${{ env.requests_version }} + pip install --require-hashes -r .github/requirements.txt python3 .github/scripts/version_check.py mkdocs: @@ -122,7 +122,7 @@ jobs: python-version: ${{ env.python_version }} - name: Check Config run: | - pip install pyyaml==${{ env.pyyaml_version }} + pip install --require-hashes -r .github/requirements.txt pip install -r docs/requirements.txt python docs/ci/check_mkdocs_config.py - name: Check Links @@ -168,7 +168,7 @@ jobs: - name: Download public schema if: needs.paths-filter.outputs.api == 'false' run: | - pip install requests==${{ env.requests_version }} >/dev/null 2>&1 + pip install --require-hashes -r .github/requirements.txt >/dev/null 2>&1 version="$(python3 .github/scripts/version_check.py only_version 2>&1)" echo "Version: $version" url="https://raw.githubusercontent.com/inventree/schema/main/export/${version}/api.yaml" @@ -187,7 +187,7 @@ jobs: id: version if: github.ref == 'refs/heads/master' && needs.paths-filter.outputs.api == 'true' run: | - pip install requests==${{ env.requests_version }} >/dev/null 2>&1 + pip install --require-hashes -r .github/requirements.txt >/dev/null 2>&1 version="$(python3 .github/scripts/version_check.py only_version 2>&1)" echo "Version: $version" echo "version=$version" >> "$GITHUB_OUTPUT" @@ -290,16 +290,6 @@ jobs: run: python3 .github/scripts/check_migration_files.py - name: Coverage Tests run: invoke test --coverage - - name: Upload Coverage Report to Coveralls - if: always() - uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # pin@v2.2.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - flag-name: backend - file: coverage.xml - git-commit: ${{ github.sha }} - git-branch: ${{ github.ref }} - parallel: true - name: Upload coverage reports to Codecov uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # pin@v4.3.0 if: always() @@ -432,14 +422,6 @@ jobs: update: true - name: Run Tests run: invoke test --migrations --report --coverage - - name: Upload Coverage Report to Coveralls - if: always() - uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # pin@v2.2.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - flag-name: migrations - git-commit: ${{ github.sha }} - git-branch: ${{ github.ref }} - name: Upload coverage reports to Codecov uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # pin@v4.3.0 if: always() @@ -576,19 +558,3 @@ jobs: with: name: frontend-build path: src/backend/InvenTree/web/static/web - - finish_coverage: - name: Finish Coverage - runs-on: ubuntu-20.04 - needs: ["platform_ui", "coverage", "migration-tests", "paths-filter"] - if: (needs.paths-filter.outputs.server == 'true' || needs.paths-filter.outputs.frontend == 'true' || needs.paths-filter.outputs.force == 'true') && (needs.platform_ui.result == 'success' || needs.coverage.result == 'success' || needs.migration-tests.result == 'success') - - steps: - - name: Finish coverage reporting - uses: coverallsapp/github-action@3dfc5567390f6fa9267c0ee9c251e4c8c3f18949 # pin@v2.2.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - carryforward: "pui,backend,migrations" - parallel-finished: true - git-commit: ${{ github.sha }} - git-branch: ${{ github.ref }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 61fb93abb3..1a74ca3d68 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,9 +5,6 @@ on: release: types: [published] -env: - requests_version: 2.31.0 - permissions: contents: read @@ -21,7 +18,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # pin@v4.1.1 - name: Version Check run: | - pip install requests==${{ env.requests_version }} + pip install --require-hashes -r .github/requirements.txt python3 .github/scripts/version_check.py - name: Push to Stable Branch uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # pin@v0.8.0 diff --git a/.github/workflows/update.yml.disabled b/.github/workflows/update.yml.disabled index a3cecb147e..a9edddc6a3 100644 --- a/.github/workflows/update.yml.disabled +++ b/.github/workflows/update.yml.disabled @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # pin@v4.1.1 - name: Setup - run: pip install -r requirements-dev.txt + run: pip install --require-hashes -r requirements-dev.txt - name: Update requirements.txt run: pip-compile --output-file=requirements.txt requirements.in -U - name: Update requirements-dev.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5e28450d3..0f8057da83 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,14 +10,14 @@ exclude: | )$ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: mixed-line-ending - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.3.5 + rev: v0.4.1 hooks: - id: ruff-format args: [--preview] @@ -27,16 +27,20 @@ repos: --preview ] - repo: https://github.com/astral-sh/uv-pre-commit - rev: 0.1.29 + rev: 0.1.35 hooks: - id: pip-compile name: pip-compile requirements-dev.in - args: [src/backend/requirements-dev.in, -o, src/backend/requirements-dev.txt, --python-version=3.9, --no-strip-extras] + args: [src/backend/requirements-dev.in, -o, src/backend/requirements-dev.txt, --python-version=3.9, --no-strip-extras, --generate-hashes] files: src/backend/requirements-dev\.(in|txt)$ - id: pip-compile name: pip-compile requirements.txt - args: [src/backend/requirements.in, -o, src/backend/requirements.txt,--python-version=3.9, --no-strip-extras] + args: [src/backend/requirements.in, -o, src/backend/requirements.txt,--python-version=3.9, --no-strip-extras,--generate-hashes] files: src/backend/requirements\.(in|txt)$ + - id: pip-compile + name: pip-compile requirements.txt + args: [.github/requirements.in, -o, .github/requirements.txt,--python-version=3.9, --no-strip-extras, --generate-hashes] + files: .github/requirements\.(in|txt)$ - repo: https://github.com/Riverside-Healthcare/djLint rev: v1.34.1 hooks: @@ -61,7 +65,7 @@ repos: - "prettier@^2.4.1" - "@trivago/prettier-plugin-sort-imports" - repo: https://github.com/pre-commit/mirrors-eslint - rev: "v9.0.0" + rev: "v9.1.0" hooks: - id: eslint additional_dependencies: diff --git a/README.md b/README.md index 4d7b2e09c5..8c21973f35 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ [](https://app.netlify.com/sites/inventree/deploys) [](https://sonarcloud.io/summary/new_code?id=inventree_InvenTree) -[](https://coveralls.io/github/inventree/InvenTree) [](https://codecov.io/gh/inventree/InvenTree) [](https://crowdin.com/project/inventree)  @@ -95,7 +94,7 @@ InvenTree is designed to be **extensible**, and provides multiple options for **
diff --git a/contrib/container/Dockerfile b/contrib/container/Dockerfile index 99eaf3262c..3b1783a27e 100644 --- a/contrib/container/Dockerfile +++ b/contrib/container/Dockerfile @@ -97,7 +97,8 @@ FROM inventree_base AS prebuild ENV PATH=/root/.local/bin:$PATH RUN ./install_build_packages.sh --no-cache --virtual .build-deps && \ - pip install --user -r base_requirements.txt -r requirements.txt --no-cache && \ + pip install --user -r base_requirements.txt --no-cache && \ + pip install --user --require-hashes -r requirements.txt --no-cache && \ apk --purge del .build-deps # Frontend builder image: diff --git a/docs/docs/credits.md b/docs/docs/credits.md index 91df5d8778..5dd87f374f 100644 --- a/docs/docs/credits.md +++ b/docs/docs/credits.md @@ -39,7 +39,6 @@ InvenTree relies on the following Python libraries: | [flake8](https://pypi.org/project/flake8/) | MIT | style checking | | [pep8-naming](https://pypi.org/project/pep8-naming/) | Expat | name checking | | [coverage](https://pypi.org/project/coverage/) | Apache-2.0 | coverage checking | -| [coveralls](https://pypi.org/project/coveralls/) | MIT | coverage uploader | | [django-formtools](https://pypi.org/project/django-formtools/) | MIT | better forms / wizards | | [django-allauth](https://pypi.org/project/django-allauth/) | MIT | SSO for django | | [pint](https://pint.readthedocs.io/en/stable/) | [licence](https://github.com/hgrecco/pint/blob/master/LICENSE) | Physical unit conversion | diff --git a/docs/docs/faq.md b/docs/docs/faq.md index 86bdaa4d7f..d8b51ecac6 100644 --- a/docs/docs/faq.md +++ b/docs/docs/faq.md @@ -19,7 +19,7 @@ If the `invoke` command does not work, it means that the [invoke](https://pypi.o Update the installed python packages with PIP: ``` -pip3 install -U -r requirements.txt +pip3 install -U --require-hashes -r requirements.txt ``` ### Invoke Version diff --git a/docs/docs/security.md b/docs/docs/security.md index 8208380f21..da6ddda0bb 100644 --- a/docs/docs/security.md +++ b/docs/docs/security.md @@ -37,7 +37,7 @@ InvenTree is built using the Django framework, which has a strong focus on secur ### Test coverage -We run coverage tests on our codebase to ensure that we have a high level of test coverage above 90%. This is public and can be found [here](https://coveralls.io/github/inventree/InvenTree). +We run coverage tests on our codebase to ensure that we have a high level of test coverage above 90%. This is public and can be found [here](https://app.codecov.io/gh/inventree/InvenTree). ### Pinning dependencies diff --git a/docs/docs/start/config.md b/docs/docs/start/config.md index 7ce2e96784..56d8f06347 100644 --- a/docs/docs/start/config.md +++ b/docs/docs/start/config.md @@ -324,6 +324,7 @@ The logo and custom messages can be changed/set: | INVENTREE_CUSTOM_SPLASH | customize.splash | Path to custom splash screen in the static files directory | *Not specified* | | INVENTREE_CUSTOMIZE | customize.login_message | Custom message for login page | *Not specified* | | INVENTREE_CUSTOMIZE | customize.navbar_message | Custom message for navbar | *Not specified* | +| INVENTREE_CUSTOMIZE | customize.hide_pui_banner | Disable PUI banner | False | If you want to remove the InvenTree branding as far as possible from your end-user also check the [global server settings](../settings/global.md#server-settings). diff --git a/src/backend/InvenTree/InvenTree/api_version.py b/src/backend/InvenTree/InvenTree/api_version.py index 94aa80c38e..5f43e0305c 100644 --- a/src/backend/InvenTree/InvenTree/api_version.py +++ b/src/backend/InvenTree/InvenTree/api_version.py @@ -1,11 +1,17 @@ """InvenTree API version information.""" # InvenTree API version -INVENTREE_API_VERSION = 190 +INVENTREE_API_VERSION = 192 """Increment this API version number whenever there is a significant change to the API that any clients need to know about.""" INVENTREE_API_TEXT = """ +v192 - 2024-04-23 : https://github.com/inventree/InvenTree/pull/7106 + - Adds 'trackable' ordering option to BuildLineLabel API endpoint + +v191 - 2024-04-22 : https://github.com/inventree/InvenTree/pull/7079 + - Adds API endpoints for Contenttype model + v190 - 2024-04-19 : https://github.com/inventree/InvenTree/pull/7024 - Adds "active" field to the Company API endpoints - Allow company list to be filtered by "active" status diff --git a/src/backend/InvenTree/InvenTree/metadata.py b/src/backend/InvenTree/InvenTree/metadata.py index 65097ed758..9811a41d7c 100644 --- a/src/backend/InvenTree/InvenTree/metadata.py +++ b/src/backend/InvenTree/InvenTree/metadata.py @@ -280,6 +280,8 @@ class InvenTreeMetadata(SimpleMetadata): # Special case for 'user' model if field_info['model'] == 'user': field_info['api_url'] = '/api/user/' + elif field_info['model'] == 'contenttype': + field_info['api_url'] = '/api/contenttype/' else: field_info['api_url'] = model.get_api_url() diff --git a/src/backend/InvenTree/build/api.py b/src/backend/InvenTree/build/api.py index 97ead63494..e6e6267fe2 100644 --- a/src/backend/InvenTree/build/api.py +++ b/src/backend/InvenTree/build/api.py @@ -349,6 +349,7 @@ class BuildLineList(BuildLineEndpoint, ListCreateAPI): 'optional', 'unit_quantity', 'available_stock', + 'trackable', ] ordering_field_aliases = { @@ -357,6 +358,7 @@ class BuildLineList(BuildLineEndpoint, ListCreateAPI): 'unit_quantity': 'bom_item__quantity', 'consumable': 'bom_item__consumable', 'optional': 'bom_item__optional', + 'trackable': 'bom_item__sub_part__trackable', } search_fields = [ diff --git a/src/backend/InvenTree/common/api.py b/src/backend/InvenTree/common/api.py index 50f6361e0b..bba5ac766b 100644 --- a/src/backend/InvenTree/common/api.py +++ b/src/backend/InvenTree/common/api.py @@ -3,6 +3,7 @@ import json from django.conf import settings +from django.contrib.contenttypes.models import ContentType from django.http.response import HttpResponse from django.urls import include, path, re_path from django.utils.decorators import method_decorator @@ -619,6 +620,38 @@ class FlagDetail(RetrieveAPI): return {key: value} +class ContentTypeList(ListAPI): + """List view for ContentTypes.""" + + queryset = ContentType.objects.all() + serializer_class = common.serializers.ContentTypeSerializer + permission_classes = [permissions.IsAuthenticated] + + +class ContentTypeDetail(RetrieveAPI): + """Detail view for a ContentType model.""" + + queryset = ContentType.objects.all() + serializer_class = common.serializers.ContentTypeSerializer + permission_classes = [permissions.IsAuthenticated] + + +@extend_schema(operation_id='contenttype_retrieve_model') +class ContentTypeModelDetail(ContentTypeDetail): + """Detail view for a ContentType model.""" + + def get_object(self): + """Attempt to find a ContentType object with the provided key.""" + model_ref = self.kwargs.get('model', None) + if model_ref: + qs = self.filter_queryset(self.get_queryset()) + try: + return qs.get(model=model_ref) + except ContentType.DoesNotExist: + raise NotFound() + raise NotFound() + + settings_api_urls = [ # User settings path( @@ -799,6 +832,21 @@ common_api_urls = [ path('', AllStatusViews.as_view(), name='api-status-all'), ]), ), + # Contenttype + path( + 'contenttype/', + include([ + path( + '