[arch-commits] Commit in postorius/repos/community-testing-any (12 files)

David Runge dvzrv at archlinux.org
Thu Apr 2 09:08:26 UTC 2020


    Date: Thursday, April 2, 2020 @ 09:08:25
  Author: dvzrv
Revision: 609406

archrelease: copy trunk to community-testing-any

Added:
  postorius/repos/community-testing-any/PKGBUILD
    (from rev 609405, postorius/trunk/PKGBUILD)
  postorius/repos/community-testing-any/postorius-1.3.2-settings.patch
    (from rev 609405, postorius/trunk/postorius-1.3.2-settings.patch)
  postorius/repos/community-testing-any/postorius.install
    (from rev 609405, postorius/trunk/postorius.install)
  postorius/repos/community-testing-any/postorius.sysusers
    (from rev 609405, postorius/trunk/postorius.sysusers)
  postorius/repos/community-testing-any/postorius.tmpfiles
    (from rev 609405, postorius/trunk/postorius.tmpfiles)
  postorius/repos/community-testing-any/postorius.uwsgi
    (from rev 609405, postorius/trunk/postorius.uwsgi)
Deleted:
  postorius/repos/community-testing-any/PKGBUILD
  postorius/repos/community-testing-any/postorius-1.3.2-settings.patch
  postorius/repos/community-testing-any/postorius.install
  postorius/repos/community-testing-any/postorius.sysusers
  postorius/repos/community-testing-any/postorius.tmpfiles
  postorius/repos/community-testing-any/postorius.uwsgi

--------------------------------+
 PKGBUILD                       |  175 +++++++++++++++++++--------------------
 postorius-1.3.2-settings.patch |   62 ++++++-------
 postorius.install              |   18 ++--
 postorius.sysusers             |    2 
 postorius.tmpfiles             |   12 +-
 postorius.uwsgi                |   36 ++++----
 6 files changed, 153 insertions(+), 152 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-02 09:08:17 UTC (rev 609405)
+++ PKGBUILD	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1,87 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=postorius
-pkgver=1.3.2
-pkgrel=3
-pkgdesc="The New Mailman Web UI"
-arch=('any')
-url="https://gitlab.com/mailman/postorius"
-license=('GPL3')
-depends=('python-cmarkgfm' 'python-django' 'python-django-mailman3'
-'python-mailmanclient' 'python-readme-renderer')
-makedepends=('python-setuptools')
-checkdepends=('mailman3' 'python-beautifulsoup4' 'python-isort' 'python-mock'
-'python-pytest' 'python-pytest-django' 'python-vcrpy')
-optdepends=('mailman3: for configuring a local mailman instance'
-            'uwsgi-plugin-python: for running inside uwsgi')
-replaces=('python-django-postorius')
-backup=("etc/uwsgi/${pkgname}.ini"
-        "etc/webapps/${pkgname}/settings.py")
-install="${pkgname}.install"
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles"
-        "${pkgname}.uwsgi"
-        "${pkgname}-1.3.2-settings.patch")
-sha512sums=('41ff225fa574dd4bd0ac88419a10a55a71c52a64df01a1a593963fdfa62baf16a0df735364688ea24680c8e88093841892474279d40c1428948375db7eb6333b'
-            'SKIP'
-            '3884b818da2deb148279e50316f720c95f0aaa529777b1b3662d8ab253cda823a90682a9eb47e941ca5ba80eefcb9a2d4afacd29f0340d7f9828b36ebcee23b3'
-            '111747a7b9312bda8d23df6da430858d0bef09876e259ece63cc288a8e7de45be8225f68561d2c5f86cf8160fcef3e37071dde38e43f0a247e4860d05e3381bb'
-            'c042f00d0d8dc72dadd19023152e55246c4d7a4b9d53bca3a05e7b8cb38cac5116417440d4ae82350820c7cb0cd414dcce45fa6af9be19296c4ebd0862dba896'
-            '53713874043e368c71543966e878ff7a49f03088b7ebcff9487935bef2c20a57a561a122dd6b4cbde126c25b935871288dadd7693b831a94b8f27da52afeaa0c')
-validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  # patch global paths into settings.py
-  patch -Np1 -i "../${pkgname}-1.3.2-settings.patch"
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  python setup.py build
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  local python_stdlib_basepath="$(python -c "from sysconfig import get_path; print(get_path('stdlib'))")"
-  # install to temporary location, so that tests can run
-  python setup.py install --root="${PWD}/tmp_install" --optimize=1
-  export PYTHONPATH="${PWD}/tmp_install/${python_stdlib_basepath/\//}/site-packages:${PYTHONPATH}"
-  cd example_project/
-  pytest -v "../tmp_install/${python_stdlib_basepath/\//}/site-packages/${pkgname}"
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --prefix=/usr \
-    --root="${pkgdir}"
-  # django project
-  install -vDm 644 example_project/{__init__,manage,urls,wsgi}.py \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}"
-  # symlink locale and static dirs to state dir
-  ln -svf "/var/lib//${pkgname}/locale/" \
-    "${pkgdir}/usr/share/webapps/${pkgname}"
-  ln -svf "/var/lib/${pkgname}/static/" \
-    "${pkgdir}/usr/share/webapps/${pkgname}"
-  # state dir
-  install -vdm 750 "${pkgdir}/var/lib/${pkgname}/data"
-  install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"{locale,static}
-  # log dir
-  install -vdm 750 "${pkgdir}/var/log/${pkgname}"
-  # config
-  install -vDm 640 example_project/settings.py \
-    -t "${pkgdir}/etc/webapps/${pkgname}"
-  ln -svf "/etc/webapps/${pkgname}/settings.py" \
-    "${pkgdir}/usr/share/webapps/${pkgname}/settings.py"
-  # uwsgi
-  install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini"
-  # tmpfiles.d
-  install -vDm 644 "../${pkgname}.tmpfiles" \
-    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
-  # sysusers.d
-  install -vDm 644 "../${pkgname}.sysusers" \
-    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-}

