Merge branch '2.x' into fix-upgrade-addpermission

Author: xispa

.github/workflows/build-and-test.yml

@@ -0,0 +1,79 @@
+name: build and test senaite.storage
+on:
+  - push
+  - pull_request
+env:
+  PLONE_VERSION: "5.2"
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache pyenv Python builds
+        uses: actions/cache@v4
+        with:
+          path: ~/.pyenv
+          key: pyenv-2.7.18-${{ runner.os }}
+          restore-keys: |
+            pyenv-2.7.18-
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y make build-essential libssl-dev \
+              zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev \
+              wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev \
+              libxmlsec1-dev libffi-dev liblzma-dev
+
+      - name: Install pyenv
+        run: |
+          if [ ! -d "$HOME/.pyenv" ]; then
+            curl https://pyenv.run | bash
+          fi
+
+      - name: Install Python 2.7 with pyenv (if not cached)
+        run: |
+          export PYENV_ROOT="$HOME/.pyenv"
+          export PATH="$PYENV_ROOT/bin:$PATH"
+          eval "$(pyenv init --path)"
+          pyenv install 2.7.18 || true  # Avoid reinstalling if already cached
+          pyenv global 2.7.18
+
+      - name: Verify Python Version
+        run: |
+          export PYENV_ROOT="$HOME/.pyenv"
+          export PATH="$PYENV_ROOT/bin:$PATH"
+          eval "$(pyenv init --path)"
+          python --version  # Should output Python 2.7.18
+
+      - name: Cache eggs
+        uses: actions/cache@v4
+        with:
+          key: eggs-cache-${{ hashFiles('buildout.cfg', 'requirements.txt') }}
+          path: |
+            eggs/
+
+      - name: Install dependencies and setup virtualenv
+        run: |
+          export PYENV_ROOT="$HOME/.pyenv"
+          export PATH="$PYENV_ROOT/bin:$PATH"
+          eval "$(pyenv init --path)"
+          pip install virtualenv
+          virtualenv -p `which python` .
+          ./bin/pip install --upgrade pip
+          ./bin/pip install -r requirements.txt
+          ./bin/buildout -N -t 3 annotate
+          ./bin/buildout -N -t 3
+
+      # - name: Lint
+      #   run: |
+      #     ./bin/pip install flake8
+      #     ./bin/flake8 --config ci_flake8.cfg src/senaite/
+
+      - name: Run tests
+        run: |
+          ./bin/test -s senaite.storage

.gitignore

@@ -26,9 +26,7 @@ Thumbs.db
 bin
 
 # Other sources
-src/senaite.core
-src/senaite.api
-src/senaite.lims
+src/senaite.*
 
 # Distribution / packaging
 .Python

CHANGES.rst

@@ -1,9 +1,95 @@
 Changelog
 =========
 
-1.0.2 (unreleased)
+2.7.0 (unreleased)
 ------------------
-- #14 Refactor folderitem for storage listings to get full object from brain param obj
+
+- #56 Fix UnicodeDecodeError on positions display in storage listing
+- #55 Fix Unauthorized error when moving a container across storage
+- #54 Fix all storage containers reindexed when other add-ons are upgraded
+- #53 Fix AttributeError for containers with more than 25 rows
+- #52 Migrate Storage Root Folder to DX
+- #51 JS->DX compatibility
+- #50 Migrate storage samples container to DX
+- #49 Migrate storage container to DX
+- #48 Migrate Storage Facility to DX
+
+
+2.6.0 (2025-04-04)
+------------------
+
+- #47 Update permission imports
+- #46 Compatibility with core#2584 (SampleType to DX)
+- #44 Compatibility with core#2567 (AnalysisCategory to DX)
+- #42 Compatibility with core#2471 (Department to DX)
+- #39 Add storage settings for auto-store/recover of primary sample
+- #38 Remove Script (Python) for guards in favour of guard_handler
+
+
+2.5.0 (2024-01-11)
+------------------
+
+- #37 Migrate Sample/Container Reference Fields to new Widget
+
+
+2.4.1 (2023-03-11)
+------------------
+
+- #36 Remove code headers from Script (Python)
+
+
+2.4.0 (2023-03-10)
+------------------
+
+- Version 2.3.0 -> 2.4.0
+
+
+2.3.0 (2022-10-03)
+------------------
+
+- Version 2.2.0 -> 2.3.0
+
+
+2.2.0 (2022-06-10)
+------------------
+
+- #34 Fix non-lab users can access to storage
+
+
+2.1.1 (2022-01-08)
+------------------
+
+- #32 Fixed catalogs in page templates
+
+
+2.1.0 (2022-01-05)
+------------------
+
+- #30 Compatibility with Senaite catalog migration
+- #28 Added upgrade step event subscriber
+- #27 Integrate dispatch workflow from senaite.core
+- #26 Disallow to modify portal content when stored/booked out samples
+- #25 Remove booked out samples from container
+- #23 Allow storage container to be booked out
+- #22 Allow to move containers
+- #21 Allow storage contents to be deactivated
+- #20 Added uninstall profile
+- #19 Improved storage listing and structuring with positions
+
+
+2.0.0 (2020-10-19)
+------------------
+
+- Added full hierarchy filter in containers listings
+- #15 Fixed imports to senaite.app.listing
+- Do not display Containers and SampleContainers in navbar by default
+- Compatibility with senaite.lims 2.x
+
+
+1.0.2 (2020-08-11)
+------------------
+
+- #14 Refactor folderitem for storage listings to get full object from brain
 
 
 1.0.1 (2020-03-07)

README.rst

@@ -10,6 +10,9 @@
 .. image:: https://img.shields.io/pypi/v/senaite.storage.svg?style=flat-square
    :target: https://pypi.python.org/pypi/senaite.storage
 
+.. image:: https://img.shields.io/github/actions/workflow/status/senaite/senaite.storage/build-and-test.yml?branch=2.x
+   :target: https://github.com/senaite/senaite.storage/actions/workflows/build-and-test.yml?query=branch:2.x
+
 .. image:: https://img.shields.io/github/issues-pr/senaite/senaite.storage.svg?style=flat-square
    :target: https://github.com/senaite/senaite.storage/pulls
 
@@ -105,7 +108,7 @@ Feedback and support
 License
 =======
 
-**SENAITE.STORAGE** Copyright (C) 2019-2020 RIDING BYTES & NARALABS
+**SENAITE.STORAGE** Copyright (C) 2019-2024 RIDING BYTES & NARALABS
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the `GNU General Public License version 2