[bug#53019] [PATCHES] Add aerich

[bug#53019] [PATCHES] Add aerich

[Giacomo Leidi via Guix-patches via]

Hi Guixers ,

I'm sending a patch series to add aerich.

Thank you for your time,

Giacomo

[bug#53019] [PATCH 1/4] gnu: python-dictdiffer: Fix broken test suite.

[Giacomo Leidi via Guix-patches via]

This patch prevents pytest from running a PEP8 check on the source,
since it breaks pytest's own collection phase.

* gnu/packages/python-xyz.scm (python-dictdiffer)[snippet]: Patch pytest
configuration to prevent PEP8 testing.
---
 gnu/packages/python-xyz.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e04b4f973f..c33f9b3213 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25245,7 +25245,15 @@ (define-public python-dictdiffer
               (uri (pypi-uri "dictdiffer" version))
               (sha256
                (base32
-                "1lk3qmy1hkaphk4n7ayfk0wl6m2yvd6r7qkam6yncqfzgkbc1phs"))))
+                "1lk3qmy1hkaphk4n7ayfk0wl6m2yvd6r7qkam6yncqfzgkbc1phs"))
+              (modules '((guix build utils)))
+              (snippet
+                '(begin
+                   ;; FIXME: PEP8 testing breaks pytest collection phase.
+                   (substitute* "pytest.ini"
+                     (("--pep8")
+                      ""))
+                   #t))))
     (build-system python-build-system)
     (native-inputs
      (list python-check-manifest

base-commit: e675030fba924a1aef2677f8ab912eaa3c46403c
-- 
2.34.0

[bug#53019] [PATCH 2/4] gnu: Add python-codeclimate-test-reporter.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
---
 gnu/packages/python-check.scm | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index b4e2765d72..031959c250 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@ (define-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
@@ -1398,6 +1400,49 @@ (define-public python-pytest-qt
 interaction, like key presses and mouse clicks.")
     (license license:expat)))
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-fixtures-paths
+           (lambda _
+             (substitute* "tests/test_formatter.py"
+               (("\\./tests/fixtures")
+                (string-append (getcwd) "/tests/fixtures")))
+             ;; FIXME: These tests fail with
+             ;; obscure error messages.
+             (for-each
+              (lambda (test-file)
+                (delete-file test-file))
+              '("tests/test_reporter.py"
+                "tests/test_runner.py")))))))
+    (native-inputs
+     (list git
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list python-coverage
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-codacy-coverage
   (package
     (name "python-codacy-coverage")
-- 
2.34.0

[bug#53019] [PATCH 3/4] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c33f9b3213..b2ccb66f33 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3502,6 +3502,44 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "test-requirements.txt"
+             (("codecov>=2\\.1\\.8") "codecov")
+             (("pytest-cov>=2\\.10\\.0") "pytest-cov"))
+           #t))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codeclimate-test-reporter
+           python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.34.0

[bug#53019] [PATCH 4/4] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cafcf04448..dacc1e2f4b 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo@member.fsf.org>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2709,6 +2710,36 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public python-aerich
+  (package
+    (name "python-aerich")
+    (version "0.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "aerich" version))
+        (sha256
+          (base32 "19bvx5icsmmf9ylxyqrxw4wjv77shg5r8pjgdg7plzhn937bzlch"))))
+    (build-system python-build-system)
+    (arguments
+     ;; Tests are not packaged in the Pypi tarball and
+     ;; require a poetry environment to be run from source.
+     `(#:tests? #f))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM")
+    (description
+      "This package provides @code{aerich} a Python database migrations tool for
+Tortoise ORM.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.34.0

[bug#53019] (no subject)

[paul via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 65 bytes --]

This is a friendly ping :)

Thank you for your time and efforts


[-- Attachment #2: Type: text/html, Size: 136 bytes --]

[bug#53019] friendly ping

[paul via Guix-patches via]

Dear all,

this is just a ping, thank you for your time and efforts :). I'm 
attaching an updated patchset.

paul

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
---
 gnu/packages/python-check.scm | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 05a378601f..2789d65a25 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@ (define-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
@@ -1508,6 +1510,49 @@ (define-public python-pytest-qt
 interaction, like key presses and mouse clicks.")
     (license license:expat)))
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-fixtures-paths
+           (lambda _
+             (substitute* "tests/test_formatter.py"
+               (("\\./tests/fixtures")
+                (string-append (getcwd) "/tests/fixtures")))
+             ;; FIXME: These tests fail with
+             ;; obscure error messages.
+             (for-each
+              (lambda (test-file)
+                (delete-file test-file))
+              '("tests/test_reporter.py"
+                "tests/test_runner.py")))))))
+    (native-inputs
+     (list git
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list python-coverage
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-codacy-coverage
   (package
     (name "python-codacy-coverage")

base-commit: 0c6bf910efd090f0aa0479ba727e5e68655e9b68
-- 
2.34.0

[bug#53019] [PATCH 2/3] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d3d7b7160d..5edfcca020 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3564,6 +3564,44 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "test-requirements.txt"
+             (("codecov>=2\\.1\\.8") "codecov")
+             (("pytest-cov>=2\\.10\\.0") "pytest-cov"))
+           #t))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codeclimate-test-reporter
+           python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.34.0

[bug#53019] [PATCH 2/3] gnu: Add python-ddlparse.

[Maxime Devos]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +             (("codecov>=2\\.1\\.8") "codecov")
> +             (("pytest-cov>=2\\.10\\.0") "pytest-cov"))

[bug#53019] [PATCH 2/3] gnu: Add python-ddlparse.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +             (("codecov>=2\\.1\\.8") "codecov")
> +             (("pytest-cov>=2\\.10\\.0") "pytest-cov"))

Instead of ignoring upstream's lower bound on the versions,
how about updating the dependencies in Guix?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 2/3] gnu: Add python-ddlparse.

[paul via Guix-patches via]

Dear Maxime,

On 3/6/22 11:19, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +             (("codecov>=2\\.1\\.8") "codecov")
>> +             (("pytest-cov>=2\\.10\\.0") "pytest-cov"))
> Instead of ignoring upstream's lower bound on the versions,
> how about updating the dependencies in Guix?

I updated both of these to the latest available version. Thank you,

Giacomo

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 8e9431016f..f47f738336 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3015,6 +3016,36 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public python-aerich
+  (package
+    (name "python-aerich")
+    (version "0.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "aerich" version))
+        (sha256
+          (base32 "19bvx5icsmmf9ylxyqrxw4wjv77shg5r8pjgdg7plzhn937bzlch"))))
+    (build-system python-build-system)
+    (arguments
+     ;; Tests are not packaged in the Pypi tarball and
+     ;; require a poetry environment to be run from source.
+     `(#:tests? #f))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM")
+    (description
+      "This package provides @code{aerich} a Python database migrations tool for
+Tortoise ORM.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.34.0

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +    (arguments
> +     ;; Tests are not packaged in the Pypi tarball and
> +     ;; require a poetry environment to be run from source.
> +     `(#:tests? #f))

If they are not packaged in the pypi tarball, then it can
be built from git instead.  I also don't see how it required poetry.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[paul via Guix-patches via]

On 3/6/22 11:21, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +    (arguments
>> +     ;; Tests are not packaged in the Pypi tarball and
>> +     ;; require a poetry environment to be run from source.
>> +     `(#:tests? #f))
> If they are not packaged in the pypi tarball, then it can
> be built from git instead.  I also don't see how it required poetry.

The source tarball does not contain tests but has a setup.py generated 
by poetry, the git repository has the tests suite but lacks a setup.py, 
forcing a dependency on poetry to get a suitable setup.py. I fixed this 
by generating a setup.py with poetry.

Greetings,

Giacomo

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +    (synopsis "Database migrations tool for Tortoise ORM")
> +    (description
> +      "This package provides @code{aerich} a Python database migrations tool for
> +Tortoise ORM.")

(comma missing before 'a')

This description is a bit short and it does not introduce the acronym
ORM, see (guix)Synopsis and Descriptions:

   Descriptions should take between five and ten lines.  Use full
sentences, and avoid using acronyms without first introducing them.
[...]

Greetings,
Maxime


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[paul via Guix-patches via]

Dear Maxime,

On 3/6/22 11:31, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +    (synopsis "Database migrations tool for Tortoise ORM")
>> +    (description
>> +      "This package provides @code{aerich} a Python database migrations tool for
>> +Tortoise ORM.")
> (comma missing before 'a')
>
> This description is a bit short and it does not introduce the acronym
> ORM, see (guix)Synopsis and Descriptions:
>
>     Descriptions should take between five and ten lines.  Use full
> sentences, and avoid using acronyms without first introducing them.
> [...]

Fixed, thank you!

Giacomo

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +    (description
> +      "This package provides @code{aerich} a Python database migrations tool for
> +Tortoise ORM.")

Is it a tool, or a library?  If it's a tool, the 'python-' prefix can
be dropped and the inputs depropagated.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 3/3] gnu: Add python-aerich.

[paul via Guix-patches via]

Dear Maxime,

On 3/6/22 11:32, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +    (description
>> +      "This package provides @code{aerich} a Python database migrations tool for
>> +Tortoise ORM.")
> Is it a tool, or a library?  If it's a tool, the 'python-' prefix can
> be dropped and the inputs depropagated.

It's actually both, but I guess that as dynaconf lacks 'python-' this 
should also be renamed. Fixed, thank you. I'm sending an updated patch 
set rebased on master.

Thank you for your time,

Giacomo

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +     (list git

It's only for tests, so WDYT of 'git-minimal', or even
'git-minimal/fixed'?

Greetings,
Maxime

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[paul via Guix-patches via]

Dear Maxime,

first thank for all your feedback,

On 3/6/22 11:17, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +     (list git
> It's only for tests, so WDYT of 'git-minimal', or even
> 'git-minimal/fixed'?
Definitely, fixed.
> Greetings,
> Maxime

Thank you,

Giacomo

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +             ;; FIXME: These tests fail with
> +             ;; obscure error messages.
> +             (for-each
> +              (lambda (test-file)
> +                (delete-file test-file))
> +              '("tests/test_reporter.py"
> +                "tests/test_runner.py")))))))

If these tests fail, there's a problem somewhere in need of a fix.
What are the error messages, and have they been reported upstream?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[paul via Guix-patches via]

Dear Maxime,

On 3/6/22 11:18, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +             ;; FIXME: These tests fail with
>> +             ;; obscure error messages.
>> +             (for-each
>> +              (lambda (test-file)
>> +                (delete-file test-file))
>> +              '("tests/test_reporter.py"
>> +                "tests/test_runner.py")))))))
> If these tests fail, there's a problem somewhere in need of a fix.
> What are the error messages, and have they been reported upstream?

It turns out it requires exactly python-coverage@4.3.4. It's now fixed.

Thank you,

Giacomo

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 700 bytes --]

Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
[+0100]:
> +  #:use-module (gnu packages version-control)

This creates a cycle between (gnu packages version-control) and
(gnu packages python-check).  To avoid cycles, could

  (a) python-codeclimate-test-reported be moved into a new module

or

  (b) the importing be delayed with (module-ref ...), like in
      (guix build-system gnu)?

By reducing cycles, "guix COMMAND some-package" needs to load less
modules and hence less memory.  There are also some other potential
benefits, e.g. see ‘Faster "guix pull" by incremental compilation and
non-circular modules?’ on guix-devel.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#53019] [PATCH 1/3] gnu: Add python-codeclimate-test-reporter.

[paul via Guix-patches via]

Dear Maxime,

On 3/6/22 11:28, Maxime Devos wrote:
> Giacomo Leidi via Guix-patches via schreef op zo 06-03-2022 om 00:14
> [+0100]:
>> +  #:use-module (gnu packages version-control)
> This creates a cycle between (gnu packages version-control) and
> (gnu packages python-check).  To avoid cycles, could
>
>    (a) python-codeclimate-test-reported be moved into a new module
>
> or
>
>    (b) the importing be delayed with (module-ref ...), like in
>        (guix build-system gnu)?
>
> By reducing cycles, "guix COMMAND some-package" needs to load less
> modules and hence less memory.  There are also some other potential
> benefits, e.g. see ‘Faster "guix pull" by incremental compilation and
> non-circular modules?’ on guix-devel.

I wasn't aware of this, thank you. I fixed this by moving 
python-codeclimate-test-reported to (gnu packages python-xyz).

Greetings,

Giacomo

[bug#53019] [PATCH 1/9] gnu: Add python-codeclimate-test-reporter.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
---
 gnu/packages/python-check.scm | 39 +++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 05a378601f..eb6a6852c6 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@ (define-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
@@ -1508,6 +1510,43 @@ (define-public python-pytest-qt
 interaction, like key presses and mouse clicks.")
     (license license:expat)))
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (native-inputs
+     (list git-minimal/fixed
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list (package
+             (inherit python-coverage)
+             (version "4.3.4")
+             (source
+              (origin
+                (method url-fetch)
+                (uri (pypi-uri "coverage" version))
+                (sha256
+                 (base32
+                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-codacy-coverage
   (package
     (name "python-codacy-coverage")

base-commit: f8aa76ab1fd3b4c9c87d2e68a811477adc844217
-- 
2.34.0

[bug#53019] [PATCH 2/9] yyy

[Giacomo Leidi via Guix-patches via]

---
 gnu/packages/python-check.scm | 39 -----------------------------------
 gnu/packages/python-xyz.scm   | 39 ++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index eb6a6852c6..05a378601f 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -13,7 +13,6 @@
 ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
-;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,7 +38,6 @@ (define-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
-  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
@@ -1510,43 +1508,6 @@ (define-public python-pytest-qt
 interaction, like key presses and mouse clicks.")
     (license license:expat)))
 
-(define-public python-codeclimate-test-reporter
-  (package
-    (name "python-codeclimate-test-reporter")
-    (version "0.2.3")
-    (source
-     (origin
-       (method git-fetch)               ;no tests in pypi archive
-       (uri (git-reference
-             (url "https://github.com/codeclimate/python-test-reporter")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
-    (build-system python-build-system)
-    (native-inputs
-     (list git-minimal/fixed
-           python-httpretty
-           python-pytest))
-    (propagated-inputs
-     (list (package
-             (inherit python-coverage)
-             (version "4.3.4")
-             (source
-              (origin
-                (method url-fetch)
-                (uri (pypi-uri "coverage" version))
-                (sha256
-                 (base32
-                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
-           python-requests))
-    (home-page "https://github.com/codeclimate/python-test-reporter")
-    (synopsis "Reports test coverage to Code Climate")
-    (description "This package provides @{codclimate-test-reporter}, a Python
-library teport test coverage to Code Climate.")
-    (license license:expat)))
-
 (define-public python-codacy-coverage
   (package
     (name "python-codacy-coverage")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7ed6de5a2b..eac19ca1a5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
-;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019-2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
@@ -26530,6 +26530,43 @@ (define-public python-flufl-lock
     (license (list license:asl2.0
                    license:lgpl3))))    ; only for setup_helpers.py
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (native-inputs
+     (list git-minimal/fixed
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list (package
+             (inherit python-coverage)
+             (version "4.3.4")
+             (source
+              (origin
+                (method url-fetch)
+                (uri (pypi-uri "coverage" version))
+                (sha256
+                 (base32
+                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-flufl-testing
   (package
     (name "python-flufl-testing")
-- 
2.34.0

[bug#53019] [PATCH 3/9] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c66ec4722f..450ada0cf2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1825,6 +1826,18 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python2-coverage
   (package-with-python2 python-coverage))
 
-- 
2.34.0

[bug#53019] [PATCH 4/9] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 450ada0cf2..e29f9ce02b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1907,19 +1907,27 @@ (define-public python2-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "codecov" version))
         (sha256
          (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+          "1haipizcyr6wnqavrfxwzhvjvqcfxy6r745gjnl6shi5a2xldnm0"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; 3 failed, 47 passed, 21 skipped, 1 warning
+      #:tests? #f))
     (native-inputs
-     (list python-unittest2))
+     (list python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.34.0

[bug#53019] [PATCH 5/9] gnu: Add python-pytest-cov-3.0.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-pytest-cov-3.0): New variable.
---
 gnu/packages/check.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e29f9ce02b..ea2d323dd2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1179,6 +1179,17 @@ (define-public python-pytest-cov
 supports coverage of subprocesses.")
   (license license:expat)))
 
+(define-public python-pytest-cov-3.0
+  (package
+    (inherit python-pytest-cov)
+    (version "3.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pytest-cov" version))
+        (sha256
+         (base32 "0w6lfv8gc1lxmnvsz7mq5z9shxac5zz6s9mwrai108kxc6qzbw77"))))))
+
 (define-public python2-pytest-cov
   (package-with-python2 python-pytest-cov))
 
-- 
2.34.0

[bug#53019] [PATCH 6/9] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eac19ca1a5..6ee087be42 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3578,6 +3578,37 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codeclimate-test-reporter
+           python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov-3.0
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.34.0

[bug#53019] [PATCH 7/9] gnu: python-pypika-tortoise: Update to 0.1.3.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-pypika-tortoise): Update to 0.1.3.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 8e9431016f..bb0c9712b1 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2877,13 +2877,13 @@ (define-public python2-peewee
 (define-public python-pypika-tortoise
   (package
     (name "python-pypika-tortoise")
-    (version "0.1.1")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pypika-tortoise" version))
        (sha256
-        (base32 "0g4z0lz739nk04b405ynqpd3y1z5nfyxjz9hqgxcw3jydsjx0cb8"))))
+        (base32 "066jb88f3hk42sks69gv6w7k5irf6r0ssbly1n41a3pb19p2vpzc"))))
     (build-system python-build-system)
     (home-page "https://github.com/tortoise/pypika-tortoise")
     (synopsis "Pypika fork for tortoise-orm")
-- 
2.34.0

[bug#53019] [PATCH 8/9] gnu: python-tortoise-orm: Update to 0.18.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-tortoise-orm): Update to 0.18.1,
[home-page]: Use new official home-page.
---
 gnu/packages/databases.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index bb0c9712b1..e9467a3e79 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2984,16 +2984,16 @@ (define-public python-aiomysql
 (define-public python-tortoise-orm
   (package
     (name "python-tortoise-orm")
-    (version "0.17.8")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tortoise-orm" version))
        (sha256
-        (base32 "1gzgiypln7lck3p95vk3i8rdx1bjbmmlcpb8xpba8cjdjvlj0l0z"))))
+        (base32 "1c8xq3620z04i1yp8n6bfshi98qkjjydkbs3zld78a885p762wsk"))))
     (build-system python-build-system)
-    ;; The test suite relies on asynctest, which is abandoned and doesn't
-    ;; support Python >= 3.8.
+    ;; The test suite relies on starlette, qart and some other unpackaged
+    ;; optional dependencies.
     (arguments '(#:tests? #f))
     (propagated-inputs
      (list python-aiomysql
@@ -3006,7 +3006,7 @@ (define-public python-tortoise-orm
            python-pytz
            python-rapidjson
            python-uvloop))
-    (home-page "https://github.com/tortoise/tortoise-orm")
+    (home-page "https://tortoise.github.io")
     (synopsis "Asynchronous Object Relational Mapper (ORM) for Python")
     (description "Tortoise ORM is an easy-to-use asyncio ORM (Object
 Relational Mapper) inspired by Django.  Tortoise ORM was built with relations
-- 
2.34.0

[bug#53019] [PATCH 9/9] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index e9467a3e79..b3e333bc21 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -118,6 +119,7 @@ (define-module (gnu packages databases)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages parallel)
   #:use-module (gnu packages pcre)
@@ -3015,6 +3017,65 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1bhx37svdln1aramddnpc8572bf81639h6jiyqvskzjkc1lvv60r"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; FIXME: This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.34.0

[bug#53019] Apologies for the noise

[paul via Guix-patches via]

I apologize for the noise, of course I sent a branch that was not 
rebased. I'm sending the correct patchset.

Thank you for your patience,

Giacomo

[bug#53019] [PATCH 1/8] gnu: Add python-codeclimate-test-reporter.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
---
 gnu/packages/python-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7ed6de5a2b..eac19ca1a5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
-;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019-2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
@@ -26530,6 +26530,43 @@ (define-public python-flufl-lock
     (license (list license:asl2.0
                    license:lgpl3))))    ; only for setup_helpers.py
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (native-inputs
+     (list git-minimal/fixed
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list (package
+             (inherit python-coverage)
+             (version "4.3.4")
+             (source
+              (origin
+                (method url-fetch)
+                (uri (pypi-uri "coverage" version))
+                (sha256
+                 (base32
+                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-flufl-testing
   (package
     (name "python-flufl-testing")

base-commit: f8aa76ab1fd3b4c9c87d2e68a811477adc844217
-- 
2.34.0

[bug#53019] [PATCH 2/8] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c66ec4722f..450ada0cf2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1825,6 +1826,18 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python2-coverage
   (package-with-python2 python-coverage))
 
-- 
2.34.0

[bug#53019] [PATCH 3/8] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 450ada0cf2..e29f9ce02b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1907,19 +1907,27 @@ (define-public python2-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "codecov" version))
         (sha256
          (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+          "1haipizcyr6wnqavrfxwzhvjvqcfxy6r745gjnl6shi5a2xldnm0"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; 3 failed, 47 passed, 21 skipped, 1 warning
+      #:tests? #f))
     (native-inputs
-     (list python-unittest2))
+     (list python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.34.0

[bug#53019] [PATCH 4/8] gnu: Add python-pytest-cov-3.0.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-pytest-cov-3.0): New variable.
---
 gnu/packages/check.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e29f9ce02b..ea2d323dd2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1179,6 +1179,17 @@ (define-public python-pytest-cov
 supports coverage of subprocesses.")
   (license license:expat)))
 
+(define-public python-pytest-cov-3.0
+  (package
+    (inherit python-pytest-cov)
+    (version "3.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pytest-cov" version))
+        (sha256
+         (base32 "0w6lfv8gc1lxmnvsz7mq5z9shxac5zz6s9mwrai108kxc6qzbw77"))))))
+
 (define-public python2-pytest-cov
   (package-with-python2 python-pytest-cov))
 
-- 
2.34.0

[bug#53019] [PATCH 5/8] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eac19ca1a5..6ee087be42 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3578,6 +3578,37 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codeclimate-test-reporter
+           python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov-3.0
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.34.0

[bug#53019] [PATCH 6/8] gnu: python-pypika-tortoise: Update to 0.1.3.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-pypika-tortoise): Update to 0.1.3.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 8e9431016f..bb0c9712b1 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2877,13 +2877,13 @@ (define-public python2-peewee
 (define-public python-pypika-tortoise
   (package
     (name "python-pypika-tortoise")
-    (version "0.1.1")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pypika-tortoise" version))
        (sha256
-        (base32 "0g4z0lz739nk04b405ynqpd3y1z5nfyxjz9hqgxcw3jydsjx0cb8"))))
+        (base32 "066jb88f3hk42sks69gv6w7k5irf6r0ssbly1n41a3pb19p2vpzc"))))
     (build-system python-build-system)
     (home-page "https://github.com/tortoise/pypika-tortoise")
     (synopsis "Pypika fork for tortoise-orm")
-- 
2.34.0

[bug#53019] [PATCH 7/8] gnu: python-tortoise-orm: Update to 0.18.1.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-tortoise-orm): Update to 0.18.1,
[home-page]: Use new official home-page.
---
 gnu/packages/databases.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index bb0c9712b1..e9467a3e79 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2984,16 +2984,16 @@ (define-public python-aiomysql
 (define-public python-tortoise-orm
   (package
     (name "python-tortoise-orm")
-    (version "0.17.8")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tortoise-orm" version))
        (sha256
-        (base32 "1gzgiypln7lck3p95vk3i8rdx1bjbmmlcpb8xpba8cjdjvlj0l0z"))))
+        (base32 "1c8xq3620z04i1yp8n6bfshi98qkjjydkbs3zld78a885p762wsk"))))
     (build-system python-build-system)
-    ;; The test suite relies on asynctest, which is abandoned and doesn't
-    ;; support Python >= 3.8.
+    ;; The test suite relies on starlette, qart and some other unpackaged
+    ;; optional dependencies.
     (arguments '(#:tests? #f))
     (propagated-inputs
      (list python-aiomysql
@@ -3006,7 +3006,7 @@ (define-public python-tortoise-orm
            python-pytz
            python-rapidjson
            python-uvloop))
-    (home-page "https://github.com/tortoise/tortoise-orm")
+    (home-page "https://tortoise.github.io")
     (synopsis "Asynchronous Object Relational Mapper (ORM) for Python")
     (description "Tortoise ORM is an easy-to-use asyncio ORM (Object
 Relational Mapper) inspired by Django.  Tortoise ORM was built with relations
-- 
2.34.0

[bug#53019] [PATCH 8/8] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index e9467a3e79..b3e333bc21 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -118,6 +119,7 @@ (define-module (gnu packages databases)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages parallel)
   #:use-module (gnu packages pcre)
@@ -3015,6 +3017,65 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1bhx37svdln1aramddnpc8572bf81639h6jiyqvskzjkc1lvv60r"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; FIXME: This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.34.0

[bug#53019] (no subject)

[goodoldpaul--- via Guix-patches via]

Dear all, this is a friendly ping :)

Thank you for your time and effort

[bug#53019] [PATCHES] Add aerich

[goodoldpaul--- via Guix-patches via]

Dear all,
this is a friendly ping :). I'm attaching an update patchset.

Thank you for your time and effort,

giacomo

[bug#53019] [PATCH 1/6] gnu: Add python-codeclimate-test-reporter.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
---
 gnu/packages/python-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1d43049776..23195bf86b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
-;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019-2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
@@ -26275,6 +26275,43 @@ (define-public python-flufl-lock
     (license (list license:asl2.0
                    license:lgpl3))))    ; only for setup_helpers.py
 
+(define-public python-codeclimate-test-reporter
+  (package
+    (name "python-codeclimate-test-reporter")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)               ;no tests in pypi archive
+       (uri (git-reference
+             (url "https://github.com/codeclimate/python-test-reporter")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
+    (build-system python-build-system)
+    (native-inputs
+     (list git-minimal/fixed
+           python-httpretty
+           python-pytest))
+    (propagated-inputs
+     (list (package
+             (inherit python-coverage)
+             (version "4.3.4")
+             (source
+              (origin
+                (method url-fetch)
+                (uri (pypi-uri "coverage" version))
+                (sha256
+                 (base32
+                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
+           python-requests))
+    (home-page "https://github.com/codeclimate/python-test-reporter")
+    (synopsis "Reports test coverage to Code Climate")
+    (description "This package provides @{codclimate-test-reporter}, a Python
+library teport test coverage to Code Climate.")
+    (license license:expat)))
+
 (define-public python-flufl-testing
   (package
     (name "python-flufl-testing")

base-commit: aba1ee5553099d45eb22d9ca1f685502146a49d0
-- 
2.36.1

[bug#53019] [PATCH 2/6] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6ad2b1acd8..f2871690a5 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1745,6 +1746,18 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python-pytest-asyncio
   (package
     (name "python-pytest-asyncio")
-- 
2.36.1

[bug#53019] [PATCH 2/6] gnu: Add python-coverage-5.5

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1389 bytes --]


On 01-07-2022 23:32, Giacomo Leidi via Guix-patches via wrote:
> * gnu/packages/check.scm (python-coverage-5.5): New variable.
> ---
>   gnu/packages/check.scm | 13 +++++++++++++
>   1 file changed, 13 insertions(+)
>
> diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
> index 6ad2b1acd8..f2871690a5 100644
> --- a/gnu/packages/check.scm
> +++ b/gnu/packages/check.scm
> @@ -38,6 +38,7 @@
>   ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
>   ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
>   ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
> +;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
>   ;;;
>   ;;; This file is part of GNU Guix.
>   ;;;
> @@ -1745,6 +1746,18 @@ (define-public python-coverage
>   executed.")
>       (license license:bsd-3)))
>   
> +(define-public python-coverage-5.5
> +  (package
> +    (inherit python-coverage)
> +    (version "5.5")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "coverage" version))
> +       (sha256
> +        (base32
> +         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
> +

Why not update the already-existing python-coverage package? Then all 
users of that package would benefit and propagation conflicts would be 
avoided.

Greetings,
Maxime.


[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#53019] [PATCH 3/6] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f2871690a5..58af53388e 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1821,19 +1821,27 @@ (define-public python-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "codecov" version))
         (sha256
          (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+          "1haipizcyr6wnqavrfxwzhvjvqcfxy6r745gjnl6shi5a2xldnm0"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      ;; 3 failed, 47 passed, 21 skipped, 1 warning
+      #:tests? #f))
     (native-inputs
-     (list python-unittest2))
+     (list python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.36.1

[bug#53019] [PATCH 3/6] gnu: python-codecov: Update to 2.1.12.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 768 bytes --]


On 01-07-2022 23:32, Giacomo Leidi via Guix-patches via wrote:
> +    (arguments
> +     (list
> +      ;; 3 failed, 47 passed, 21 skipped, 1 warning
> +      #:tests? #f))

By disabling tests when they detect problems, we defeat the point of 
having tests. A 'failing' test is a good test, as it detected a problem 
(hopefully not a false positive ...) before the buggy result is actually 
used for real.

It's like, say, firing a building inspector because they noticed that 
the building would fall over in case of some wind from an unanticipated 
direction, instead of making the building more sturdy, changing the 
building plan or not proceeding with actually building the building.

What problems did the tests detect?

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#53019] [PATCH 3/6] gnu: python-codecov: Update to 2.1.12.

[goodoldpaul--- via Guix-patches via]

Dear Maxime,
On 2022-07-30 21:02, Maxime Devos wrote:
> On 01-07-2022 23:32, Giacomo Leidi via Guix-patches via wrote:
>> +    (arguments
>> +     (list
>> +      ;; 3 failed, 47 passed, 21 skipped, 1 warning
>> +      #:tests? #f))
> 
> By disabling tests when they detect problems, we defeat the point of
> having tests. A 'failing' test is a good test, as it detected a
> problem (hopefully not a false positive ...) before the buggy result
> is actually used for real.
> 
> It's like, say, firing a building inspector because they noticed that
> the building would fall over in case of some wind from an
> unanticipated direction, instead of making the building more sturdy,
> changing the building plan or not proceeding with actually building
> the building.
> 
> What problems did the tests detect?
Some tests depend on network access, I now identified and disabled them.

Thank you,

giacomo

[bug#53019] [PATCH 4/6] gnu: Add python-pytest-cov-3.0.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-pytest-cov-3.0): New variable.
---
 gnu/packages/check.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 58af53388e..51fa2d2282 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1089,6 +1089,17 @@ (define-public python-pytest-cov
 supports coverage of subprocesses.")
   (license license:expat)))
 
+(define-public python-pytest-cov-3.0
+  (package
+    (inherit python-pytest-cov)
+    (version "3.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pytest-cov" version))
+        (sha256
+         (base32 "0w6lfv8gc1lxmnvsz7mq5z9shxac5zz6s9mwrai108kxc6qzbw77"))))))
+
 (define-public python-pytest-httpserver
   (package
     (name "python-pytest-httpserver")
-- 
2.36.1

[bug#53019] [PATCH 4/6] gnu: Add python-pytest-cov-3.0.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 222 bytes --]


On 01-07-2022 23:33, Giacomo Leidi via Guix-patches via wrote:
> +(define-public python-pytest-cov-3.0
> +  (package
> +    (inherit python-pytest-cov)
Likewise as for python-coverage-5.5, why the separate package?

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#53019] [PATCH 4/6] gnu: Add python-pytest-cov-3.0.

[goodoldpaul--- via Guix-patches via]

Dear Maxime,
> Likewise as for python-coverage-5.5, why the separate package?
Both python-pytest-cov and python-coverage have a lot of dependents, 
they must be updated on staging...

$ guix refresh --list-dependent python-pytest-cov
Building the following 521 packages would ensure 1172 dependent packages 
are rebuilt: python-pysox [...]

$ guix refresh --list-dependent python-coverage
Building the following 627 packages would ensure 1408 dependent packages 
are rebuilt: u-boot-puma-rk3399 [...]\

I sent a patch for python-pytest-cov back in march, 
(https://git.savannah.gnu.org/cgit/guix.git/commit/?h=staging&id=12c9da35389dfba86ae0d863132a6b2c4374205a) 
but I didn't manage to find the time to do it also for python-coverage.

Thank you,

Giacomo

[bug#53019] [PATCH 4/6] gnu: Add python-pytest-cov-3.0.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 1183 bytes --]


On 31-07-2022 00:52, goodoldpaul@autistici.org wrote:
> Dear Maxime,
>> Likewise as for python-coverage-5.5, why the separate package?
> Both python-pytest-cov and python-coverage have a lot of dependents, 
> they must be updated on staging...

Then you can mention that in the commit message, or better, ask for 
someone to merge staging (it's not core-updates) into master ...

>
> $ guix refresh --list-dependent python-pytest-cov
> Building the following 521 packages would ensure 1172 dependent 
> packages are rebuilt: python-pysox [...]
>
> $ guix refresh --list-dependent python-coverage
> Building the following 627 packages would ensure 1408 dependent 
> packages are rebuilt: u-boot-puma-rk3399 [...]\
>
> I sent a patch for python-pytest-cov back in march, 
> (https://git.savannah.gnu.org/cgit/guix.git/commit/?h=staging&id=12c9da35389dfba86ae0d863132a6b2c4374205a) 


... mentioning this in the commit message would avoid having the 
reviewer doing some pointless checking whether the new version doesn't 
contain malware, whether it builds reproducibly, etc, as it was 
presumably already done for the staging patch.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#53019] [PATCH 4/6] gnu: Add python-pytest-cov-3.0.

[goodoldpaul--- via Guix-patches via]

Dear Maxime,
On 2022-07-30 23:13, Maxime Devos wrote:
> ... mentioning this in the commit message would avoid having the
> reviewer doing some pointless checking whether the new version doesn't
> contain malware, whether it builds reproducibly, etc, as it was
> presumably already done for the staging patch.

I sent a patch to staging ( https://issues.guix.gnu.org/58421 ) and I 
should have addressed all your comments. I'm sending an updated patch 
set.

Thank you for your time,

giacomo

[bug#53019] [PATCH 5/6] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 23195bf86b..71c56d997f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3469,6 +3469,37 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codeclimate-test-reporter
+           python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov-3.0
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.36.1

[bug#53019] [PATCH 6/6] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 63 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9e9b584f7a..b125e87245 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -56,7 +56,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
-;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -121,6 +121,7 @@ (define-module (gnu packages databases)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages parallel)
   #:use-module (gnu packages pcre)
@@ -3002,6 +3003,66 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.6.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1ndkl8vvn6bxh19s26k3p5mlk1sk4ziw73c07av08va6cfp5ln0j"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; FIXME: This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pydantic
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.36.1

[bug#53019] [PATCH 1/6] gnu: Add python-codeclimate-test-reporter.

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 3201 bytes --]


On 01-07-2022 23:32, Giacomo Leidi via Guix-patches via wrote:
> * gnu/packages/python-xyz.scm (python-codeclimate-test-reporter): New variable.
> ---
>   gnu/packages/python-xyz.scm | 39 ++++++++++++++++++++++++++++++++++++-
>   1 file changed, 38 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 1d43049776..23195bf86b 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -63,7 +63,7 @@
>   ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
>   ;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois <pierre.langlois@gmx.com>
>   ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
> -;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
> +;;; Copyright © 2019-2022 Giacomo Leidi <goodoldpaul@autistici.org>
>   ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
>   ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org>
>   ;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
> @@ -26275,6 +26275,43 @@ (define-public python-flufl-lock
>       (license (list license:asl2.0
>                      license:lgpl3))))    ; only for setup_helpers.py
>   
> +(define-public python-codeclimate-test-reporter

The README in the Git repository says it's deprecated, do we need it?

> +  (package
> +    (name "python-codeclimate-test-reporter")
> +    (version "0.2.3")
> +    (source
> +     (origin
> +       (method git-fetch)               ;no tests in pypi archive
> +       (uri (git-reference
> +             (url "https://github.com/codeclimate/python-test-reporter")
> +             (commit (string-append "v" version))))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> +         "0mxph5l3k9ch4hs9l76k4wnmzhd94bylg92lvm2priyn24gkn9a1"))))
> +    (build-system python-build-system)
> +    (native-inputs
> +     (list git-minimal/fixed
> +           python-httpretty
> +           python-pytest))
> +    (propagated-inputs
> +     (list (package
> +             (inherit python-coverage)
> +             (version "4.3.4")
> +             (source
> +              (origin
> +                (method url-fetch)
> +                (uri (pypi-uri "coverage" version))
> +                (sha256
> +                 (base32
> +                  "1prkwz1hkcbx19nsadbcmk4wl27ysx001pa8bykfagd3d87zxbpa")))))
> +           python-requests))
> +    (home-page "https://github.com/codeclimate/python-test-reporter")
> +    (synopsis "Reports test coverage to Code Climate")
> +    (description "This package provides @{codclimate-test-reporter}, a Python
> +library teport test coverage to Code Climate.")
> +    (license license:expat)))

Typo: teport -> report, would also be nice to state more explicitly it 
uploads information to some website.

The service it communicates to (Code Climate) also doesn't appear to be 
free software, this isn't an automatic rejection (see, e.g., 
Facebook-related packages) but it's still rather "eergh, do we really 
have to?".

Greetings,
Maxime

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#53019] [PATCH 1/6] gnu: Add python-codeclimate-test-reporter.

[goodoldpaul--- via Guix-patches via]

Dear Maxime,
On 2022-07-30 21:09, Maxime Devos wrote:
> 
> Typo: teport -> report, would also be nice to state more explicitly it
> uploads information to some website.
> 
> The service it communicates to (Code Climate) also doesn't appear to
> be free software, this isn't an automatic rejection (see, e.g.,
> Facebook-related packages) but it's still rather "eergh, do we really
> have to?".
It turns out we don't :) I removed the package.

Thank you,

giacomo

[bug#53019] [PATCH 1/4] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

This has been also sent to staging in https://issues.guix.gnu.org/58421.

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 797fe71277..2758262862 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1763,6 +1764,19 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+;; TODO: This can be removed after staging is merged.
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python-pytest-asyncio
   (package
     (name "python-pytest-asyncio")

base-commit: dbb35cd2e8a9e1d9d2f6a4425d68b0631466ff29
-- 
2.37.3

[bug#53019] [PATCH 2/4] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 46 +++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 2758262862..10e11e1e36 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python-science)
   #:use-module (gnu packages time)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages xml)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
@@ -1840,19 +1841,46 @@ (define-public python-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "codecov" version))
-        (sha256
-         (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/codecov/codecov-python")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"))))
     (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                   (when tests?
+                     (setenv "CI" "True")
+                     (setenv "APPVEYOR" "True")
+                     (invoke (string-append #$python-pytest "/bin/py.test")
+                             "tests/test.py" "-vv"
+                             "--cov=codecov" "-k"
+                             (string-append
+                              ;; These tests require network access.
+                              "not test_bowerrc and "
+                              "not test_none_found and "
+                              "not test_run_coverage_fails and "
+                              "not test_disable_search"))))))))
     (native-inputs
-     (list python-unittest2))
+     (list git-minimal
+           mercurial
+           python-coverage-5.5
+           python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.37.3

[bug#53019] [PATCH 3/4] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 60870f5447..63413a1e71 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3597,6 +3597,36 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov-3.0
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.37.3

[bug#53019] [PATCH 4/4] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index cf07832df7..9bc103f389 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -58,6 +58,7 @@
 ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3035,6 +3036,66 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.6.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1ndkl8vvn6bxh19s26k3p5mlk1sk4ziw73c07av08va6cfp5ln0j"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pydantic
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.37.3

[bug#53019] [PATCHES] Add aerich

[goodoldpaul--- via Guix-patches via]

Dear Guixers,
this is a friendly ping :)

I'm sending an updated patchset.

Thank you for your time and efforts,

giacomo

[bug#53019] [PATCHv2 1/4] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

This has been also sent to staging in https://issues.guix.gnu.org/58421.

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index aaa41777dc..d042f60207 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -41,6 +41,7 @@
 ;;; Copyright © 2022 David Elsing <david.elsing@posteo.net>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2017,6 +2018,19 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+;; TODO: This can be removed after staging is merged.
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python-pytest-asyncio
   (package
     (name "python-pytest-asyncio")

base-commit: ddebb5c5634fcfbec9571453f2db72b238d73e75
-- 
2.38.1

[bug#53019] [PATCHv2 2/4] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 46 +++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index d042f60207..31c46cc8a0 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -80,6 +80,7 @@ (define-module (gnu packages check)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages python-science)
   #:use-module (gnu packages time)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages xml)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
@@ -2094,19 +2095,46 @@ (define-public python-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "codecov" version))
-        (sha256
-         (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/codecov/codecov-python")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"))))
     (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                   (when tests?
+                     (setenv "CI" "True")
+                     (setenv "APPVEYOR" "True")
+                     (invoke (string-append #$python-pytest "/bin/py.test")
+                             "tests/test.py" "-vv"
+                             "--cov=codecov" "-k"
+                             (string-append
+                              ;; These tests require network access.
+                              "not test_bowerrc and "
+                              "not test_none_found and "
+                              "not test_run_coverage_fails and "
+                              "not test_disable_search"))))))))
     (native-inputs
-     (list python-unittest2))
+     (list git-minimal
+           mercurial
+           python-coverage-5.5
+           python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.38.1

[bug#53019] [PATCHv2 3/4] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d0b54443af..dae72728a1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3897,6 +3897,36 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.38.1

[bug#53019] [PATCHv2 4/4] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 2a24ba580d..18b0c809f4 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -59,6 +59,7 @@
 ;;; Copyright © 2022 muradm <mail@muradm.net>
 ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
 ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2022 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3057,6 +3058,66 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0zk99c979xn5ym7v1g3v1y4h3cj7kdc7v1hf9f5h011mfs12s3df"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pydantic
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.38.1

[bug#53019] [PATCHv3 1/4] gnu: Add python-coverage-5.5

[Giacomo Leidi via Guix-patches via]

This has been also sent to staging in https://issues.guix.gnu.org/58421.

* gnu/packages/check.scm (python-coverage-5.5): New variable.
---
 gnu/packages/check.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b54ca4f55f..b9e6c69952 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -43,6 +43,7 @@
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
 ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2079,6 +2080,19 @@ (define-public python-coverage
 executed.")
     (license license:bsd-3)))
 
+;; TODO: This can be removed after staging is merged.
+(define-public python-coverage-5.5
+  (package
+    (inherit python-coverage)
+    (version "5.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))))
+
 (define-public python-pytest-asyncio
   (package
     (name "python-pytest-asyncio")

base-commit: dd3e5e71104a2bcbad80e52e062a144ea96b8c6a
-- 
2.39.2

[bug#53019] [PATCHv3 2/4] gnu: python-codecov: Update to 2.1.12.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/check.scm (python-codecov): Update to 2.1.12.
---
 gnu/packages/check.scm | 46 +++++++++++++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b9e6c69952..30b87a4905 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -85,6 +85,7 @@ (define-module (gnu packages check)
   #:use-module (gnu packages python-science)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages time)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages xml)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
@@ -2156,19 +2157,46 @@ (define-public python-cov-core
 (define-public python-codecov
   (package
     (name "python-codecov")
-    (version "2.0.15")
+    (version "2.1.12")
     (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "codecov" version))
-        (sha256
-         (base32
-          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/codecov/codecov-python")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"))))
     (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                   (when tests?
+                     (setenv "CI" "True")
+                     (setenv "APPVEYOR" "True")
+                     (invoke (string-append #$python-pytest "/bin/py.test")
+                             "tests/test.py" "-vv"
+                             "--cov=codecov" "-k"
+                             (string-append
+                              ;; These tests require network access.
+                              "not test_bowerrc and "
+                              "not test_none_found and "
+                              "not test_run_coverage_fails and "
+                              "not test_disable_search"))))))))
     (native-inputs
-     (list python-unittest2))
+     (list git-minimal
+           mercurial
+           python-coverage-5.5
+           python-ddt
+           python-mock
+           python-pytest
+           python-pytest-cov
+           python-requests))
     (propagated-inputs
-     (list python-coverage python-requests))
+     (list python-coverage-5.5 python-requests))
     (home-page "https://github.com/codecov/codecov-python")
     (synopsis "Upload code coverage reports to @code{codecov.io}")
     (description
-- 
2.39.2

[bug#53019] [PATCHv3 3/4] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 06eae3d62d..b1c3da83ef 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4071,6 +4071,36 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "ddlparse" version))
+        (sha256
+          (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest")))))))
+    (native-inputs
+     (list python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-- 
2.39.2

[bug#53019] [PATCHv3 4/4] gnu: Add python-aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (python-aerich): New variable.
---
 gnu/packages/databases.scm | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 5f1fbb87a2..3c3c0c51f1 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -60,6 +60,7 @@
 ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org>
 ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2023 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3122,6 +3123,66 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0zk99c979xn5ym7v1g3v1y4h3cj7kdc7v1hf9f5h011mfs12s3df"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'generate-setup.py
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; This is an hack needed to get poetry's setup.py.
+             (setenv "POETRY_VIRTUALENVS_CREATE" "false")
+             (invoke "poetry" "build" "-f" "sdist")
+             (invoke "bash" "-c"
+                     (string-append "tar --wildcards "
+                                    "-xvf dist/*-`poetry version -s`.tar.gz "
+                                    "-O '*/setup.py' > setup.py"))))
+         (replace 'check
+           (lambda* (#:key tests? outputs #:allow-other-keys)
+             (when tests?
+               (let ((out (assoc-ref outputs "out")))
+                 (invoke "pytest" "-vv"))))))))
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pydantic
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+      (list python-asyncmy
+            python-asyncpg
+            python-click
+            python-ddlparse
+            python-dictdiffer
+            python-tomlkit
+            python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+      "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.39.2

[bug#53019] [53019]: Add aerich - Rebase on current master

[paul via Guix-patches via]

Hi,

I'm sending an updated patchset.


Thank you for your time,


giacomo

[bug#53019] [PATCH v4 1/2] gnu: Add python-ddlparse.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/python-xyz.scm (python-ddlparse): New variable.
---
 gnu/packages/python-xyz.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fad5d66af9..fd199535c8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -63,7 +63,7 @@
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
-;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2019-2021, 2023 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz>
 ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2019, 2021-2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
@@ -4881,6 +4881,30 @@ (define-public python-jsondiff
 compare, diff, and patch JSON and JSON-like structures in Python.")
    (license license:expat)))
 
+(define-public python-ddlparse
+  (package
+    (name "python-ddlparse")
+    (version "1.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ddlparse" version))
+       (sha256
+        (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list python-codecov
+           python-coveralls
+           python-pytest
+           python-pytest-cov
+           python-tox))
+    (propagated-inputs (list python-pyparsing))
+    (home-page "https://github.com/shinichi-takii/ddlparse")
+    (synopsis "Parses and converts DDL to BigQuery JSON schema")
+    (description "This package provides @{ddlparse}, a Python library to parse
+and convert DDL to BigQuery JSON schema.")
+    (license license:bsd-3)))
+
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")

base-commit: 2b5c6e1a41e4ddcf4cfa53a319ed784a856eac5d
-- 
2.41.0

[bug#53019] [PATCH v4 2/2] gnu: Add aerich.

[Giacomo Leidi via Guix-patches via]

* gnu/packages/databases.scm (aerich): New variable.

Change-Id: I322d619dc80c943d50e28a96ba74d276784ab8da
---
 gnu/packages/databases.scm | 44 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4bc642aa17..3abfa2773f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -61,6 +61,7 @@
 ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne
 ;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com>
+;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3113,6 +3114,49 @@ (define-public python-tortoise-orm
 with relational data.")
     (license license:asl2.0)))
 
+(define-public aerich
+  (package
+    (name "aerich")
+    (version "0.7.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tortoise/aerich")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0pcy945bg890p12s7cyw0mg7hxwsxyy570j600sbf7kwj2d3lilg"))))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list
+      poetry
+      python-bandit
+      python-cryptography
+      python-isort
+      python-pydantic
+      python-pytest
+      python-pytest-asyncio
+      python-pytest-mock
+      python-pytest-xdist))
+    (propagated-inputs
+     (list python-asyncmy
+           python-asyncpg
+           python-click
+           python-ddlparse
+           python-dictdiffer
+           python-tomlkit
+           python-tortoise-orm))
+    (home-page "https://github.com/tortoise/aerich")
+    (synopsis "Database migrations tool for Tortoise ORM (Object Relational
+Mapper)")
+    (description
+     "This package provides @code{aerich}, a Python database migrations tool
+for Tortoise ORM (Object Relational Mapper).  It can be used both
+programmatically or as a standalone CLI application.")
+    (license license:asl2.0)))
+
 (define-public sqlcipher
   (package
     (name "sqlcipher")
-- 
2.41.0

[bug#53019] [PATCH v4 2/2] gnu: Add aerich.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 485 bytes --]


Giacomo Leidi via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/databases.scm (aerich): New variable.
>
> Change-Id: I322d619dc80c943d50e28a96ba74d276784ab8da
> ---
>  gnu/packages/databases.scm | 44 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)

This and the previous patch look good to me, I've tweaked a synopsis and
description to use @acronym and pushed this to master as
db5c83e83bb0aa7b65e020ee1d8749e11d5c8f6f.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]