diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73e1b5cb..c6fc2da3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,8 +43,6 @@ jobs: IRODS_ICAT_DBPASS: postgres IRODS_ZONE_NAME: sodarZone NO_WAIT: 1 - options: >- - --hostname "irods" ports: - 4488:1247 env: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a4f8a73c..8ac69557 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -41,7 +41,7 @@ Changed - Unify base test class naming (#2001) - Update ``Dockerfile`` for v1.0 upgrades (#2003, #2004) - Upgrade to iRODS v4.3.3 in CI (#1815) - - Upgrade to python-irodsclient v2.1.0 (#2007) + - Upgrade to python-irodsclient v2.2.0 (#2007, #2023) - Upgrade minimum supported iRODS version to v4.3.3 (#1815, #2007) - Use constants for timeline event status types (#2010) - **Irodsbackend** diff --git a/docs_manual/source/dev_install.rst b/docs_manual/source/dev_install.rst index 2560c4cf..0d35cb27 100644 --- a/docs_manual/source/dev_install.rst +++ b/docs_manual/source/dev_install.rst @@ -328,13 +328,6 @@ You can run the SODAR Django server tests using the following command: In addition to unit tests, this will run tests against the test iRODS server running in the Docker Compose network. -.. note:: - - If the current dev branch uses ``python-irodsclient`` between versions 1.1.9 - and 2.1.0, you will have to add the line ``127.0.0.1 irods irods-test`` into - your ``/etc/hosts`` file. Otherwise functionality and tests involving - opening files in iRODS will fail. - For testing the Sample Sheets Vue app, run the following command: .. code-block:: bash diff --git a/docs_manual/source/sodar_release_notes.rst b/docs_manual/source/sodar_release_notes.rst index 0a8e9578..85194953 100644 --- a/docs_manual/source/sodar_release_notes.rst +++ b/docs_manual/source/sodar_release_notes.rst @@ -23,7 +23,7 @@ Release for SODAR Core v1.0 upgrade, iRODS v4.3 upgrade and feature updates. - Update REST API versioning - Update REST API views for OpenAPI support - Upgrade to Postgres v16 -- Upgrade to python-irodsclient v2.1.0 +- Upgrade to python-irodsclient v2.2.0 - Upgrade to SODAR Core v1.0.2 - SODAR Core v1.0 updates: OIDC auth support, new REST API versioning, owner/delegate remote sync controls, etc diff --git a/requirements/base.txt b/requirements/base.txt index 6b0f7beb..ad28e737 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -91,7 +91,7 @@ altamisa==0.2.9 # -e git+https://github.com/bihealth/altamisa.git@f6de23aa6073d446f7c49ede0af7fa8729992209#egg=altamisa # Python iRODS client -python-irodsclient==2.1.0 +python-irodsclient==2.2.0 # XML generating lxml==4.9.1