Copied: postorius/repos/community-testing-any/PKGBUILD (from rev 609405, postorius/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1,88 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=postorius
+pkgver=1.3.2
+pkgrel=4
+pkgdesc="The New Mailman Web UI"
+arch=('any')
+url="https://gitlab.com/mailman/postorius"
+license=('GPL3')
+depends=('python-cmarkgfm' 'python-django' 'python-django-mailman3'
+'python-mailmanclient' 'python-readme-renderer')
+makedepends=('python-setuptools')
+checkdepends=('mailman3' 'python-beautifulsoup4' 'python-isort' 'python-mock'
+'python-pytest' 'python-pytest-django' 'python-vcrpy')
+optdepends=('mailman3: for configuring a local mailman instance'
+            'uwsgi-plugin-python: for running inside uwsgi')
+replaces=('python-django-postorius')
+backup=("etc/uwsgi/${pkgname}.ini"
+        "etc/webapps/${pkgname}/settings_local.py")
+install="${pkgname}.install"
+source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        "${pkgname}.sysusers"
+        "${pkgname}.tmpfiles"
+        "${pkgname}.uwsgi"
+        "${pkgname}-1.3.2-settings.patch")
+sha512sums=('41ff225fa574dd4bd0ac88419a10a55a71c52a64df01a1a593963fdfa62baf16a0df735364688ea24680c8e88093841892474279d40c1428948375db7eb6333b'
+            'SKIP'
+            '3884b818da2deb148279e50316f720c95f0aaa529777b1b3662d8ab253cda823a90682a9eb47e941ca5ba80eefcb9a2d4afacd29f0340d7f9828b36ebcee23b3'
+            '97cb4c0530a270db1e608f255b0940fbf1779252da74b7df9865adff809f0e644e88e0cbcfa7d7c858877887bc8ae64dddec88734fbc4abb75b6a270be38d2cf'
+            'c042f00d0d8dc72dadd19023152e55246c4d7a4b9d53bca3a05e7b8cb38cac5116417440d4ae82350820c7cb0cd414dcce45fa6af9be19296c4ebd0862dba896'
+            '53713874043e368c71543966e878ff7a49f03088b7ebcff9487935bef2c20a57a561a122dd6b4cbde126c25b935871288dadd7693b831a94b8f27da52afeaa0c')
+validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  # patch global paths into settings.py
+  patch -Np1 -i "../${pkgname}-1.3.2-settings.patch"
+  touch settings_local.py
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  python setup.py build
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  # tests are very broken all of a sudden:
+  # https://gitlab.com/mailman/postorius/-/issues/406
+  cd example_project
+  export PYTHONPATH="../build/lib:${PYTHONPATH}"
+  pytest -k 'not test_accept_held_messages and not test_held_message_count' \
+         -v ../build/lib/${pkgname}
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  python setup.py install --skip-build \
+    --optimize=1 \
+    --prefix=/usr \
+    --root="${pkgdir}"
+  # django project
+  install -vDm 644 example_project/{__init__,manage,settings,urls,wsgi}.py \
+    -t "${pkgdir}/usr/share/webapps/${pkgname}"
+  # symlink locale and static dirs to state dir
+  ln -svf "/var/lib//${pkgname}/locale/" \
+    "${pkgdir}/usr/share/webapps/${pkgname}"
+  ln -svf "/var/lib/${pkgname}/static/" \
+    "${pkgdir}/usr/share/webapps/${pkgname}"
+  # state dir
+  install -vdm 750 "${pkgdir}/var/lib/${pkgname}/data"
+  install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"{locale,static}
+  # log dir
+  install -vdm 750 "${pkgdir}/var/log/${pkgname}"
+  # config
+  install -vDm 640 settings_local.py \
+    -t "${pkgdir}/etc/webapps/${pkgname}"
+  ln -svf "/etc/webapps/${pkgname}/settings_local.py" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/settings_local.py"
+  # uwsgi
+  install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini"
+  # tmpfiles.d
+  install -vDm 644 "../${pkgname}.tmpfiles" \
+    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  # sysusers.d
+  install -vDm 644 "../${pkgname}.sysusers" \
+    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+}

