Merge b6cfeecf69 into 4f9cad88bd

Rename master to main
Update sqlalchemy requirement from <1.5,>=1.3.0 to >=1.3.0,<2.1
2025-05-15 08:51:50 +02:00 · 2024-12-28 02:12:30 +01:00 · 2024-12-28 00:50:27 +01:00 · 2024-12-23 20:27:47 +00:00
3 changed files with 5 additions and 5 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,9 +2,9 @@ name: CI

 on:
  push:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]

 jobs:
  lint:
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@ -3,9 +3,9 @@ name: Docker build
 on:
  push:
    tags: ['*']
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]


 jobs:
--- a/pyproject.toml
+++ b/pyproject.toml
@ -45,7 +45,7 @@ dependencies = [
    "python-dateutil",
    "qrcode>=7.1,<9",
    "requests>=2.25,<3",
-    "SQLAlchemy>=1.3.0,<1.5",
+    "SQLAlchemy>=1.3.0,<2.1",
    "SQLAlchemy-Continuum>=1.3.12,<2", # New 1.4 changes API, see #728
    "Werkzeug>=2,<3",
    "WTForms>=2.3.3,<3.3",]
Author	SHA1	Message	Date
dependabot[bot]	f63c38c59e	Merge `b6cfeecf69` into `4f9cad88bd`	2024-12-28 02:12:30 +01:00
Alexis Métaireau	4f9cad88bd	Rename master to main Some checks failed CI / lint (push) Has been cancelled Details CI / docs (push) Has been cancelled Details Docker build / test (push) Has been cancelled Details CI / test (mariadb, minimal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.9) (push) Has been cancelled Details CI / test (postgresql, minimal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.9) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.10) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.11) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.12) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.9) (push) Has been cancelled Details CI / test (sqlite, normal, 3.10) (push) Has been cancelled Details CI / test (sqlite, normal, 3.11) (push) Has been cancelled Details CI / test (sqlite, normal, 3.12) (push) Has been cancelled Details CI / test (sqlite, normal, 3.8) (push) Has been cancelled Details CI / test (sqlite, normal, 3.9) (push) Has been cancelled Details Docker build / build_upload (push) Has been cancelled Details	2024-12-28 00:50:27 +01:00
dependabot[bot]	b6cfeecf69	Update sqlalchemy requirement from <1.5,>=1.3.0 to >=1.3.0,<2.1 --- updated-dependencies: - dependency-name: sqlalchemy dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-23 20:27:47 +00:00