From 5f5954c1923058031b07dda2e0898164a3554318 Mon Sep 17 00:00:00 2001 From: Camill Kaipf Date: Fri, 12 Aug 2022 13:39:47 +0200 Subject: update SQLAlchemy logger in quick tutorial fixes #3706 --- docs/quick_tutorial/databases.rst | 26 +++++++++++++------------- docs/quick_tutorial/databases/development.ini | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst index db75d70ce..7e85e4b95 100644 --- a/docs/quick_tutorial/databases.rst +++ b/docs/quick_tutorial/databases.rst @@ -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', '

Root

') - 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', '

Root

') + 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 -- cgit v1.2.3 From 763ad1a4fe0799ff449ef117859f07a557d949c1 Mon Sep 17 00:00:00 2001 From: Camill Kaipf <87362681+ckaipf@users.noreply.github.com> Date: Fri, 12 Aug 2022 14:52:40 +0200 Subject: signed CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index edce6e9c7..a2dc79e9d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -358,3 +358,5 @@ Contributors - Jens Troeger, 2021/04/08 - Karthikeyan Singaravelan, 2021/08/24 + +- Camill Kaipf, 2022/08/12 -- cgit v1.2.3 From d62fc1a0af0f13eacf25611e5c36604c4ea4948d Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 27 Dec 2022 15:04:06 +0100 Subject: Add dependabot to update github action versions --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml 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" -- cgit v1.2.3 From 5bc32e59fdb89569be23de1b7f851a169587362a Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 27 Dec 2022 15:04:43 +0100 Subject: Chase rename to allowlist in tox --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index a64ad5387..77fb47ae4 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 = -- cgit v1.2.3 From 763258441f78e58a2c07143734a67a2856ea6eca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:09:24 +0000 Subject: Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 605ebdae0..14baf41db 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -46,7 +46,7 @@ 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 with: @@ -59,7 +59,7 @@ 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 with: @@ -71,7 +71,7 @@ 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 with: @@ -83,7 +83,7 @@ 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 with: -- cgit v1.2.3 From f01ff60ceae1caa25271bd9f2616b80f54761130 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:10:12 +0000 Subject: Bump actions/setup-python from 2 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 605ebdae0..3577a2121 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -48,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.py }} architecture: ${{ matrix.architecture }} @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.8 architecture: x64 @@ -73,7 +73,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 architecture: x64 @@ -85,7 +85,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 architecture: x64 -- cgit v1.2.3 From e11c95b8f37b0eff61c1b11931e307468226ed5e Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Tue, 27 Dec 2022 19:07:42 +0100 Subject: Update reference to ORM in sqlalchemy --- docs/quick_tutorial/databases.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/quick_tutorial/databases.rst b/docs/quick_tutorial/databases.rst index db75d70ce..8d216d53d 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 ` project and its -:ref:`object-relational mapper (ORM) ` as a -convenient, Pythonic way to interface to databases. +:ref:`object-relational mapper (ORM) ` 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. -- cgit v1.2.3