Skip to content

Commit 4ea5b47

Browse files
authored
merge v1.3.2 release
2 parents f1039e6 + 4faf77d commit 4ea5b47

File tree

15 files changed

+200
-93
lines changed

15 files changed

+200
-93
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Dependency Upgrade
3+
about: Checklist for manual dependency upgrades for a release
4+
title: 'Upgrade dependencies for RELEASE_VERSION'
5+
labels: environment
6+
assignees: 'mikkonie'
7+
8+
---
9+
10+
## Dependencies
11+
12+
- [ ] TODO
13+
14+
## Notes
15+
16+
N/A

CHANGELOG.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,28 @@ Changelog for the **SODAR Core** Django app package. Loosely follows the
55
`Keep a Changelog <http://keepachangelog.com/en/1.0.0/>`_ guidelines.
66

77

8+
v1.3.2 (2026-01-12)
9+
===================
10+
11+
Added
12+
-----
13+
14+
- **General**
15+
- Dependency upgrade issue template (#1856)
16+
- **Timeline**
17+
- Debug logging for event creation and updating (#449)
18+
19+
Changed
20+
-------
21+
22+
- **General**
23+
- Upgrade to Django v5.2.10 (#1857)
24+
- Refactor relative imports into absolute imports (#392)
25+
- Update ``dev_core_install.rst`` for ``sodar-core-docker-compose`` (#1852)
26+
- **Timeline**
27+
- Refactor object creation (#1858)
28+
29+
830
v1.3.1 (2025-12-12)
931
===================
1032

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ and breaking changes are possible.
117117

118118
.. code-block:: console
119119
120-
pip install django-sodar-core==1.3.1
120+
pip install django-sodar-core==1.3.2
121121
122122
For installing a development version you can point your dependency to a specific
123123
commit ID in GitHub. Note that these versions may not be stable.

adminalerts/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.contrib import admin
22

3-
from .models import AdminAlert
3+
from adminalerts.models import AdminAlert
44

55
# Register your models here.
66
admin.site.register(AdminAlert)

bgjobs/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.contrib import admin
22

3-
from .models import BackgroundJob, BackgroundJobLogEntry
3+
from bgjobs.models import BackgroundJob, BackgroundJobLogEntry
44

55
# Register your models here.
66
admin.site.register(BackgroundJob)

codemeta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
],
4141
"identifier": "https://doi.org/10.5281/zenodo.4269346",
4242
"codeRepository": "https://github.com/bihealth/sodar-core",
43-
"datePublished": "2025-12-12",
44-
"dateModified": "2025-12-12",
43+
"datePublished": "2026-01-12",
44+
"dateModified": "2026-01-12",
4545
"dateCreated": "2019-06-26",
4646
"description": "SODAR Core: A Django-based framework for scientific data management and analysis web apps",
4747
"keywords": "Python, Django, scientific data managmenent, software library",
4848
"license": "MIT",
4949
"title": "SODAR Core",
50-
"version": "v1.3.1"
50+
"version": "v1.3.2"
5151
}

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
# -- Project information -----------------------------------------------------
2424

2525
project = 'SODAR Core'
26-
copyright = '2018-2025, Berlin Institute of Health'
26+
copyright = '2018-2026, Berlin Institute of Health'
2727
author = 'BIH Core Unit Bioinformatics'
2828

2929
# The short X.Y version
3030
version = '1.3'
3131
# The full version, including alpha/beta/rc tags
32-
release = '1.3.1'
32+
release = '1.3.2'
3333

3434

3535
# -- General configuration ---------------------------------------------------

docs/source/dev_core_install.rst

Lines changed: 75 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,46 @@ Development Installation
66
Instructions on how to install a local development version of SODAR Core are
77
detailed here. Ubuntu 24.04 LTS is the supported OS for development. For
88
deployment, the same Ubuntu version or a corresponding Debian release are
9-
recommended. Other Linux variants can be used, but some system dependencies may
10-
vary for different OS versions or distributions.
11-
12-
Installation and development should be possible on most recent versions of
13-
Linux, Mac and Windows (WSL2 recommended). However, this may require extra work
14-
and your mileage may vary.
15-
16-
If you need to set up the accompanying example site in Docker, please see online
17-
for up-to-date Docker setup tutorials for Django related to your operating
18-
system of choice.
9+
recommended. Other Linux variants can be used for development or deployment, but
10+
some system dependencies may vary for different OS versions or distributions.
1911

2012
.. note::
2113

22-
These instructions are also valid for the
14+
These instructions are also valid for developing the
2315
`sodar-django-site <https://github.com/bihealth/sodar-django-site>`_
2416
repository.
2517

2618

27-
System Dependencies
28-
===================
19+
.. _dev_core_install_database:
2920

30-
To get started, install the OS dependencies, Python >=3.11 (3.13 recommended)
31-
and PostgreSQL >=12 (16 recommended).
21+
1. Setup Database Servers
22+
=========================
3223

33-
.. code-block:: console
24+
Developing SODAR Core requires PostgreSQL v12+ (v16 recommended) and Redis.
25+
There are two options for setting up the databases: bringing up the
26+
pre-configured Docker Compose network or manual setup.
3427

35-
$ sudo utility/install_os_dependencies.sh
36-
$ sudo utility/install_python.sh
37-
$ sudo utility/install_postgres.sh
28+
Setup with Docker Compose (Recommended)
29+
---------------------------------------
3830

31+
The easiest way to set up the database servers is by cloning
32+
`sodar-core-docker-compose <https://github.com/bihealth/sodar-core-docker-compose>`_.
33+
This repository sets up a Docker Compose network with the database servers as
34+
containers. Follow the instructions in the repository readme to bring up the
35+
network. The SODAR Core database and user will be set up automatically on
36+
initial launch.
3937

40-
.. _dev_core_install_database:
38+
Manual Setup
39+
------------
4140

42-
Database Setup
43-
==============
41+
It is also possible to set up a server manually or use an existing server. To
42+
install PostgreSQL prerequisites, run the following script:
4443

45-
Next you need to setup the database and PostgreSQL user. You need to enter the
46-
following SQL in ``psql``:
44+
.. code-block:: console
45+
46+
$ sudo utility/install_postgres.sh
47+
48+
Once you have a PostgreSQL server running, you'll need to run the following SQL:
4749

4850
.. code-block:: sql
4951
@@ -52,41 +54,58 @@ following SQL in ``psql``:
5254
ALTER DATABASE sodar_core OWNER TO sodar_core;
5355
ALTER USER sodar_core CREATEDB;
5456
55-
Alternatively, if PostgreSQL is running directly on your development host, you
56-
can use the following utility script (this does not work with a Docker setup):
57+
If your PostgreSQL is running directly on your development host, you can also
58+
use the following utility script:
5759

5860
.. code-block:: console
5961
6062
$ sudo utility/setup_database.sh
6163
62-
You have to set the database URL and credentials for Django in the environment
63-
variable ``DATABASE_URL``. For development it is recommended to place
64-
environment variables in file ``.env`` located in your project root. To enable
65-
loading the file in Django, set ``DJANGO_READ_DOT_ENV_FILE=1`` in your
66-
environment variables when running SODAR or any of its management commands.
67-
See ``config/settings/base.py`` for more information and the ``env.example``
68-
file for an example environment file.
64+
To install Redis manually, run the following script:
65+
66+
.. code-block:: console
67+
68+
$ sudo utility/install_redis.sh
6969
70-
Example of the database URL variable as set within an ``.env`` file:
70+
71+
2. Setup Repository
72+
===================
73+
74+
Clone the SODAR Core repository from GitHub and create yourself a ``.env``
75+
environment configuration file.
7176

7277
.. code-block:: console
7378
74-
DATABASE_URL="postgres://sodar_core:sodar_core@127.0.0.1/sodar_core"
79+
$ git clone https://github.com/bihealth/sodar-core.git
80+
$ cd sodar-core
81+
$ cp env.example .env
82+
83+
.. important::
7584

76-
Asynchronous Celery tasks require running a Redis server. For development, you
77-
can install it with the following script:
85+
To enable loading environment variables from the ``.env`` file, make sure to
86+
set ``DJANGO_READ_DOT_ENV_FILE=1`` in the environment variables of the
87+
development host.
88+
89+
90+
3. Install OS Dependencies
91+
==========================
92+
93+
For development, you are expected to run the Django server and possible Celery
94+
worker locally. To get started, install the OS dependencies and Python >=3.11
95+
(3.13 recommended).
7896

7997
.. code-block:: console
8098
81-
$ sudo utility/install_redis.sh
99+
$ sudo utility/install_os_dependencies.sh
100+
$ sudo utility/install_python.sh
82101
83102
84-
Repository and Environment Setup
85-
================================
103+
4. Install Python Dependencies
104+
==============================
86105

87-
Clone the repository, setup and activate the virtual environment. Once within
88-
the repository and an active virtual environment, install Python requirements
89-
for the project. Example:
106+
To set up Python dependencies for the repository, you'll first need to activate
107+
a virtual environment. Once within an active virtual environment, use the
108+
provided script to install the Python dependencies for development. Example:
90109

91110
.. code-block:: console
92111
@@ -95,21 +114,21 @@ for the project. Example:
95114
$ utility/install_python_dependencies.sh
96115
97116
98-
LDAP Setup (Optional)
99-
=====================
117+
5. Install LDAP Dependencies (Optional)
118+
=======================================
100119

101-
If you will be using LDAP/AD auth on your site, make sure to also run:
120+
If you will be using LDAP/AD auth when developing, make sure to also run:
102121

103122
.. code-block:: console
104123
105124
$ sudo utility/install_ldap_dependencies.sh
106125
$ pip install -r requirements/ldap.txt
107126
108127
109-
Final Setup
110-
===========
128+
6. Setup Django
129+
===============
111130

112-
Initialize the database (this will also synchronize django-plugins):
131+
Initialize the SODAR Core Django database (this will also synchronize plugins):
113132

114133
.. code-block:: console
115134
@@ -150,20 +169,20 @@ terminal.
150169
process is not necessary.
151170

152171

153-
Optional Steps
154-
==============
172+
7. Create Development Users (Optional)
173+
======================================
155174

156-
For creating a group of example users for your development site, you can run the
157-
``createdevusers`` management command. This creates the users "alice", "bob",
158-
"carol", "dan" and "erin". The users will be created with the password
159-
"sodarpass", unless a custom password is supplied via the ``-p`` or
175+
For creating a group of example users for your development site, it is
176+
recommended to run the ``createdevusers`` management command. This creates the
177+
users "alice", "bob", "carol", "dan" and "erin". The users will be created with
178+
the password "sodarpass", unless a custom password is supplied via the ``-p`` or
160179
``--password`` argument.
161180

162181
.. code-block:: console
163182
164183
$ ./manage.py createdevusers
165184
166-
.. note::
185+
.. hint::
167186

168187
Having multiple non-admin user accounts is useful for developing and trying
169188
out project and member access management features. It is recommended to log

docs/source/major_changes.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@ older SODAR Core version. For a complete list of changes in current and previous
1010
releases, see the :ref:`full changelog<changelog>`.
1111

1212

13+
v1.3.2 (2026-01-12)
14+
*******************
15+
16+
Release Highlights
17+
==================
18+
19+
- Add timeline API debug logging
20+
- Add depdendency upgrade issue template
21+
- Upgrade critical dependencies
22+
23+
Breaking Changes
24+
================
25+
26+
System Prerequisites
27+
--------------------
28+
29+
Django Version
30+
The minimum Django version has been bumped to v5.2.10.
31+
32+
1333
v1.3.1 (2025-12-12)
1434
*******************
1535

filesfolders/admin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
from django.contrib import admin
33

44
from db_file_storage.form_widgets import DBAdminClearableFileInput
5-
from .models import File, Folder, HyperLink
5+
6+
from filesfolders.models import File, Folder, HyperLink
67

78

89
class FileForm(forms.ModelForm):

0 commit comments

Comments
 (0)