Deleted: postorius-1.3.2-settings.patch
===================================================================
--- postorius-1.3.2-settings.patch	2020-04-02 09:08:17 UTC (rev 609405)
+++ postorius-1.3.2-settings.patch	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1,31 +0,0 @@
-diff --git c/example_project/settings.py w/example_project/settings.py
-index c54af7e..d05535b 100644
---- c/example_project/settings.py
-+++ w/example_project/settings.py
-@@ -136,7 +136,7 @@ WSGI_APPLICATION = 'wsgi.application'
- DATABASES = {
-     'default': {
-         'ENGINE': 'django.db.backends.sqlite3',
--        'NAME': os.path.join(BASE_DIR, 'postorius.db'),
-+        'NAME': '/var/lib/postorius/data/postorius.db',
-     }
- }
- 
-@@ -180,7 +180,7 @@ USE_TZ = True
- # Don't put anything in this directory yourself; store your static files
- # in apps' "static/" subdirectories and in STATICFILES_DIRS.
- # Example: "/var/www/example.com/static/"
--STATIC_ROOT = os.path.join(BASE_DIR, 'static')
-+STATIC_ROOT = '/var/lib/postorius/static'
- 
- # URL prefix for static files.
- # Example: "http://example.com/static/", "http://static.example.com/"
-@@ -259,7 +259,7 @@ LOGGING = {
-             'level': 'INFO',
-             #'class': 'logging.handlers.RotatingFileHandler',
-             'class': 'logging.handlers.WatchedFileHandler',
--            'filename': os.path.join(BASE_DIR, 'logs', 'postorius.log'),
-+            'filename': '/var/log/postorius/postorius.log',
-             'formatter': 'verbose',
-         },
-     },

Copied: postorius/repos/community-testing-any/postorius-1.3.2-settings.patch (from rev 609405, postorius/trunk/postorius-1.3.2-settings.patch)
===================================================================
--- postorius-1.3.2-settings.patch	                        (rev 0)
+++ postorius-1.3.2-settings.patch	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1,31 @@
+diff --git c/example_project/settings.py w/example_project/settings.py
+index c54af7e..d05535b 100644
+--- c/example_project/settings.py
++++ w/example_project/settings.py
+@@ -136,7 +136,7 @@ WSGI_APPLICATION = 'wsgi.application'
+ DATABASES = {
+     'default': {
+         'ENGINE': 'django.db.backends.sqlite3',
+-        'NAME': os.path.join(BASE_DIR, 'postorius.db'),
++        'NAME': '/var/lib/postorius/data/postorius.db',
+     }
+ }
+ 
+@@ -180,7 +180,7 @@ USE_TZ = True
+ # Don't put anything in this directory yourself; store your static files
+ # in apps' "static/" subdirectories and in STATICFILES_DIRS.
+ # Example: "/var/www/example.com/static/"
+-STATIC_ROOT = os.path.join(BASE_DIR, 'static')
++STATIC_ROOT = '/var/lib/postorius/static'
+ 
+ # URL prefix for static files.
+ # Example: "http://example.com/static/", "http://static.example.com/"
+@@ -259,7 +259,7 @@ LOGGING = {
+             'level': 'INFO',
+             #'class': 'logging.handlers.RotatingFileHandler',
+             'class': 'logging.handlers.WatchedFileHandler',
+-            'filename': os.path.join(BASE_DIR, 'logs', 'postorius.log'),
++            'filename': '/var/log/postorius/postorius.log',
+             'formatter': 'verbose',
+         },
+     },

