Merge 3f4ded4044 into 4f9cad88bd

Rename master to main
Update flask-sqlalchemy requirement from <3,>=2.4 to >=2.4,<4
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-20 16:19:02 +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
@ -37,7 +37,7 @@ dependencies = [
    "Flask-Mail>=0.9.1,<1",
    "Flask-Migrate>=2.5.3,<5", # Not following semantic versioning (e.g. https://github.com/miguelgrinberg/flask-migrate/commit/1af28ba273de6c88544623b8dc02dd539340294b)
    "Flask-RESTful>=0.3.9,<1",
-    "Flask-SQLAlchemy>=2.4,<3",
+    "Flask-SQLAlchemy>=2.4,<4",
    "Flask-Talisman>=0.8,<2",
    "Flask-WTF>=0.14.3,<2",
    "itsdangerous>=2,<3",
Author	SHA1	Message	Date
dependabot[bot]	2661b40b04	Merge `3f4ded4044` 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]	3f4ded4044	Update flask-sqlalchemy requirement from <3,>=2.4 to >=2.4,<4 Updates the requirements on [flask-sqlalchemy](https://github.com/pallets-eco/flask-sqlalchemy) to permit the latest version. - [Release notes](https://github.com/pallets-eco/flask-sqlalchemy/releases) - [Changelog](https://github.com/pallets-eco/flask-sqlalchemy/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets-eco/flask-sqlalchemy/compare/2.4.0...3.1.1) --- updated-dependencies: - dependency-name: flask-sqlalchemy dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-20 16:19:02 +00:00