summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/dependabot.yml10
-rw-r--r--.github/workflows/ci-tests.yml16
-rw-r--r--CONTRIBUTORS.txt4
-rw-r--r--docs/quick_tutorial/databases.rst30
-rw-r--r--docs/quick_tutorial/databases/development.ini6
-rw-r--r--tox.ini4
6 files changed, 41 insertions, 29 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..573705517
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ # Check for updates to GitHub Actions every weekday
+ interval: "daily"
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 13b849d0f..f9ade8eda 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -47,9 +47,9 @@ jobs:
name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}"
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.py }}
architecture: ${{ matrix.architecture }}
@@ -60,9 +60,9 @@ jobs:
runs-on: ubuntu-20.04
name: Validate coverage
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup python
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v4
with:
python-version: 3.8
architecture: x64
@@ -72,9 +72,9 @@ jobs:
runs-on: ubuntu-20.04
name: Build the documentation
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: 3.8
architecture: x64
@@ -84,9 +84,9 @@ jobs:
runs-on: ubuntu-20.04
name: Lint the package
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: 3.8
architecture: x64
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 92ecd67de..9b7f3819f 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -359,4 +359,6 @@ Contributors
- Karthikeyan Singaravelan, 2021/08/24
-- Stefano Rivera, 2022/12/29
+- Camill Kaipf, 2022/08/12
+
+- Stefano Rivera, 2022/12/29 \ No newline at end of file
diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst
index db75d70ce..5582e6101 100644
--- a/docs/quick_tutorial/databases.rst
+++ b/docs/quick_tutorial/databases.rst
@@ -13,8 +13,8 @@ Background
Our Pyramid-based wiki application now needs database-backed storage of pages.
This frequently means an SQL database. The Pyramid community strongly supports
the :ref:`SQLAlchemy <sqla:index_toplevel>` project and its
-:ref:`object-relational mapper (ORM) <sqla:ormtutorial_toplevel>` as a
-convenient, Pythonic way to interface to databases.
+:ref:`object-relational mapper (ORM) <sqla:orm_toplevel>` as a convenient,
+Pythonic way to interface to databases.
In this step we hook up SQLAlchemy to a SQLite database table, providing
storage and retrieval for the wiki pages in the previous step.
@@ -87,13 +87,13 @@ Steps
$VENV/bin/initialize_tutorial_db development.ini
- 2016-04-16 13:01:33,055 INFO [sqlalchemy.engine.base.Engine][MainThread] SELECT CAST('test plain returns' AS VARCHAR(60)) AS anon_1
- 2016-04-16 13:01:33,055 INFO [sqlalchemy.engine.base.Engine][MainThread] ()
- 2016-04-16 13:01:33,056 INFO [sqlalchemy.engine.base.Engine][MainThread] SELECT CAST('test unicode returns' AS VARCHAR(60)) AS anon_1
- 2016-04-16 13:01:33,056 INFO [sqlalchemy.engine.base.Engine][MainThread] ()
- 2016-04-16 13:01:33,057 INFO [sqlalchemy.engine.base.Engine][MainThread] PRAGMA table_info("wikipages")
- 2016-04-16 13:01:33,057 INFO [sqlalchemy.engine.base.Engine][MainThread] ()
- 2016-04-16 13:01:33,058 INFO [sqlalchemy.engine.base.Engine][MainThread]
+ 2016-04-16 13:01:33,055 INFO [sqlalchemy.engine.Engine][MainThread] SELECT CAST('test plain returns' AS VARCHAR(60)) AS anon_1
+ 2016-04-16 13:01:33,055 INFO [sqlalchemy.engine.Engine][MainThread] ()
+ 2016-04-16 13:01:33,056 INFO [sqlalchemy.engine.Engine][MainThread] SELECT CAST('test unicode returns' AS VARCHAR(60)) AS anon_1
+ 2016-04-16 13:01:33,056 INFO [sqlalchemy.engine.Engine][MainThread] ()
+ 2016-04-16 13:01:33,057 INFO [sqlalchemy.engine.Engine][MainThread] PRAGMA table_info("wikipages")
+ 2016-04-16 13:01:33,057 INFO [sqlalchemy.engine.Engine][MainThread] ()
+ 2016-04-16 13:01:33,058 INFO [sqlalchemy.engine.Engine][MainThread]
CREATE TABLE wikipages (
uid INTEGER NOT NULL,
title TEXT,
@@ -103,12 +103,12 @@ Steps
)
- 2016-04-16 13:01:33,058 INFO [sqlalchemy.engine.base.Engine][MainThread] ()
- 2016-04-16 13:01:33,059 INFO [sqlalchemy.engine.base.Engine][MainThread] COMMIT
- 2016-04-16 13:01:33,062 INFO [sqlalchemy.engine.base.Engine][MainThread] BEGIN (implicit)
- 2016-04-16 13:01:33,062 INFO [sqlalchemy.engine.base.Engine][MainThread] INSERT INTO wikipages (title, body) VALUES (?, ?)
- 2016-04-16 13:01:33,063 INFO [sqlalchemy.engine.base.Engine][MainThread] ('Root', '<p>Root</p>')
- 2016-04-16 13:01:33,063 INFO [sqlalchemy.engine.base.Engine][MainThread] COMMIT
+ 2016-04-16 13:01:33,058 INFO [sqlalchemy.engine.Engine][MainThread] ()
+ 2016-04-16 13:01:33,059 INFO [sqlalchemy.engine.Engine][MainThread] COMMIT
+ 2016-04-16 13:01:33,062 INFO [sqlalchemy.engine.Engine][MainThread] BEGIN (implicit)
+ 2016-04-16 13:01:33,062 INFO [sqlalchemy.engine.Engine][MainThread] INSERT INTO wikipages (title, body) VALUES (?, ?)
+ 2016-04-16 13:01:33,063 INFO [sqlalchemy.engine.Engine][MainThread] ('Root', '<p>Root</p>')
+ 2016-04-16 13:01:33,063 INFO [sqlalchemy.engine.Engine][MainThread] COMMIT
#. With our data now driven by SQLAlchemy queries, we need to update our ``databases/tutorial/views.py``:
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 270cf7b63..1c02a8ed2 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -14,7 +14,7 @@ listen = localhost:6543
# Begin logging configuration
[loggers]
-keys = root, tutorial, sqlalchemy.engine.base.Engine
+keys = root, tutorial, sqlalchemy.engine.Engine
[logger_tutorial]
level = DEBUG
@@ -31,10 +31,10 @@ keys = generic
level = INFO
handlers = console
-[logger_sqlalchemy.engine.base.Engine]
+[logger_sqlalchemy.engine.Engine]
level = INFO
handlers =
-qualname = sqlalchemy.engine.base.Engine
+qualname = sqlalchemy.engine.Engine
[handler_console]
class = StreamHandler
diff --git a/tox.ini b/tox.ini
index 32341b56f..94dfa6775 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,14 +35,14 @@ deps =
check-manifest
[testenv:docs]
-whitelist_externals = make
+allowlist_externals = make
commands =
make -C docs {posargs:doctest html epub} BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
extras =
docs
[testenv:pdf]
-whitelist_externals = make
+allowlist_externals = make
commands =
make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
extras =
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-10 21:19:59 +0000