Deleted: postorius.install
===================================================================
--- postorius.install	2020-04-02 09:08:17 UTC (rev 609405)
+++ postorius.install	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1,9 +0,0 @@
-post_install() {
-  echo "Run the following to create/migrate the database:"
-  echo "sudo -u postorius django-admin migrate --pythonpath /usr/share/webapps/postorius/ --settings settings"
-}
-
-post_upgrade() {
-  echo "Run the following to update static files and compress them:"
-  echo "sudo -u postorius django-admin collectstatic --pythonpath /usr/share/webapps/postorius --settings settings"
-}

Copied: postorius/repos/community-testing-any/postorius.install (from rev 609405, postorius/trunk/postorius.install)
===================================================================
--- postorius.install	                        (rev 0)
+++ postorius.install	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1,9 @@
+post_install() {
+  echo "Run the following to create/migrate the database:"
+  echo "sudo -u postorius django-admin migrate --pythonpath /usr/share/webapps/postorius/ --settings settings"
+}
+
+post_upgrade() {
+  echo "Run the following to update static files and compress them:"
+  echo "sudo -u postorius django-admin collectstatic --pythonpath /usr/share/webapps/postorius --settings settings"
+}

Deleted: postorius.sysusers
===================================================================
--- postorius.sysusers	2020-04-02 09:08:17 UTC (rev 609405)
+++ postorius.sysusers	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1 +0,0 @@
-u postorius - "GNU Mailman Web User Interface" -

Copied: postorius/repos/community-testing-any/postorius.sysusers (from rev 609405, postorius/trunk/postorius.sysusers)
===================================================================
--- postorius.sysusers	                        (rev 0)
+++ postorius.sysusers	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1 @@
+u postorius - "GNU Mailman Web User Interface" -

Deleted: postorius.tmpfiles
===================================================================
--- postorius.tmpfiles	2020-04-02 09:08:17 UTC (rev 609405)
+++ postorius.tmpfiles	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1,6 +0,0 @@
-z /etc/webapps/postorius/settings.py 0640 root postorius -
-d %L/postorius 750 postorius postorius -
-d %S/postorius/data 750 postorius postorius -
-d %S/postorius/locale - postorius postorius -
-d %S/postorius/static - postorius postorius -
-d %t/postorius - postorius postorius -

Copied: postorius/repos/community-testing-any/postorius.tmpfiles (from rev 609405, postorius/trunk/postorius.tmpfiles)
===================================================================
--- postorius.tmpfiles	                        (rev 0)
+++ postorius.tmpfiles	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1,6 @@
+z /etc/webapps/postorius/settings_local.py 0640 root postorius -
+d %L/postorius 750 postorius postorius -
+d %S/postorius/data 750 postorius postorius -
+d %S/postorius/locale - postorius postorius -
+d %S/postorius/static - postorius postorius -
+d %t/postorius - postorius postorius -

Deleted: postorius.uwsgi
===================================================================
--- postorius.uwsgi	2020-04-02 09:08:17 UTC (rev 609405)
+++ postorius.uwsgi	2020-04-02 09:08:25 UTC (rev 609406)
@@ -1,18 +0,0 @@
-[uwsgi]
-procname-master = postorius
-master = true
-plugins = python
-socket = /run/postorius/%n.sock
-stats = /run/postorius/%n-stats.sock
-uid = postorius
-gid = postorius
-processes = 10
-cheaper = 2
-cheaper-step = 1
-idle = 120
-die-on-idle = true
-chdir = /usr/share/webapps/postorius
-module = wsgi
-home = /
-touch-reload = %p
-vacuum = true

Copied: postorius/repos/community-testing-any/postorius.uwsgi (from rev 609405, postorius/trunk/postorius.uwsgi)
===================================================================
--- postorius.uwsgi	                        (rev 0)
+++ postorius.uwsgi	2020-04-02 09:08:25 UTC (rev 609406)
@@ -0,0 +1,18 @@
+[uwsgi]
+procname-master = postorius
+master = true
+plugins = python
+socket = /run/postorius/%n.sock
+stats = /run/postorius/%n-stats.sock
+uid = postorius
+gid = postorius
+processes = 10
+cheaper = 2
+cheaper-step = 1
+idle = 120
+die-on-idle = true
+chdir = /usr/share/webapps/postorius
+module = wsgi
+home = /
+touch-reload = %p
+vacuum = true



More information about the arch-commits mailing list