(whimsy) 01/01: Allow update to ruby-ldap version
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch ldapversion
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 08573e25d93beb9dedf6be20d9d95ae2be638784
Author: Sebb
AuthorDate: Sat May 4 22:59:41 2024 +0100
Allow update to ruby-ldap version
---
asf.gemspec | 10 --
lib/Gemfile | 9 -
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/asf.gemspec b/asf.gemspec
index 6ac263a2..fa2529e6 100644
--- a/asf.gemspec
+++ b/asf.gemspec
@@ -1,10 +1,16 @@
version = File.read(File.expand_path('../asf.version', __FILE__)).strip
+ldapversion =
+begin
+ File.read(File.expand_path('../asfldap.version', __FILE__)).strip
+rescue Exception => e
+ nil
+end
Gem::Specification.new do |s|
# Change these as appropriate
s.name = "whimsy-asf"
- s.license= 'Apache License, Version 2.0'
+ s.license= 'Apache-2.0'
s.version= version
s.summary= "Whimsy 'model' of the ASF"
s.author = "Sam Ruby"
@@ -23,7 +29,7 @@ Gem::Specification.new do |s|
# relevant versions
s.add_dependency("nokogiri")
s.add_dependency("rack")
- s.add_dependency("ruby-ldap")
+ s.add_dependency("ruby-ldap", ldapversion)
s.add_dependency("tzinfo")
s.add_dependency("tzinfo-data")
s.add_dependency("wunderbar")
diff --git a/lib/Gemfile b/lib/Gemfile
index bc814767..7d8dfc35 100644
--- a/lib/Gemfile
+++ b/lib/Gemfile
@@ -1,10 +1,17 @@
source 'https://rubygems.org'
+ldapversion =
+begin
+ File.read(File.expand_path('../../asfldap.version', __FILE__)).strip
+rescue Exception => e
+ nil
+end
+
# lib needs these at run-time
gem 'json'
gem 'nokogiri'
gem 'rake'
-gem 'ruby-ldap'
+gem 'ruby-ldap', ldapversion
gem 'wunderbar'
gem 'pdf-reader'
(whimsy) branch ldapversion created (now 08573e25)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch ldapversion in repository https://gitbox.apache.org/repos/asf/whimsy.git at 08573e25 Allow update to ruby-ldap version This branch includes the following new commits: new 08573e25 Allow update to ruby-ldap version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(whimsy) branch master updated: Don't delete attachments on completion
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 36e353c0 Don't delete attachments on completion
36e353c0 is described below
commit 36e353c0ceac282f988ab1504eac4b8992acd6b2
Author: Sebb
AuthorDate: Sat May 4 00:34:01 2024 +0100
Don't delete attachments on completion
Makes it easier to reprocess if necessary
---
www/secretary/workbench/views/parts.js.rb | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/www/secretary/workbench/views/parts.js.rb
b/www/secretary/workbench/views/parts.js.rb
index a5a2558c..84717462 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -543,6 +543,18 @@ class Parts < Vue
}
end
+ # delete a message (keeping attachments)
+ def delete_message(event)
+@busy = true
+pathname = window.parent.location.pathname
+HTTP.delete(pathname).then {
+ window.parent.location.href = '../..'
+}.catch {|error|
+ alert error
+ @busy = false
+}
+ end
+
# delete an attachment
def delete_attachment(event)
data = {
@@ -736,7 +748,7 @@ class Parts < Vue
# tasklist completion events
def status_update(event)
if event.data.status == 'complete'
- self.delete_attachment(event)
+ self.delete_message(event)
elsif event.data.status == 'keep'
@selected = nil
@form = :categorize
(whimsy) branch master updated: Bug - incorrectly converted
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 8b324e62 Bug - incorrectly converted
8b324e62 is described below
commit 8b324e62397cbe4f4550c571cbbc998f50e58ac4
Author: Sebb
AuthorDate: Fri May 3 15:00:42 2024 +0100
Bug - incorrectly converted
---
lib/whimsy/asf/string-utils.rb | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/whimsy/asf/string-utils.rb b/lib/whimsy/asf/string-utils.rb
index b660273d..6e7a0e60 100644
--- a/lib/whimsy/asf/string-utils.rb
+++ b/lib/whimsy/asf/string-utils.rb
@@ -58,13 +58,12 @@ module ASFString
# fix encoding errors
def self.fix_encoding(text)
-result = text
-
-if encoding == Encoding::BINARY
- result = encode('utf-8', invalid: :replace, undef: :replace)
+
+if text.encoding == Encoding::BINARY
+ return text.encode('utf-8', invalid: :replace, undef: :replace)
end
+return text
-result
end
end
@@ -79,4 +78,7 @@ if __FILE__ == $0
# puts txt
puts ASFString.word_wrap(txt)
puts ASFString.reflow(txt)
+ text="\x05\x00\x68\x65\x6c\x6c\x6f"
+ text.force_encoding(Encoding::BINARY)
+ puts ASFString.fix_encoding(text)
end
(whimsy) branch master updated: Typo
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new b7c3d6de Typo
b7c3d6de is described below
commit b7c3d6de88998c9813e7e5e8e359ac284e9e8848
Author: Sebb
AuthorDate: Wed May 1 22:58:30 2024 +0100
Typo
---
www/members/invitations.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/members/invitations.cgi b/www/members/invitations.cgi
index 46369198..27a336ec 100755
--- a/www/members/invitations.cgi
+++ b/www/members/invitations.cgi
@@ -160,7 +160,7 @@ _html do
else
_b "Applications can no longer be accepted, sorry."
_ "The meeting ended at
#{Time.at(meeting_end).getutc.strftime('%Y-%m-%d %H:%M %Z')}."
- _ "This was #{remain[:days]} days and #{remain[:hours]} hours
ago."
+ _ "Applications closed #{remain[:days]} days and
#{remain[:hours]} hours ago."
end
end
}
(incubator-ponymail-foal) branch master updated: Update server version
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 6b92a05 Update server version 6b92a05 is described below commit 6b92a053af207819eaf7355ace4c2913bf77ba48 Author: Sebb AuthorDate: Wed May 1 20:39:05 2024 +0100 Update server version --- server/server_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server_version.py b/server/server_version.py index a78d1f6..8157d05 100644 --- a/server/server_version.py +++ b/server/server_version.py @@ -1,2 +1,2 @@ # This file is generated by server/update_version.sh -PONYMAIL_SERVER_VERSION = '4d644b1' +PONYMAIL_SERVER_VERSION = '1605108'
Re: Verification of download pages and links
On Wed, 1 May 2024 at 18:14, tison wrote: > > Hi Sebb, > > I'm trying to make a reference in the next OpenDAL release, that staging > the download pages and links. > > Here is a technical issue. Before the release is out, which link should be > used? IIUC we can use the link at [1]. But it doesn't follow the INFRA > policy for formal releases. However, before the release it out, no artifact > of the specific version is available at [2] or [3]. I think the staging download page should show the intended final link values. These will not point to an actual file (apart from KEYS), but it should still be possible to check that the links have the correct format. > [1] https://dist.apache.org/repos/dist/dev/opendal/ > [2] https://www.apache.org/dyn/closer.lua/opendal/ > [3] https://downloads.apache.org/opendal/ > > This is the ongoing patch [4] where I left a TODO inline. > > [4] https://github.com/apache/opendal/pull/4565 > > Best, > tison. > > > tison 于2024年4月29日周一 08:43写道： > > > > The link to the source download and keys and hashes is broken. > > > > Thank you! File [1] to fix it. > > > > [1] https://github.com/apache/opendal/pull/4547 > > > > This shows the necessity of previewing the download page. At least since > > we provide it, we should ensure its correctness. > > > > Best, > > tison. > > > > > > Justin Mclean 于2024年4月29日周一 08:15写道： > > > >> Hi, > >> > >> > Here is a patch to cover a minimal download page [1], which is derived > >> from > >> > OpenDAL's download page [2]. Welcome to leave comments if you find any > >> > issues or things we can improve on. > >> > > >> > [1] https://github.com/apache/datafusion/pull/10271 > >> > [2] https://opendal.apache.org/download > >> > >> The link to the source download and keys and hashes is broken. > >> > >> Kind Regards, > >> Justin > >> > >> - > >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > >> For additional commands, e-mail: general-h...@incubator.apache.org > >> > >> - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 69b93f0b19673be3d87aa82326f892ce08db1b6d
Author: Sebb
AuthorDate: Wed May 1 19:49:38 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 26 --
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 20a79ff..7f9be4c 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index 5a0fc09..a938ac5 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index d044a51..9e39231 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '74bc1dc';
+const PONYMAIL_REVISION = 'a36fb3e';
/**
@@ -4237,12 +4237,33 @@ function search(query, date) {
let listid = '%s@%s'.format(list, domain);
G_current_list = list;
G_current_domain = domain;
-let newhref = "list?%s:%s:%s".format(listid, date, query);
let header_from = document.getElementById('header_from');
let header_subject = document.getElementById('header_subject');
let header_to = document.getElementById('header_to');
let header_body = document.getElementById('header_body');
+let qparts = query.split('&'); // look for additional query options
+if (qparts.length > 0) { // i.e. query + header bits
+query = qparts.shift(); // Keep only the query
+// store the values to be picked up below
+for (let part of qparts) {
+let hv = part.split('=',2);
+if (hv[0] == 'header_from') {
+header_from.value = hv[1];
+}
+if (hv[0] == 'header_subject') {
+header_subject.value = hv[1];
+}
+if (hv[0] == 'header_to') {
+header_to.value = hv[1];
+}
+if (hv[0] == 'header_body') {
+header_body.value = hv[1];
+}
+// N.B. other options are currently ignored
+}
+}
+let newhref = "list?%s:%s:%s".format(listid, date, query);
let sURL = '%sapi/stats.lua?d=%s=%s=%s=%s'.format(
G_apiURL, encodeURIComponent(date), encodeURIComponent(list),
encodeURIComponent(domain), encodeURIComponent(query)
);
@@ -4302,6 +4323,7 @@ function search_set_list(what) {
document.getElementById('q').setAttribute("placeholder", "Search
%s...".format(whatxt));
}
+
/**
Fetched from source/sidebar-calendar.js
**/
diff --git a/webui/list.html b/webui/list.html
index 31441aa..bf0458c 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -179,9 +179,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index 4db94b8..57421c3 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=74bc1dc" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=a36fb3e" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index 19bd066..6617788 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) 01/02: pony mail search result url does not work as link
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit a36fb3e930cf933195d8748bfd3f7b505f956f05
Author: Sebb
AuthorDate: Wed May 1 19:48:21 2024 +0100
pony mail search result url does not work as link
This fixes #255
---
webui/js/source/search.js | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/webui/js/source/search.js b/webui/js/source/search.js
index f9e7c8d..79047d9 100644
--- a/webui/js/source/search.js
+++ b/webui/js/source/search.js
@@ -32,12 +32,33 @@ function search(query, date) {
let listid = '%s@%s'.format(list, domain);
G_current_list = list;
G_current_domain = domain;
-let newhref = "list?%s:%s:%s".format(listid, date, query);
let header_from = document.getElementById('header_from');
let header_subject = document.getElementById('header_subject');
let header_to = document.getElementById('header_to');
let header_body = document.getElementById('header_body');
+let qparts = query.split('&'); // look for additional query options
+if (qparts.length > 0) { // i.e. query + header bits
+query = qparts.shift(); // Keep only the query
+// store the values to be picked up below
+for (let part of qparts) {
+let hv = part.split('=',2);
+if (hv[0] == 'header_from') {
+header_from.value = hv[1];
+}
+if (hv[0] == 'header_subject') {
+header_subject.value = hv[1];
+}
+if (hv[0] == 'header_to') {
+header_to.value = hv[1];
+}
+if (hv[0] == 'header_body') {
+header_body.value = hv[1];
+}
+// N.B. other options are currently ignored
+}
+}
+let newhref = "list?%s:%s:%s".format(listid, date, query);
let sURL = '%sapi/stats.lua?d=%s=%s=%s=%s'.format(
G_apiURL, encodeURIComponent(date), encodeURIComponent(list),
encodeURIComponent(domain), encodeURIComponent(query)
);
@@ -95,4 +116,4 @@ function search_set_list(what) {
}
}
document.getElementById('q').setAttribute("placeholder", "Search
%s...".format(whatxt));
-}
\ No newline at end of file
+}
(incubator-ponymail-foal) branch master updated (32e6e5b -> 69b93f0)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 32e6e5b Regen JS new a36fb3e pony mail search result url does not work as link new 69b93f0 Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/admin.html | 8 webui/index.html | 6 +++--- webui/js/ponymail.js | 26 -- webui/js/source/search.js | 25 +++-- webui/list.html | 8 webui/oauth.html | 8 webui/thread.html | 8 7 files changed, 66 insertions(+), 23 deletions(-)
(incubator-ponymail-foal) branch master updated (6d3465b -> 32e6e5b)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 6d3465b Regen JS new 74bc1dc Only encode parameter values, not the delimiters new 32e6e5b Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/admin.html| 8 webui/index.html| 6 +++--- webui/js/ponymail.js| 10 ++ webui/js/source/sidebar-calendar.js | 8 +--- webui/list.html | 8 webui/oauth.html| 8 webui/thread.html | 8 7 files changed, 30 insertions(+), 26 deletions(-)
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 32e6e5b873e6d71d7376106cabb4de7071e1d5d2
Author: Sebb
AuthorDate: Wed May 1 19:32:58 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 10 ++
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 977cd4d..20a79ff 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index 073172e..5a0fc09 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 2b319ac..d044a51 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '86af91a';
+const PONYMAIL_REVISION = '74bc1dc';
/**
@@ -4472,12 +4472,13 @@ function calendar_scroll(me, direction) {
function calendar_click(year, month) {
G_current_year = year;
G_current_month = month;
-let searching = false;
-let q = "";
+let q = ""; // components are not encoded
+let qapi = ""; // components need to be encoded for the api call
let calendar_current_list = G_current_list;
let calendar_current_domain = G_current_domain;
if (G_current_json && G_current_json.searchParams) {
q = G_current_json.searchParams.q || "";
+qapi = encodeURIComponent(q);
calendar_current_list = G_current_json.searchParams.list;
calendar_current_domain = G_current_json.searchParams.domain;
// Weave in header parameters
@@ -4485,6 +4486,7 @@ function calendar_click(year, month) {
if (key.match(/^header_/)) {
let value = G_current_json.searchParams[key];
q += `&${key}=${value}`;
+qapi += `&${key}=${encodeURIComponent(value)}`; // only encode
the values
}
}
}
@@ -4498,7 +4500,7 @@ function calendar_click(year, month) {
G_apiURL, encodeURIComponent(calendar_current_list),
encodeURIComponent(calendar_current_domain),
encodeURIComponent(year), encodeURIComponent(month),
-encodeURIComponent(q)
+qapi
),
renderListView, {
to: (q && q.length > 0) ? 'search' :
'%s@%s'.format(calendar_current_list, calendar_current_domain),
diff --git a/webui/list.html b/webui/list.html
index b411a41..31441aa 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -179,9 +179,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index f8fd2b4..4db94b8 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=86af91a" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=74bc1dc" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index b34ad10..19bd066 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) 01/02: Only encode parameter values, not the delimiters
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 74bc1dc12d39ae8831de64b2bd7186337bae1e72
Author: Sebb
AuthorDate: Wed May 1 19:29:28 2024 +0100
Only encode parameter values, not the delimiters
---
webui/js/source/sidebar-calendar.js | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/webui/js/source/sidebar-calendar.js
b/webui/js/source/sidebar-calendar.js
index c042aa8..491b322 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -181,12 +181,13 @@ function calendar_scroll(me, direction) {
function calendar_click(year, month) {
G_current_year = year;
G_current_month = month;
-let searching = false;
-let q = "";
+let q = ""; // components are not encoded
+let qapi = ""; // components need to be encoded for the api call
let calendar_current_list = G_current_list;
let calendar_current_domain = G_current_domain;
if (G_current_json && G_current_json.searchParams) {
q = G_current_json.searchParams.q || "";
+qapi = encodeURIComponent(q);
calendar_current_list = G_current_json.searchParams.list;
calendar_current_domain = G_current_json.searchParams.domain;
// Weave in header parameters
@@ -194,6 +195,7 @@ function calendar_click(year, month) {
if (key.match(/^header_/)) {
let value = G_current_json.searchParams[key];
q += `&${key}=${value}`;
+qapi += `&${key}=${encodeURIComponent(value)}`; // only encode
the values
}
}
}
@@ -207,7 +209,7 @@ function calendar_click(year, month) {
G_apiURL, encodeURIComponent(calendar_current_list),
encodeURIComponent(calendar_current_domain),
encodeURIComponent(year), encodeURIComponent(month),
-encodeURIComponent(q)
+qapi
),
renderListView, {
to: (q && q.length > 0) ? 'search' :
'%s@%s'.format(calendar_current_list, calendar_current_domain),
(incubator-ponymail-foal) branch master updated (8e89624 -> 6d3465b)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 8e89624 Regen JS new 86af91a Oops, need to change source new 6d3465b Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/admin.html| 8 webui/index.html| 6 +++--- webui/js/ponymail.js| 27 +-- webui/js/source/composer.js | 26 -- webui/list.html | 8 webui/oauth.html| 8 webui/thread.html | 8 7 files changed, 68 insertions(+), 23 deletions(-)
(incubator-ponymail-foal) 01/02: Oops, need to change source
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 86af91a9d1af8f63a07df1ede9aa385b3b4904ec
Author: Sebb
AuthorDate: Wed May 1 17:30:39 2024 +0100
Oops, need to change source
---
webui/js/source/composer.js | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/webui/js/source/composer.js b/webui/js/source/composer.js
index 08fe5be..f35b4af 100644
--- a/webui/js/source/composer.js
+++ b/webui/js/source/composer.js
@@ -5,8 +5,10 @@ function compose_send() {
for (let k in mua_headers) {
content.push(k + "=" + encodeURIComponent(mua_headers[k]));
}
-// Push the subject and email body into the form data
+// Push the subject, (b)cc and email body into the form data
content.push("subject=" +
encodeURIComponent(document.getElementById('composer_subject').value));
+content.push("cc=" +
encodeURIComponent(document.getElementById('composer_cc').value));
+content.push("bcc=" +
encodeURIComponent(document.getElementById('composer_bcc').value));
content.push("body=" +
encodeURIComponent(document.getElementById('composer_body').value));
if (G_ponymail_preferences.login &&
G_ponymail_preferences.login.alternates &&
document.getElementById('composer_alt')) {
content.push("alt=" +
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -108,6 +110,26 @@ function compose_email(replyto, list) {
value: eml_subject
}));
form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Cc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_cc',
+type: 'text',
+}));
+form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Bcc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_bcc',
+type: 'text',
+}));
+form.push(new HTML('br'));
form.push(new HTML('b', {}, "Reply:"));
form.push(new HTML('br'));
let body = new HTML('textarea', {
@@ -195,4 +217,4 @@ function mua_link(email, xlist) {
let listname = email.list_raw.replace(/[<>]/g, '').replace('.', '@', 1);
let xlink = 'mailto:' + listname + "?subject=" +
encodeURIComponent(subject) + "In-Reply-To=" +
encodeURIComponent(email['message-id']) + "=" +
encodeURIComponent(eml_raw_short);
return xlink;
-}
\ No newline at end of file
+}
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 6d3465b01efa19a71999851a91bf260d11837815
Author: Sebb
AuthorDate: Wed May 1 17:36:09 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 27 +--
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 274fb6a..977cd4d 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index 4912f1b..073172e 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index d9038ff..2b319ac 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'a50ae4e';
+const PONYMAIL_REVISION = '86af91a';
/**
@@ -681,8 +681,10 @@ function compose_send() {
for (let k in mua_headers) {
content.push(k + "=" + encodeURIComponent(mua_headers[k]));
}
-// Push the subject and email body into the form data
+// Push the subject, (b)cc and email body into the form data
content.push("subject=" +
encodeURIComponent(document.getElementById('composer_subject').value));
+content.push("cc=" +
encodeURIComponent(document.getElementById('composer_cc').value));
+content.push("bcc=" +
encodeURIComponent(document.getElementById('composer_bcc').value));
content.push("body=" +
encodeURIComponent(document.getElementById('composer_body').value));
if (G_ponymail_preferences.login &&
G_ponymail_preferences.login.alternates &&
document.getElementById('composer_alt')) {
content.push("alt=" +
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -784,6 +786,26 @@ function compose_email(replyto, list) {
value: eml_subject
}));
form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Cc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_cc',
+type: 'text',
+}));
+form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Bcc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_bcc',
+type: 'text',
+}));
+form.push(new HTML('br'));
form.push(new HTML('b', {}, "Reply:"));
form.push(new HTML('br'));
let body = new HTML('textarea', {
@@ -873,6 +895,7 @@ function mua_link(email, xlist) {
return xlink;
}
+
/**
Fetched from source/construct-thread.js
**/
diff --git a/webui/list.html b/webui/list.html
index 21d2913..b411a41 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -179,9 +179,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index b3171bd..f8fd2b4 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=a50ae4e" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=86af91a" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index 1f2ad9a..b34ad10 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) 01/02: G_current_query is never read
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit a50ae4e4ad3dceb479fa071a948984ef03868a26
Author: Sebb
AuthorDate: Tue Apr 30 23:37:31 2024 +0100
G_current_query is never read
---
webui/js/source/aavariables.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/webui/js/source/aavariables.js b/webui/js/source/aavariables.js
index 80c8353..8f8765e 100644
--- a/webui/js/source/aavariables.js
+++ b/webui/js/source/aavariables.js
@@ -29,7 +29,6 @@ let G_current_list = '';
let G_current_domain = '';
let G_current_year = 0;
let G_current_month = 0;
-let G_current_query = '';
let G_current_open_email = null;
let G_select_primed = false;
let G_ponymail_preferences = {};
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 8e89624b49ecf53c70e6f2a3a989d96bffa509a5
Author: Sebb
AuthorDate: Tue Apr 30 23:37:51 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 3 +--
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 8ea5d41..274fb6a 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index b7935bf..4912f1b 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 2a2956c..d9038ff 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'ac738ec';
+const PONYMAIL_REVISION = 'a50ae4e';
/**
@@ -37,7 +37,6 @@ let G_current_list = '';
let G_current_domain = '';
let G_current_year = 0;
let G_current_month = 0;
-let G_current_query = '';
let G_current_open_email = null;
let G_select_primed = false;
let G_ponymail_preferences = {};
diff --git a/webui/list.html b/webui/list.html
index f63f5b4..21d2913 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -179,9 +179,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index 461b383..b3171bd 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=ac738ec" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=a50ae4e" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index b6b08cd..1f2ad9a 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch master updated (8d2222a -> 8e89624)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 8da Regen JS new a50ae4e G_current_query is never read new 8e89624 Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/admin.html | 8 webui/index.html | 6 +++--- webui/js/ponymail.js | 3 +-- webui/js/source/aavariables.js | 1 - webui/list.html| 8 webui/oauth.html | 8 webui/thread.html | 8 7 files changed, 20 insertions(+), 22 deletions(-)
(incubator-ponymail-foal) branch master updated (abc5cf8 -> 8d2222a)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from abc5cf8 checkall is not used; search only has 2 args new ac738ec G_current_query is never read new 8da Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/admin.html | 8 webui/index.html | 6 +++--- webui/js/ponymail.js | 3 +-- webui/js/source/primer.js | 1 - webui/list.html | 8 webui/oauth.html | 8 webui/thread.html | 8 7 files changed, 20 insertions(+), 22 deletions(-)
(incubator-ponymail-foal) 01/02: G_current_query is never read
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit ac738ecc384be4610bd646aa934d8f3cc4298862
Author: Sebb
AuthorDate: Tue Apr 30 23:35:47 2024 +0100
G_current_query is never read
---
webui/js/ponymail.js | 4 ++--
webui/js/source/primer.js | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6f990fc..b047636 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -37,7 +37,7 @@ let G_current_list = '';
let G_current_domain = '';
let G_current_year = 0;
let G_current_month = 0;
-let G_current_query = '';
+let G_current_query = ''; // NOT USED
let G_current_open_email = null;
let G_select_primed = false;
let G_ponymail_preferences = {};
@@ -3516,7 +3516,7 @@ function post_prime(state) {
if (G_current_year && G_current_month) {
sURL += "=%u-%u".format(G_current_year, G_current_month);
}
-if (!(state && state.search)) {
+if (!(state && state.search)) { // FIX: reverse logic
if (state && state.array) {
G_collated_json = {};
for (let entry of state.array) {
diff --git a/webui/js/source/primer.js b/webui/js/source/primer.js
index 377f91a..b7b7232 100644
--- a/webui/js/source/primer.js
+++ b/webui/js/source/primer.js
@@ -96,7 +96,6 @@ function parseURL(state) {
let month = bits[1];
let query = bits[2];
state = state || {};
-G_current_query = query || "";
G_current_month = 0;
G_current_year = 0;
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 8dada83926c399ee1e00161c59af0321b015
Author: Sebb
AuthorDate: Tue Apr 30 23:36:50 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 7 +++
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 9c725b1..8ea5d41 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index ed05c16..b7935bf 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index b047636..2a2956c 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'f8dc8ff';
+const PONYMAIL_REVISION = 'ac738ec';
/**
@@ -37,7 +37,7 @@ let G_current_list = '';
let G_current_domain = '';
let G_current_year = 0;
let G_current_month = 0;
-let G_current_query = ''; // NOT USED
+let G_current_query = '';
let G_current_open_email = null;
let G_select_primed = false;
let G_ponymail_preferences = {};
@@ -3516,7 +3516,7 @@ function post_prime(state) {
if (G_current_year && G_current_month) {
sURL += "=%u-%u".format(G_current_year, G_current_month);
}
-if (!(state && state.search)) { // FIX: reverse logic
+if (!(state && state.search)) {
if (state && state.array) {
G_collated_json = {};
for (let entry of state.array) {
@@ -3541,7 +3541,6 @@ function parseURL(state) {
let month = bits[1];
let query = bits[2];
state = state || {};
-G_current_query = query || "";
G_current_month = 0;
G_current_year = 0;
diff --git a/webui/list.html b/webui/list.html
index e82a93b..f63f5b4 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -179,9 +179,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index 631f211..461b383 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=9970074" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=ac738ec" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index 404095e..b6b08cd 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch master updated: checkall is not used; search only has 2 args
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new abc5cf8 checkall is not used; search only has 2 args abc5cf8 is described below commit abc5cf82225b1b1dc0fdff0d73824a12886554e5 Author: Sebb AuthorDate: Tue Apr 30 23:33:11 2024 +0100 checkall is not used; search only has 2 args --- webui/list.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/webui/list.html b/webui/list.html index 08a244a..e82a93b 100644 --- a/webui/list.html +++ b/webui/list.html @@ -53,11 +53,9 @@ the License. --> - + - - Where to search: This list
(incubator-ponymail-foal) branch master updated: Update certifi to latest
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 034e905 Update certifi to latest 034e905 is described below commit 034e9057c18ae9d0d2403aba9f4f0895ea31e6ae Author: Sebb AuthorDate: Tue Apr 30 17:23:59 2024 +0100 Update certifi to latest --- server/requirements.txt | 2 +- tools/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/requirements.txt b/server/requirements.txt index 7642068..584f8c3 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -5,7 +5,7 @@ multipart~=0.2.1 # MIT elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0 (includes aiohttp) -certifi~=2020.6.20 # MPL2.0 +certifi~=2024.2.2# MPL2.0 netaddr~=0.8.0 # BSD, MIT formatflowed~=2.0.0 # Python Software Foundation google-auth~=1.30.0 # AL2.0 diff --git a/tools/requirements.txt b/tools/requirements.txt index 9aedca9..0b690fe 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -3,6 +3,6 @@ PyYAML~=6.0.1 # MIT # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0 -certifi~=2020.6.20# MPL 2.0 +certifi~=2024.2.2 # MPL 2.0 netaddr~=0.8.0# BSD, MIT formatflowed~=2.0.0 # Python Software Foundation
(incubator-ponymail-foal) branch master updated: Rebuild JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new 2635b49 Rebuild JS
2635b49 is described below
commit 2635b49b674db02b0421d39f90c5fbb812b6f4fb
Author: Sebb
AuthorDate: Tue Apr 30 17:19:52 2024 +0100
Rebuild JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 24 +---
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 53a2b1c..9c725b1 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index b803470..ed05c16 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 676ab51..6f990fc 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -682,10 +682,8 @@ function compose_send() {
for (let k in mua_headers) {
content.push(k + "=" + encodeURIComponent(mua_headers[k]));
}
-// Push the subject, (b)cc and email body into the form data
+// Push the subject and email body into the form data
content.push("subject=" +
encodeURIComponent(document.getElementById('composer_subject').value));
-content.push("cc=" +
encodeURIComponent(document.getElementById('composer_cc').value));
-content.push("bcc=" +
encodeURIComponent(document.getElementById('composer_bcc').value));
content.push("body=" +
encodeURIComponent(document.getElementById('composer_body').value));
if (G_ponymail_preferences.login &&
G_ponymail_preferences.login.alternates &&
document.getElementById('composer_alt')) {
content.push("alt=" +
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -787,26 +785,6 @@ function compose_email(replyto, list) {
value: eml_subject
}));
form.push(new HTML('br'));
-form.push(new HTML('b', {}, "Cc:"));
-form.push(new HTML('br'));
-form.push(new HTML('input', {
-style: {
-width: '90%'
-},
-id: 'composer_cc',
-type: 'text',
-}));
-form.push(new HTML('br'));
-form.push(new HTML('b', {}, "Bcc:"));
-form.push(new HTML('br'));
-form.push(new HTML('input', {
-style: {
-width: '90%'
-},
-id: 'composer_bcc',
-type: 'text',
-}));
-form.push(new HTML('br'));
form.push(new HTML('b', {}, "Reply:"));
form.push(new HTML('br'));
let body = new HTML('textarea', {
diff --git a/webui/list.html b/webui/list.html
index 87aa518..08a244a 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -181,9 +181,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index 833682c..631f211 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f8dc8ff" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=9970074" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index 70577ae..404095e 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-site) branch asf-site updated: Current version is Ponymail Foal
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 2d0a52f Current version is Ponymail Foal 2d0a52f is described below commit 2d0a52fbb74c41b1fb9a150d4e4c2b95d9f8564f Author: Sebb AuthorDate: Tue Apr 30 17:16:18 2024 +0100 Current version is Ponymail Foal This fixes https://github.com/apache/incubator-ponymail-foal/issues/256 --- content/contribute.html | 8 content/docs/contributing.html | 2 +- content/docs/install.centos.html | 2 +- content/docs/install.debian.html | 2 +- content/docs/install.fedora.html | 2 +- content/docs/install.ubuntu.html | 2 +- content/docs/installing.html | 4 ++-- content/source.html | 2 +- content/support.html | 2 +- source/markdown/contribute.md| 8 source/markdown/docs/CONTRIBUTING.md | 2 +- source/markdown/source.md| 2 +- source/markdown/support.md | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/content/contribute.html b/content/contribute.html index ee32491..b91558b 100644 --- a/content/contribute.html +++ b/content/contribute.html @@ -39,8 +39,8 @@ Any form of contribution is most welcome, whether it be programming, documentation, evangelism, marketing, or helping out other users. Source code and issue tracker -Our source repository is at: https://github.com/apache/incubator-ponymail;>https://github.com/apache/incubator-ponymail -We currently use GitHub Issues for tracking bugs and improvements: https://github.com/apache/incubator-ponymail/issues;>https://github.com/apache/incubator-ponymail/issues +Our source repository is at: https://github.com/apache/incubator-ponymail-foal;>https://github.com/apache/incubator-ponymail-foal +We currently use GitHub Issues for tracking bugs and improvements: https://github.com/apache/incubator-ponymail-foal/issues;>https://github.com/apache/incubator-ponymail-foal/issues Contributing guideline To contribute to Pony Mail, follow these steps: @@ -51,7 +51,7 @@ documentation, evangelism, marketing, or helping out other users. Find something to fix or help out with. -Let us know what you want to do by opening an https://github.com/apache/incubator-ponymail/issues;>issue or a pull request. +Let us know what you want to do by opening an https://github.com/apache/incubator-ponymail-foal/issues;>issue or a pull request. Join us on #ponymail on the Freenode IRC network. Git Workflow @@ -62,7 +62,7 @@ repository configured as a remote. In this case we will add it as a remote called "ponymail": cd ponymail -git remote add ponymail https://github.com/apache/incubator-ponymail.git +git remote add ponymail https://github.com/apache/incubator-ponymail-foal.git Create the feature branch When beginning working on the feature, take a branch from the latest master version: diff --git a/content/docs/contributing.html b/content/docs/contributing.html index 22eea97..5a9b42d 100644 --- a/content/docs/contributing.html +++ b/content/docs/contributing.html @@ -43,7 +43,7 @@ are always on the lookout for user experiences. If you have used Pony Mail and have feedback or ideas you wish to share, please let us know either through an issue/PR here or on the mailing list. Code -The Pony Mail code is on GitHub at https://github.com/apache/incubator-ponymail +The Pony Mail code is on GitHub at https://github.com/apache/incubator-ponymail-foal and pull requests are welcome. Mailing lists Developers list: diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html index 475d0df..a6a2b39 100644 --- a/content/docs/install.centos.html +++ b/content/docs/install.centos.html @@ -120,7 +120,7 @@ sudo /etc/init.d/elasticsearch start Check out a copy of Pony Mail: cd /var/www -git clone https://github.com/apache/incubator-ponymail.git +git clone https://github.com/apache/incubator-ponymail-foal.git Set up Pony Mail: diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html index 0b99dbd..57f0a66 100644 --- a/content/docs/install.debian.html +++ b/content/docs/install.debian.html @@ -64,7 +64,7 @@ sudo apt-get update && sudo apt-get install elasticsearch Check out a copy of Pony Mail: cd /var/www -sudo git clone https://github.com/apache/incubator-ponymail.git +sudo git clone https://github.com/apache/incubator-ponymail-foal.git Start up ElasticSearch: diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html index 394f7cf..252df8d 100644 --- a/content/docs/install.fedora.html +++ b/content/docs/install.fedora.html @@ -89,7 +89,7 @@ sudo /etc/init.d/elasticsearch start Check out a copy of Pony Mail: cd /var/www -sudo git clone
(incubator-ponymail-foal) branch master updated (9970074 -> 7aade30)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 9970074 Merge pull request #251 from raboof/show-oauth-error add 13ed038 Support 'Cc' in the web mail/reply composer add 0ba4cc4 Bcc as well new 7aade30 Merge pull request #250 from raboof/cc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: server/endpoints/compose.py | 6 ++ webui/js/ponymail.js| 24 +++- 2 files changed, 29 insertions(+), 1 deletion(-)
(incubator-ponymail-foal) 01/01: Merge pull request #250 from raboof/cc
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git commit 7aade3057f09888549309ec596a8a36d5d058a7f Merge: 9970074 0ba4cc4 Author: Sebb AuthorDate: Tue Apr 30 16:58:57 2024 +0100 Merge pull request #250 from raboof/cc Support 'Cc' in the web mail/reply composer server/endpoints/compose.py | 6 ++ webui/js/ponymail.js| 24 +++- 2 files changed, 29 insertions(+), 1 deletion(-)
(incubator-ponymail-foal) 01/01: Merge pull request #251 from raboof/show-oauth-error
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git commit 99700746f5207d670fd246e329962bc405916ed0 Merge: 505fa9a 18cecc2 Author: Sebb AuthorDate: Tue Apr 30 16:57:15 2024 +0100 Merge pull request #251 from raboof/show-oauth-error Show error alert when oauth fails webui/js/oauth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(incubator-ponymail-foal) branch master updated (505fa9a -> 9970074)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 505fa9a Merge pull request #252 from raboof/show-internal-server-errors add 18cecc2 Show error alert when oauth fails new 9970074 Merge pull request #251 from raboof/show-oauth-error The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/js/oauth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(incubator-ponymail-foal) branch master updated (fee7837 -> 505fa9a)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from fee7837 Rebuild JS add 027d666 Show an error popup for internal server errors new 505fa9a Merge pull request #252 from raboof/show-internal-server-errors The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/js/oauth.js | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-)
(incubator-ponymail-foal) 01/01: Merge pull request #252 from raboof/show-internal-server-errors
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git commit 505fa9acd8884744d9429a32bd5689a0a73b8ea5 Merge: fee7837 027d666 Author: Sebb AuthorDate: Tue Apr 30 16:53:56 2024 +0100 Merge pull request #252 from raboof/show-internal-server-errors Show an error popup for internal server errors [skip ci] webui/js/oauth.js | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-)
(incubator-ponymail-foal) branch master updated: Rebuild JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new fee7837 Rebuild JS
fee7837 is described below
commit fee7837aa2ad55b35053528daba66179da73bff5
Author: Sebb
AuthorDate: Tue Apr 30 16:48:08 2024 +0100
Rebuild JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 16 +---
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 9c67643..53a2b1c 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index c0d5ef4..b803470 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index a1e3516..6f990fc 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '5a0f102';
+const PONYMAIL_REVISION = 'f8dc8ff';
/**
@@ -694,8 +694,18 @@ function compose_send() {
request.setRequestHeader("Content-type",
"application/x-www-form-urlencoded");
request.send(content.join("&")); // send email as a POST string
-document.getElementById('composer_modal').style.display = 'none';
-modal("Message dispatched!", "Your email has been sent. Depending on
moderation rules, it may take a while before it shows up in the archives.",
"help");
+request.onreadystatechange = function(state) {
+if (request.readyState == 4) {
+document.getElementById('composer_modal').style.display = 'none';
+let response = JSON.parse(request.responseText)
+if (response.error) {
+modal("Message dispatch failed!", response.error, "error");
+} else {
+modal("Message dispatched!", "Your email has been sent.
Depending on moderation rules, it may take a while before it shows up in the
archives.", "help");
+}
+}
+}
+
}
function compose_email(replyto, list) {
diff --git a/webui/list.html b/webui/list.html
index 8466aed..87aa518 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -181,9 +181,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index ae4bb24..833682c 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=f8dc8ff" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index 4a18034..70577ae 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch master updated (d12e247 -> 3093ef4)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from d12e247 Satisfy mypy add f8dc8ff Show message dispatch error new 3093ef4 Merge pull request #253 from raboof/show-message-dispatch-error The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: webui/js/source/composer.js | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-)
(incubator-ponymail-foal) 01/01: Merge pull request #253 from raboof/show-message-dispatch-error
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git commit 3093ef4fe32b294368aa46e3ae6699a15c4b0522 Merge: d12e247 f8dc8ff Author: Sebb AuthorDate: Tue Apr 30 16:47:26 2024 +0100 Merge pull request #253 from raboof/show-message-dispatch-error Show message dispatch error [skip ci] - need to run build.sh webui/js/source/composer.js | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-)
(incubator-ponymail-foal) branch bad_encoding updated (0b12cfc -> c1db43c)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 0b12cfc Update server version add d12e247 Satisfy mypy add c1db43c Merge branch 'master' into bad_encoding No new revisions were added by this update. Summary of changes: tools/archiver.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
(incubator-ponymail-foal) branch master updated: Satisfy mypy
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new d12e247 Satisfy mypy
d12e247 is described below
commit d12e247c41f4298028181a4e54f1627e7cc04509
Author: Sebb
AuthorDate: Tue Apr 30 16:06:29 2024 +0100
Satisfy mypy
---
tools/archiver.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index f924374..9d364fd 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -430,7 +430,11 @@ class Archiver(object): # N.B. Also used by import-mbox.py
):
first_html = Body(part)
except Exception as err:
-print('Error on line
{}:'.format(sys.exc_info()[-1].tb_lineno), type(err).__name__, err)
+entry = sys.exc_info()[-1]
+if entry: # avoid mypy complaint
+print('Error on line {}:'.format(entry.tb_lineno),
type(err).__name__, err)
+else: # Should not happen, but just in case
+print('Failed to create Body(part):',type(err).__name__,
err)
# this requires a GPL lib, user will have to install it themselves
if first_html and (
(incubator-ponymail-foal) branch bad_encoding updated (b7e6b5a -> 0b12cfc)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from b7e6b5a Merge branch 'master' into bad_encoding add 0b12cfc Update server version No new revisions were added by this update. Summary of changes: server/server_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(incubator-ponymail-foal) branch bad_encoding updated (1c9c701 -> b7e6b5a)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 1c9c701 Merge branch 'master' into bad_encoding add 5313738 Sync with server version add b7e6b5a Merge branch 'master' into bad_encoding No new revisions were added by this update. Summary of changes: tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(incubator-ponymail-foal) branch master updated: Sync with server version
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 5313738 Sync with server version 5313738 is described below commit 531373825e003c4d0578864f84f1d1fde520dcbd Author: Sebb AuthorDate: Tue Apr 30 11:39:48 2024 +0100 Sync with server version --- tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 7a70f22..9aedca9 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,5 +1,5 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=5.4.1 # WTFPL +PyYAML~=6.0.1 # MIT # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0
(incubator-ponymail-foal) branch drydump deleted (was 3635a88)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch drydump in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git was 3635a88 Rebuild JS This change permanently discards the following revisions: discard 3635a88 Rebuild JS discard 22455c9 Fix version again discard 95b8a40 Fix old versions discard 9e6dfef Allow dump with dryrun
(incubator-ponymail-foal) branch bad_encoding updated (492855c -> 1c9c701)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 492855c 3.10 is having issues add 8bc8196 Merge branch 'master' into bad_encoding add 6b2b8f7 Allow for 3.10 setup issued add f1e458c Regen JS add 4d644b1 Type checking fixes add 8a9afd9 Fix server version add ab4bbbf PyYAML needs updating for current Python add 949ddf5 Fix up Python versions add 8e3ebc4 Try to find where Unit tests fail add b3031fe Is it an issue with PyYAML add ff47237 Show installed add 5078483 Temp test fix? add c870dc5 No need to trigger here add 4fdbcea Not a problem; 3.7 is obsolete add 4f6c14b Very simple ES debug class add 3935744 Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant add d7d680d Merge branch 'master' into bad_encoding add cab6a1d Add some context for error messages add 1c9c701 Merge branch 'master' into bad_encoding No new revisions were added by this update. Summary of changes: .github/workflows/integration-tests.yml | 4 +- .github/workflows/type-tests.yml| 4 +- .github/workflows/unittest.yml | 10 ++-- server/plugins/messages.py | 1 + server/requirements.txt | 2 +- server/server_version.py| 2 +- test/esintercept/elasticsearch.py | 83 + tools/archiver.py | 6 ++- 8 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 test/esintercept/elasticsearch.py
(incubator-ponymail-foal) branch master updated: Add some context for error messages
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new cab6a1d Add some context for error messages
cab6a1d is described below
commit cab6a1d0979d4c4ee900412fb8f61c702a52b093
Author: Sebb
AuthorDate: Tue Apr 30 11:31:36 2024 +0100
Add some context for error messages
---
tools/archiver.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index 96e831a..f924374 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -430,7 +430,7 @@ class Archiver(object): # N.B. Also used by import-mbox.py
):
first_html = Body(part)
except Exception as err:
-print(err)
+print('Error on line
{}:'.format(sys.exc_info()[-1].tb_lineno), type(err).__name__, err)
# this requires a GPL lib, user will have to install it themselves
if first_html and (
@@ -761,7 +761,7 @@ class Archiver(object): # N.B. Also used by import-mbox.py
# If we have a dump dir and ES failed, push to dump dir instead as a
JSON object
# We'll leave it to another process to pick up the slack.
except Exception as err:
-print(err)
+print('Error on line {}:'.format(sys.exc_info()[-1].tb_lineno),
type(err).__name__, err)
if dump:
print(
"Pushing to ES failed, but dumponfail specified, dumping
JSON docs"
(incubator-ponymail-foal) branch master updated: Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 3935744 Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant 3935744 is described below commit 3935744f8c3685532ebce9afc0c79bbfcd24c391 Author: Sebb AuthorDate: Tue Apr 30 11:21:12 2024 +0100 Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant --- tools/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 37264d3..7a70f22 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,5 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=6.0.1 ; python_version > "3.8" # MIT -PyYAML~=5.4.1 ; python_version < "3.9" # MIT +PyYAML~=5.4.1 # WTFPL # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0
Re: Verification of download pages and links
On Sun, 28 Apr 2024 at 19:46, Dave Fisher wrote: > > > > > On Apr 28, 2024, at 9:58 AM, tison wrote: > > > > Thank you! > > > > I found there is no rationale for these links, and thus, it's quite a bit > > challenging in memory. > > > > IIRC the closer.lua script is for selecting the most proper CDN for > > source/binary bundles in use. They can, technically, work for SHASUM and > > signatures also. Why do we use https://downloads.apache.org for the latter > > two? > > Historically we had a mirror network and closer.lua picked out a mirror near > you. In order to be sure that the download source or binary on the mirror was > not altered on (or on its way to or from) the mirror, the detached signature > and checksums must be served from ASF controlled resources. > > Whether or not this still makes sense is a discussion for Infra since they > are charged with enforcing and supporting the release distribution policy. As it stands, the policy requires direct links for sigs and hashes and closer.lua for artifacts. https://infra.apache.org/release-distribution.html#download-links > Best, > Dave > > > > > Best, > > tison. > > > > > > sebb 于2024年4月29日周一 00:34写道： > > > >> On Sun, 28 Apr 2024 at 15:38, tison wrote: > >>> > >>> Yeah. I support that we always need to release sources on our platform. > >>> > >>> Given the links to downloads.apache.org, archive.apache.org, > >>> https://www.apache.org/dyn/closer.lua, can be unintuitive for users, I > >>> agree that we can have a simple Download page for such library-only > >>> projects. > >> > >> The download page can also be used for links to release notes, and to > >> provide other support information. > >> > >>> Here is a patch to cover a minimal download page [1], which is derived > >> from > >>> OpenDAL's download page [2]. Welcome to leave comments if you find any > >>> issues or things we can improve on. > >>> > >>> [1] https://github.com/apache/datafusion/pull/10271 > >> > >> The closer.lua script is only intended for the source and binary bundles. > >> > >> The sigs and hashes (and KEYS) should link directly to > >> https://downloads.apache.org/datafusion/... > >> > >>> [2] https://opendal.apache.org/download > >>> > >>> Best, > >>> tison. > >>> > >>> > >>> Justin Mclean 于2024年4月28日周日 10:02写道： > >>> > >>>> Hi, > >>>> > >>>> Projects need to make source releases on ASF infrastructure and have a > >>>> download page for good reasons. Some users need a place to verify and > >>>> download a trusted release. Having it hosted on ASF infrastructure > >> means > >>>> people can 100% trust it, unlike 3rd party providers. 3rd party > >> providers > >>>> have gone rogue in the past (e.g . Source Forge), disappeared (e.g. > >> Google > >>>> Code), or had multiple serious issues (e.g. NPM). Also by placing a > >> release > >>>> in the ASF distribution area / a project download page gives confidence > >>>> that the ASF release process has been followed and that it is not a > >> release > >>>> by a 3rd party or an unofficial release of some sort. IMO, all > >> projects > >>>> need to have a download page, even if it may not be used by the > >> majority of > >>>> users. > >>>> > >>>> Kind Regards, > >>>> Justin > >>>> - > >>>> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > >>>> For additional commands, e-mail: general-h...@incubator.apache.org > >>>> > >>>> > >> > >> - > >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > >> For additional commands, e-mail: general-h...@incubator.apache.org > >> > >> > > > - > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
Re: Verification of download pages and links
On Sun, 28 Apr 2024 at 15:38, tison wrote: > > Yeah. I support that we always need to release sources on our platform. > > Given the links to downloads.apache.org, archive.apache.org, > https://www.apache.org/dyn/closer.lua, can be unintuitive for users, I > agree that we can have a simple Download page for such library-only > projects. The download page can also be used for links to release notes, and to provide other support information. > Here is a patch to cover a minimal download page [1], which is derived from > OpenDAL's download page [2]. Welcome to leave comments if you find any > issues or things we can improve on. > > [1] https://github.com/apache/datafusion/pull/10271 The closer.lua script is only intended for the source and binary bundles. The sigs and hashes (and KEYS) should link directly to https://downloads.apache.org/datafusion/... > [2] https://opendal.apache.org/download > > Best, > tison. > > > Justin Mclean 于2024年4月28日周日 10:02写道： > > > Hi, > > > > Projects need to make source releases on ASF infrastructure and have a > > download page for good reasons. Some users need a place to verify and > > download a trusted release. Having it hosted on ASF infrastructure means > > people can 100% trust it, unlike 3rd party providers. 3rd party providers > > have gone rogue in the past (e.g . Source Forge), disappeared (e.g. Google > > Code), or had multiple serious issues (e.g. NPM). Also by placing a release > > in the ASF distribution area / a project download page gives confidence > > that the ASF release process has been followed and that it is not a release > > by a 3rd party or an unofficial release of some sort. IMO, all projects > > need to have a download page, even if it may not be used by the majority of > > users. > > > > Kind Regards, > > Justin > > - > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
(whimsy) branch master updated: Reduce noise
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new d7df9f0a Reduce noise
d7df9f0a is described below
commit d7df9f0a0277b134c60ea4f4bfd4c2c8851d1992
Author: Sebb
AuthorDate: Sun Apr 28 14:54:11 2024 +0100
Reduce noise
---
tools/site-scan.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 41adc6f5..a7f5750c 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -219,7 +219,9 @@ def parse(id, site, name, podling=false)
nodisclaimer << subpage
end
else
- $stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
+ unless %w(nlpcraft teaclave).include? id # reported, but not yet
fixed, so suppress noise
+$stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
+ end
end
rescue URI::InvalidURIError
end
(incubator-ponymail-foal) branch master updated: Very simple ES debug class
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 4f6c14b Very simple ES debug class 4f6c14b is described below commit 4f6c14baa89d8a8b2c3dbd92b64fee73d0afac71 Author: Sebb AuthorDate: Sun Apr 28 14:04:38 2024 +0100 Very simple ES debug class [skip ci] --- test/esintercept/elasticsearch.py | 83 +++ 1 file changed, 83 insertions(+) diff --git a/test/esintercept/elasticsearch.py b/test/esintercept/elasticsearch.py new file mode 100644 index 000..4e43a70 --- /dev/null +++ b/test/esintercept/elasticsearch.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Very simple module to intercept calls to Elasticsearch methods +# Writes call parameters to a file. +# +# Use it by defining PYTHONPATH to include its parent dir, e.g. +# [OUT=/tmp/pmfoal_out.txt] PYTHONPATH=test/esintercept python3 tools/archiver.py
(incubator-ponymail-foal) branch master updated: Not a problem; 3.7 is obsolete
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 4fdbcea Not a problem; 3.7 is obsolete 4fdbcea is described below commit 4fdbceafa3a07e9985e658e3072a352b00f5e4f7 Author: Sebb AuthorDate: Sun Apr 28 12:56:42 2024 +0100 Not a problem; 3.7 is obsolete [skip ci] --- .github/workflows/unittest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 9f8e8cf..43e66cf 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -16,7 +16,7 @@ jobs: max-parallel: 1 matrix: # 3.8 EOL 2024-10 approx -python-version: [3.7, 3.8, "3.10", 3.12] +python-version: [3.8, "3.10", 3.12] steps: - uses: actions/checkout@master @@ -37,8 +37,8 @@ jobs: python -m pip install --upgrade pip pip install -r tools/requirements.txt pip install -r test/requirements.txt -# WARNING: Later versions of html2text cause some tests to fail -# It is not yet clear if this is a testing issue or a genuine problem +# Later versions of html2text cause html-based tests to fail, because of a changed conversion +# This only affects the appearance of the message body, so does not matter for compatibility pip install html2text==2020.1.16 # optional dependency, but needed for tests pip list - name: Check versions
Re: [ANNOUNCE] Apache Baremaps 0.7.3 (incubating) released
On Sun, 28 Apr 2024 at 10:48, Bertil Chapuis wrote: > > Thanks a lot for taking the time to check the announcement. I cross checked > everything during the vote and then let my guard down for the announcement. > > I now fixed the template for the announcement on our GitHub repository: > https://github.com/apache/incubator-baremaps/blob/9bb6650142a380f91f4294ed63e53df84001bef3/RELEASE.md?plain=1#L161 The link to https://www.apache.org/dyn/closer.lua/incubator/baremaps// is not appropriate for an announce email, and is superfluous as the link is on the download page, > I also updated the download page to fix the copy paste error: > https://baremaps.apache.org/download/release-0.7.3 ACK > hopefully, our next release will go smoothly. > > > > On 28 Apr 2024, at 00:33, sebb wrote: > > > > On Sat, 27 Apr 2024 at 21:17, Bertil Chapuis wrote: > >> > >> Hello Everyone, > >> > >> The Apache Baremaps community is pleased to announce the release of Apache > >> Baremaps 0.7.3 (incubating). Thank you to everyone who contributed to this > >> release. > >> > >> Apache Baremaps is a toolkit and a set of infrastructure components for > >> creating, publishing, and operating online maps. This new release > >> addresses most licensing concerns identified when joining the incubator, > >> which is a significant step for the project. In addition, there is now > >> support for PMTiles, which enables low-cost and low-maintenance map > >> applications. Finally, significant improvements were made to enable the > >> creation of vector tiles from the Daylight Map Distribution. > >> > >> We are looking to grow our community and welcome new contributors. If you > >> are interested in contributing to the project, please contact us on the > >> mailing list or on GitHub. We will be happy to help you get started. > >> > >> The release notes are available here: > >> https://github.com/apache/incubator-baremaps/releases/tag/v0.7.3 > >> > >> The artifacts are available here: > >> https://dist.apache.org/repos/dist/release/incubator/baremaps/0.7.3 > > > > Sorry, but that is not a valid download page. > > > > The dist.apache.org host is only intended for staging a release, and > > is not intended for general downloads. > > Also download pages must have links to KEYS, sigs and hashes, and use > > closer.lua for artifact links. > > > > It looks like the website has a suitable web page here: > > https://baremaps.apache.org/download/release-0.7.3 > > > > Please make sure such pages are used in release announcements! > > > > BTW, the download page has a copy-paste error: there are two instances > > of the text: > > > > "The SHA checksum for the source distribution is available here:" > > > > The second instance actually relates to the binary distribution. > > Similarly for the PGP signature. > > > >> The hashes of the artifacts are as follows: > >> 3c399626c13e2fc40984d21581a747d6ad2b703c08206ceaf3bf1819551e7a99ca7cfbfae3652de8fa06ccc7a6f06f086277c5ed52574636d8b043f24d85f5cf > >> ./apache-baremaps-0.7.3-incubating-src.tar.gz > >> 3c3213b8cb925eeb67734fbae55369e8c37b6c42cb62f498a62e752b969928e16db522f44e2bf0e8542175e031e9ebe64170bafd97b5cfd3e1636498bf12c15a > >> ./apache-baremaps-0.7.3-incubating-bin.tar.gz > >> > >> The repository is available here: > >> https://github.com/apache/incubator-baremaps > >> > >> The documentation is available here: > >> https://baremaps.apache.org > >> > >> The mailing list is available here: > >> https://lists.apache.org/list.html?d...@baremaps.apache.org > >> > >> The issue tracker is available here: > >> https://github.com/apache/incubator-baremaps/issues > >> > >> Best regards, > >> > >> Bertil Chapuis > >> - > >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > >> For additional commands, e-mail: general-h...@incubator.apache.org > >> > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@baremaps.apache.org > > For additional commands, e-mail: dev-h...@baremaps.apache.org > > > > - > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
Re: [ANNOUNCE] Apache Baremaps 0.7.3 (incubating) released
On Sun, 28 Apr 2024 at 10:48, Bertil Chapuis wrote: > > Thanks a lot for taking the time to check the announcement. I cross checked > everything during the vote and then let my guard down for the announcement. > > I now fixed the template for the announcement on our GitHub repository: > https://github.com/apache/incubator-baremaps/blob/9bb6650142a380f91f4294ed63e53df84001bef3/RELEASE.md?plain=1#L161 The link to https://www.apache.org/dyn/closer.lua/incubator/baremaps// is not appropriate for an announce email, and is superfluous as the link is on the download page, > I also updated the download page to fix the copy paste error: > https://baremaps.apache.org/download/release-0.7.3 ACK > hopefully, our next release will go smoothly. > > > > On 28 Apr 2024, at 00:33, sebb wrote: > > > > On Sat, 27 Apr 2024 at 21:17, Bertil Chapuis wrote: > >> > >> Hello Everyone, > >> > >> The Apache Baremaps community is pleased to announce the release of Apache > >> Baremaps 0.7.3 (incubating). Thank you to everyone who contributed to this > >> release. > >> > >> Apache Baremaps is a toolkit and a set of infrastructure components for > >> creating, publishing, and operating online maps. This new release > >> addresses most licensing concerns identified when joining the incubator, > >> which is a significant step for the project. In addition, there is now > >> support for PMTiles, which enables low-cost and low-maintenance map > >> applications. Finally, significant improvements were made to enable the > >> creation of vector tiles from the Daylight Map Distribution. > >> > >> We are looking to grow our community and welcome new contributors. If you > >> are interested in contributing to the project, please contact us on the > >> mailing list or on GitHub. We will be happy to help you get started. > >> > >> The release notes are available here: > >> https://github.com/apache/incubator-baremaps/releases/tag/v0.7.3 > >> > >> The artifacts are available here: > >> https://dist.apache.org/repos/dist/release/incubator/baremaps/0.7.3 > > > > Sorry, but that is not a valid download page. > > > > The dist.apache.org host is only intended for staging a release, and > > is not intended for general downloads. > > Also download pages must have links to KEYS, sigs and hashes, and use > > closer.lua for artifact links. > > > > It looks like the website has a suitable web page here: > > https://baremaps.apache.org/download/release-0.7.3 > > > > Please make sure such pages are used in release announcements! > > > > BTW, the download page has a copy-paste error: there are two instances > > of the text: > > > > "The SHA checksum for the source distribution is available here:" > > > > The second instance actually relates to the binary distribution. > > Similarly for the PGP signature. > > > >> The hashes of the artifacts are as follows: > >> 3c399626c13e2fc40984d21581a747d6ad2b703c08206ceaf3bf1819551e7a99ca7cfbfae3652de8fa06ccc7a6f06f086277c5ed52574636d8b043f24d85f5cf > >> ./apache-baremaps-0.7.3-incubating-src.tar.gz > >> 3c3213b8cb925eeb67734fbae55369e8c37b6c42cb62f498a62e752b969928e16db522f44e2bf0e8542175e031e9ebe64170bafd97b5cfd3e1636498bf12c15a > >> ./apache-baremaps-0.7.3-incubating-bin.tar.gz > >> > >> The repository is available here: > >> https://github.com/apache/incubator-baremaps > >> > >> The documentation is available here: > >> https://baremaps.apache.org > >> > >> The mailing list is available here: > >> https://lists.apache.org/list.html?dev@baremaps.apache.org > >> > >> The issue tracker is available here: > >> https://github.com/apache/incubator-baremaps/issues > >> > >> Best regards, > >> > >> Bertil Chapuis > >> - > >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > >> For additional commands, e-mail: general-h...@incubator.apache.org > >> > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@baremaps.apache.org > > For additional commands, e-mail: dev-h...@baremaps.apache.org > > > > - > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@baremaps.apache.org For additional commands, e-mail: dev-h...@baremaps.apache.org
(incubator-ponymail-foal) branch master updated: No need to trigger here
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new c870dc5 No need to trigger here c870dc5 is described below commit c870dc5216301c7844fe709bc169979d51b0bb1b Author: Sebb AuthorDate: Sun Apr 28 08:21:09 2024 +0100 No need to trigger here [skip ci] --- .github/workflows/type-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml index 91b7c96..41632bd 100644 --- a/.github/workflows/type-tests.yml +++ b/.github/workflows/type-tests.yml @@ -4,6 +4,7 @@ on: push: paths-ignore: - '**/integration-tests.yml' + - '**/unittest.yml' - 'test/itest*' workflow_dispatch:
(incubator-ponymail-foal) branch master updated: Temp test fix?
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 5078483 Temp test fix? 5078483 is described below commit 50784830190508ce80240bba0c1d836d669ed649 Author: Sebb AuthorDate: Sun Apr 28 01:25:54 2024 +0100 Temp test fix? --- .github/workflows/unittest.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 4891f9b..9f8e8cf 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -37,7 +37,9 @@ jobs: python -m pip install --upgrade pip pip install -r tools/requirements.txt pip install -r test/requirements.txt -pip install html2text # optional dependency, but needed for tests +# WARNING: Later versions of html2text cause some tests to fail +# It is not yet clear if this is a testing issue or a genuine problem +pip install html2text==2020.1.16 # optional dependency, but needed for tests pip list - name: Check versions run: |
(incubator-ponymail-foal) branch master updated: Show installed
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new ff47237 Show installed ff47237 is described below commit ff47237e2e4045742fbd5343d25a888bb60b30ef Author: Sebb AuthorDate: Sun Apr 28 01:13:32 2024 +0100 Show installed --- .github/workflows/integration-tests.yml | 1 + .github/workflows/unittest.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3a647d9..8ea7174 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -61,6 +61,7 @@ jobs: pip install -r tools/requirements.txt pip install -r server/requirements.txt pip install -r test/requirements.txt +pip list - name: Basic test run: | curl -sq "http://localhost:9200/_cluster/health?level=indices; diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 7f110f7..4891f9b 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -38,6 +38,7 @@ jobs: pip install -r tools/requirements.txt pip install -r test/requirements.txt pip install html2text # optional dependency, but needed for tests +pip list - name: Check versions run: | webui/js/source/build.sh
(incubator-ponymail-foal) branch master updated: Is it an issue with PyYAML
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new b3031fe Is it an issue with PyYAML b3031fe is described below commit b3031fef2b38d0fc08e9c06d10a282126b188363 Author: Sebb AuthorDate: Sun Apr 28 01:08:05 2024 +0100 Is it an issue with PyYAML --- tools/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/requirements.txt b/tools/requirements.txt index 97d0c7b..37264d3 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,6 +1,6 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=6.0.1 ; python_version > "3.7" # MIT -PyYAML~=5.4.1 ; python_version < "3.8" # MIT +PyYAML~=6.0.1 ; python_version > "3.8" # MIT +PyYAML~=5.4.1 ; python_version < "3.9" # MIT # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0
(incubator-ponymail-foal) branch master updated: Try to find where Unit tests fail
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 8e3ebc4 Try to find where Unit tests fail 8e3ebc4 is described below commit 8e3ebc4e6a7d3ea6692959f923a2d4428c7ea87d Author: Sebb AuthorDate: Sun Apr 28 01:03:51 2024 +0100 Try to find where Unit tests fail --- .github/workflows/unittest.yml | 2 +- tools/requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 062f1c4..7f110f7 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -16,7 +16,7 @@ jobs: max-parallel: 1 matrix: # 3.8 EOL 2024-10 approx -python-version: [3.8, "3.10", 3.12] +python-version: [3.7, 3.8, "3.10", 3.12] steps: - uses: actions/checkout@master diff --git a/tools/requirements.txt b/tools/requirements.txt index 9aedca9..97d0c7b 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,5 +1,6 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=6.0.1 # MIT +PyYAML~=6.0.1 ; python_version > "3.7" # MIT +PyYAML~=5.4.1 ; python_version < "3.8" # MIT # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0
(incubator-ponymail-foal) branch master updated: Fix up Python versions
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 949ddf5 Fix up Python versions 949ddf5 is described below commit 949ddf5f0a5dc4e81ae7cbe68c6e4d3e324e9ac5 Author: Sebb AuthorDate: Sun Apr 28 00:29:43 2024 +0100 Fix up Python versions --- .github/workflows/integration-tests.yml | 3 ++- .github/workflows/type-tests.yml| 3 ++- .github/workflows/unittest.yml | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 1062ebd..3a647d9 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -52,7 +52,8 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: -python-version: '3.9' +# 3.12 current as of 2024 +python-version: '3.12' architecture: x64 - name: Install dependencies run: | diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml index 41a6302..91b7c96 100644 --- a/.github/workflows/type-tests.yml +++ b/.github/workflows/type-tests.yml @@ -15,7 +15,8 @@ jobs: strategy: max-parallel: 1 matrix: -python-version: [3.7, 3.9, "3.10"] +# 3.8 EOL 2024-10 approx +python-version: [3.8, "3.10", 3.12] steps: - uses: actions/checkout@master with: diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 1decd10..062f1c4 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -13,11 +13,10 @@ jobs: runs-on: ubuntu-latest strategy: - # Ensure 3.7 runs first max-parallel: 1 matrix: -# python-version: [2.7, 3.5, 3.6, 3.7] -python-version: [3.7, "3.10"] +# 3.8 EOL 2024-10 approx +python-version: [3.8, "3.10", 3.12] steps: - uses: actions/checkout@master
(incubator-ponymail-foal) branch master updated: PyYAML needs updating for current Python
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new ab4bbbf PyYAML needs updating for current Python ab4bbbf is described below commit ab4bbbf26b4917a051d004a3dd5420f536e9eb17 Author: Sebb AuthorDate: Sun Apr 28 00:24:32 2024 +0100 PyYAML needs updating for current Python --- server/requirements.txt | 2 +- tools/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/requirements.txt b/server/requirements.txt index a9ad6f3..7642068 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,5 +1,5 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=5.4.1# WTFPL +PyYAML~=6.0.1# MIT types-PyYAML # AL2.0 multipart~=0.2.1 # MIT elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 diff --git a/tools/requirements.txt b/tools/requirements.txt index 7a70f22..9aedca9 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,5 +1,5 @@ # Items in this file must have a licence compatible with AL 2.0 -PyYAML~=5.4.1 # WTFPL +PyYAML~=6.0.1 # MIT # elasticsearch-dsl>=7.0.0,<8.0.0 # AL2.0 - not used by tools currently # N.B. ES 7.14 introduces strict server version compatibility checks elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0
(incubator-ponymail-foal) branch master updated: Fix server version
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git The following commit(s) were added to refs/heads/master by this push: new 8a9afd9 Fix server version 8a9afd9 is described below commit 8a9afd9e270edab702c16e0b174fc912dfb65797 Author: Sebb AuthorDate: Sun Apr 28 00:05:39 2024 +0100 Fix server version --- server/server_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server_version.py b/server/server_version.py index ad04347..a78d1f6 100644 --- a/server/server_version.py +++ b/server/server_version.py @@ -1,2 +1,2 @@ # This file is generated by server/update_version.sh -PONYMAIL_SERVER_VERSION = '218c4f5' +PONYMAIL_SERVER_VERSION = '4d644b1'
(incubator-ponymail-foal) branch master updated: Type checking fixes
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new 4d644b1 Type checking fixes
4d644b1 is described below
commit 4d644b1058fc015236e68a28f3ff43506d93830a
Author: Sebb
AuthorDate: Sat Apr 27 23:54:05 2024 +0100
Type checking fixes
---
server/plugins/messages.py | 1 +
tools/archiver.py | 2 ++
2 files changed, 3 insertions(+)
diff --git a/server/plugins/messages.py b/server/plugins/messages.py
index 584df4d..7443954 100644
--- a/server/plugins/messages.py
+++ b/server/plugins/messages.py
@@ -558,6 +558,7 @@ class ThreadConstructor:
"""Turns a flat array of emails into a nested structure of threads"""
for cur_email in sorted(self.emails, key=lambda x: x["epoch"]):
author = cur_email.get("from")
+assert(author)
if author not in self.authors:
self.authors[author] = [0, cur_email.get("gravatar", "")]
self.authors[author][0] += 1
diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..96e831a 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -158,6 +158,7 @@ def parse_attachment(
# Allow for empty string
if fd is None:
return None, None
+assert(isinstance(fd, bytes)) # decode=True generates bytes
if filename:
attachment = {
"content_type": part.get_content_type(),
@@ -202,6 +203,7 @@ class Body:
self.bytes = part.get_payload(decode=True)
self.html_as_source = False
if self.bytes is not None:
+assert(isinstance(self.bytes, bytes)) # decode=True generates bytes
valid_encodings = [x for x in self.charsets if x]
if valid_encodings:
for cs in valid_encodings:
Re: [ANNOUNCE] Apache Baremaps 0.7.3 (incubating) released
On Sat, 27 Apr 2024 at 21:17, Bertil Chapuis wrote: > > Hello Everyone, > > The Apache Baremaps community is pleased to announce the release of Apache > Baremaps 0.7.3 (incubating). Thank you to everyone who contributed to this > release. > > Apache Baremaps is a toolkit and a set of infrastructure components for > creating, publishing, and operating online maps. This new release addresses > most licensing concerns identified when joining the incubator, which is a > significant step for the project. In addition, there is now support for > PMTiles, which enables low-cost and low-maintenance map applications. > Finally, significant improvements were made to enable the creation of vector > tiles from the Daylight Map Distribution. > > We are looking to grow our community and welcome new contributors. If you are > interested in contributing to the project, please contact us on the mailing > list or on GitHub. We will be happy to help you get started. > > The release notes are available here: > https://github.com/apache/incubator-baremaps/releases/tag/v0.7.3 > > The artifacts are available here: > https://dist.apache.org/repos/dist/release/incubator/baremaps/0.7.3 Sorry, but that is not a valid download page. The dist.apache.org host is only intended for staging a release, and is not intended for general downloads. Also download pages must have links to KEYS, sigs and hashes, and use closer.lua for artifact links. It looks like the website has a suitable web page here: https://baremaps.apache.org/download/release-0.7.3 Please make sure such pages are used in release announcements! BTW, the download page has a copy-paste error: there are two instances of the text: "The SHA checksum for the source distribution is available here:" The second instance actually relates to the binary distribution. Similarly for the PGP signature. > The hashes of the artifacts are as follows: > 3c399626c13e2fc40984d21581a747d6ad2b703c08206ceaf3bf1819551e7a99ca7cfbfae3652de8fa06ccc7a6f06f086277c5ed52574636d8b043f24d85f5cf > ./apache-baremaps-0.7.3-incubating-src.tar.gz > 3c3213b8cb925eeb67734fbae55369e8c37b6c42cb62f498a62e752b969928e16db522f44e2bf0e8542175e031e9ebe64170bafd97b5cfd3e1636498bf12c15a > ./apache-baremaps-0.7.3-incubating-bin.tar.gz > > The repository is available here: > https://github.com/apache/incubator-baremaps > > The documentation is available here: > https://baremaps.apache.org > > The mailing list is available here: > https://lists.apache.org/list.html?dev@baremaps.apache.org > > The issue tracker is available here: > https://github.com/apache/incubator-baremaps/issues > > Best regards, > > Bertil Chapuis > - > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@baremaps.apache.org For additional commands, e-mail: dev-h...@baremaps.apache.org
Re: [ANNOUNCE] Apache Baremaps 0.7.3 (incubating) released
On Sat, 27 Apr 2024 at 21:17, Bertil Chapuis wrote: > > Hello Everyone, > > The Apache Baremaps community is pleased to announce the release of Apache > Baremaps 0.7.3 (incubating). Thank you to everyone who contributed to this > release. > > Apache Baremaps is a toolkit and a set of infrastructure components for > creating, publishing, and operating online maps. This new release addresses > most licensing concerns identified when joining the incubator, which is a > significant step for the project. In addition, there is now support for > PMTiles, which enables low-cost and low-maintenance map applications. > Finally, significant improvements were made to enable the creation of vector > tiles from the Daylight Map Distribution. > > We are looking to grow our community and welcome new contributors. If you are > interested in contributing to the project, please contact us on the mailing > list or on GitHub. We will be happy to help you get started. > > The release notes are available here: > https://github.com/apache/incubator-baremaps/releases/tag/v0.7.3 > > The artifacts are available here: > https://dist.apache.org/repos/dist/release/incubator/baremaps/0.7.3 Sorry, but that is not a valid download page. The dist.apache.org host is only intended for staging a release, and is not intended for general downloads. Also download pages must have links to KEYS, sigs and hashes, and use closer.lua for artifact links. It looks like the website has a suitable web page here: https://baremaps.apache.org/download/release-0.7.3 Please make sure such pages are used in release announcements! BTW, the download page has a copy-paste error: there are two instances of the text: "The SHA checksum for the source distribution is available here:" The second instance actually relates to the binary distribution. Similarly for the PGP signature. > The hashes of the artifacts are as follows: > 3c399626c13e2fc40984d21581a747d6ad2b703c08206ceaf3bf1819551e7a99ca7cfbfae3652de8fa06ccc7a6f06f086277c5ed52574636d8b043f24d85f5cf > ./apache-baremaps-0.7.3-incubating-src.tar.gz > 3c3213b8cb925eeb67734fbae55369e8c37b6c42cb62f498a62e752b969928e16db522f44e2bf0e8542175e031e9ebe64170bafd97b5cfd3e1636498bf12c15a > ./apache-baremaps-0.7.3-incubating-bin.tar.gz > > The repository is available here: > https://github.com/apache/incubator-baremaps > > The documentation is available here: > https://baremaps.apache.org > > The mailing list is available here: > https://lists.apache.org/list.html?d...@baremaps.apache.org > > The issue tracker is available here: > https://github.com/apache/incubator-baremaps/issues > > Best regards, > > Bertil Chapuis > - > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
(whimsy) branch master updated: Fix up link text once
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 8d2e6e57 Fix up link text once
8d2e6e57 is described below
commit 8d2e6e5794b1c45f82dc542ebb058840e1624438
Author: Sebb
AuthorDate: Sat Apr 27 23:32:39 2024 +0100
Fix up link text once
---
tools/download_check.rb | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index c5c1fc06..27ab7568 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -282,7 +282,8 @@ def get_links(path, body, checkSpaces=false)
if href =~ %r{^?Preferred=https?://}
href = path + URI.decode_www_form_component(href)
end
-text = node.text.gsub(/[[:space:]]+/, ' ').strip
+# Strip spurious text from link (age, baremaps)
+text = node.text.gsub(/[[:space:]]+/, ' ').sub('(opens in a new tab)',
'').sub('➚', '').strip
[href, text] unless href =~ %r{/httpcomponents.+/xdoc/downloads.xml} #
breadcrumb link to source
}.select {|x, _y| x =~ %r{^(https?:)?//} }
end
@@ -581,15 +582,13 @@ def _checkDownloadPage(path, tlp, version)
else
E "Bug: found hash #{h} for missing artifact #{stem}"
end
- t.sub!('➚', '') # age
- t.strip!
next if t == '' # empire-db
tmp = text2ext(t)
next if ext == tmp # i.e. link is just the type or [TYPE]
next if ext == 'sha' and tmp == 'sha1' # historic
next if %w(sha256 md5 mds sha512 sha1).include?(ext) and %w(SHA digest
Digest CheckSum checksums).include?(t) # generic
next if ext == 'mds' and (tmp == 'hashes' or t == 'Digests')
- if base != t
+ unless base == t or h == t # Allow for full path to sig/hash
if t == 'Download' # MXNet
W "Mismatch: #{h} and '#{t}'"
elsif not %w{checksum Hash}.include? t
(incubator-ponymail-foal) branch master updated: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/master by this push:
new f1e458c Regen JS
f1e458c is described below
commit f1e458c9171481628c8d2189377e1ad44dcd756f
Author: Sebb
AuthorDate: Sat Apr 27 11:01:50 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 4 ++--
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
/**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
quote = m[0];
i = quote.length;
t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
qdiv = new HTML('div', {
"class": "email_quote_parent"
}, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -181,9 +181,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch master updated (2dcc8fb -> 6b2b8f7)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 2dcc8fb Merge pull request #243 from raboof/faster-quote-regex add 6b2b8f7 Allow for 3.10 setup issued No new revisions were added by this update. Summary of changes: .github/workflows/type-tests.yml | 2 +- .github/workflows/unittest.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
(incubator-ponymail-foal) branch bad_encoding updated (ffa7c41 -> 492855c)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from ffa7c41 Regen JS add 492855c 3.10 is having issues No new revisions were added by this update. Summary of changes: .github/workflows/type-tests.yml | 2 +- .github/workflows/unittest.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
(incubator-ponymail-foal) 02/02: Regen JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit ffa7c4145fb47c5790749bdabc6774bbe1afb64e
Author: Sebb
AuthorDate: Fri Apr 26 23:41:21 2024 +0100
Regen JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 4 ++--
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
/**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
quote = m[0];
i = quote.length;
t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
qdiv = new HTML('div', {
"class": "email_quote_parent"
}, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -181,9 +181,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch bad_encoding created (now ffa7c41)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch bad_encoding in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git at ffa7c41 Regen JS This branch includes the following new commits: new 1164bf8 Skip bad encoding new ffa7c41 Regen JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(incubator-ponymail-foal) 01/02: Skip bad encoding
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 1164bf8661232365286dcb27ed157246eb704146
Author: Sebb
AuthorDate: Fri Apr 26 23:40:05 2024 +0100
Skip bad encoding
---
tools/archiver.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..89d7af1 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -211,6 +211,9 @@ class Body:
break
except UnicodeDecodeError:
pass
+except LookupError:
+print("Body detected invalid encoding: %s" % cs)
+pass
# If no character set was defined, the email MUST be US-ASCII by
RFC822 defaults
# This isn't always the case, as we're about to discover.
if not self.string:
@@ -428,7 +431,7 @@ class Archiver(object): # N.B. Also used by import-mbox.py
):
first_html = Body(part)
except Exception as err:
-print(err)
+print("Failed to extract Body: %s" % err)
# this requires a GPL lib, user will have to install it themselves
if first_html and (
(commons-net) branch master updated: Try to fix Java8/macOS/M1 issue
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git The following commit(s) were added to refs/heads/master by this push: new 18b57a22 Try to fix Java8/macOS/M1 issue 18b57a22 is described below commit 18b57a22d4e8884023d9b07a1d107a0e931eff0a Author: Sebb AuthorDate: Fri Apr 26 17:57:47 2024 +0100 Try to fix Java8/macOS/M1 issue --- .github/workflows/maven.yml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 18ecc60b..b6cd4531 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,8 +41,12 @@ jobs: # Don't need to run all javas on all OSes include: - java: 8 -os: macos-latest +os: macos-13 experimental: false + - java: 8 +# Java 8 not currently available +os: macos-latest +experimental: true - java: 8 os: windows-latest experimental: false
(whimsy) branch master updated: Oops
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 89f4152e Oops
89f4152e is described below
commit 89f4152866ea985fa4b618c963673336cd58
Author: Sebb
AuthorDate: Fri Apr 26 11:09:33 2024 +0100
Oops
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 3657a26c..41adc6f5 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -163,7 +163,7 @@ def parse(id, site, name, podling=false)
if a_href =~ %r{^https?://} # no need to rebase this
site2 = URI.parse(a_href.gsub(' ','%20').gsub('|', '%7C')) # needs
to be a URI
else
- site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C') # HACK
+ site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C')) # HACK
end
if site2.host == uri.host and site2.path.size > 2
subpages[site2.to_s] = a
(whimsy) branch master updated: Alloe for more special chars
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 284e4efa Alloe for more special chars
284e4efa is described below
commit 284e4efac417fde8866233299fd6e02574adaa3a
Author: Sebb
AuthorDate: Fri Apr 26 09:12:23 2024 +0100
Alloe for more special chars
---
tools/site-scan.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 3790ee23..3657a26c 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -161,9 +161,9 @@ def parse(id, site, name, podling=false)
unless a_href =~ %r{^(#|mailto:)}
begin
if a_href =~ %r{^https?://} # no need to rebase this
- site2 = URI.parse(a_href) # needs to be a URI
+ site2 = URI.parse(a_href.gsub(' ','%20').gsub('|', '%7C')) # needs
to be a URI
else
- site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
+ site2 = URI.join(site,a_href.gsub(' ','%20').gsub('|', '%7C') # HACK
end
if site2.host == uri.host and site2.path.size > 2
subpages[site2.to_s] = a
(commons-net) branch master updated: Bump actions/checkout from 4.1.2 to 4.1.4 (#245)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new d4883d39 Bump actions/checkout from 4.1.2 to 4.1.4 (#245)
d4883d39 is described below
commit d4883d39faf7f76b5afecd10b5f6c9bb701da6ff
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 26 08:56:14 2024 +0100
Bump actions/checkout from 4.1.2 to 4.1.4 (#245)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to
4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/actions/checkout/compare/9bb56186c3b09b4f86b1c65136769dd318469633...0ad4b8fadaa221de15dcec353f45205ec38ea70b)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/coverage.yml| 2 +-
.github/workflows/maven.yml | 2 +-
.github/workflows/maven_adhoc.yml | 2 +-
.github/workflows/scorecards-analysis.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 50415fa7..dfa2ee7c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
steps:
- name: Checkout repository
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+ uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
persist-credentials: false
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 87738a37..72a80bcb 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -38,7 +38,7 @@ jobs:
java: [ 8 ]
steps:
-- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
persist-credentials: false
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 66976c7b..18ecc60b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -57,7 +57,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
-- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
persist-credentials: false
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
diff --git a/.github/workflows/maven_adhoc.yml
b/.github/workflows/maven_adhoc.yml
index 5c59274c..f8aa3383 100644
--- a/.github/workflows/maven_adhoc.yml
+++ b/.github/workflows/maven_adhoc.yml
@@ -25,7 +25,7 @@ jobs:
timeout-minutes: 7
runs-on: windows-latest
steps:
-- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
persist-credentials: false
- name: Set up JDK
diff --git a/.github/workflows/scorecards-analysis.yml
b/.github/workflows/scorecards-analysis.yml
index 1f4b2bc6..ef70c0f8 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -42,7 +42,7 @@ jobs:
steps:
- name: "Checkout code"
-uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 #
v4.1.2
+uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #
v4.1.4
with:
persist-credentials: false
(commons-net) branch master updated: Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#247)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git The following commit(s) were added to refs/heads/master by this push: new 1277bf24 Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#247) 1277bf24 is described below commit 1277bf24edd8e7a92af4500516aa41051744b385 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 26 08:55:32 2024 +0100 Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#247) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/1746f4ab65b179e0ea60a494b83293b640dd5bba...65462800fd760344b1a7b4382951275a0abb4808) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 74e892e8..1f4b2bc6 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -59,7 +59,7 @@ jobs: publish_results: true - name: "Upload artifact" -uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2 +uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: SARIF file path: results.sarif
(commons-net) branch master updated (fe2f05ad -> 5023c856)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git from fe2f05ad Merge pull request #244 from apache/dependabot/github_actions/actions/upload-artifact-4.3.2 add 5023c856 Don't fail if retry succeeds; log instead (#218) No new revisions were added by this update. Summary of changes: .github/workflows/maven_adhoc.yml | 19 ++- .../apache/commons/net/tftp/TFTPServerPathTest.java | 4 +++- 2 files changed, 17 insertions(+), 6 deletions(-)
(commons-net) branch master updated: Bump github/codeql-action from 3.25.1 to 3.25.3 (#246)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push:
new b0decf3e Bump github/codeql-action from 3.25.1 to 3.25.3 (#246)
b0decf3e is described below
commit b0decf3ebb5a0635bc36006ba5ef48b8f735babb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 26 08:56:36 2024 +0100
Bump github/codeql-action from 3.25.1 to 3.25.3 (#246)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from
3.25.1 to 3.25.3.
- [Release notes](https://github.com/github/codeql-action/releases)
-
[Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/github/codeql-action/compare/c7f9125735019aa87cfc361530512d50ea439c71...d39d31e687223d841ef683f52467bd88e9b21c14)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 6 +++---
.github/workflows/scorecards-analysis.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index dfa2ee7c..bcd33510 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -62,7 +62,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71
# 3.25.1
+ uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14
# 3.25.3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
config file.
@@ -73,7 +73,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually
(see below)
- name: Autobuild
- uses:
github/codeql-action/autobuild@c7f9125735019aa87cfc361530512d50ea439c71#
3.25.1
+ uses:
github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14#
3.25.3
# ℹ️ Command-line programs to run using the OS shell.
# https://git.io/JvXDl
@@ -87,4 +87,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses:
github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71#
3.25.1
+ uses:
github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14#
3.25.3
diff --git a/.github/workflows/scorecards-analysis.yml
b/.github/workflows/scorecards-analysis.yml
index ef70c0f8..e68f7763 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -66,6 +66,6 @@ jobs:
retention-days: 5
- name: "Upload to code-scanning"
-uses:
github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71#
3.25.1
+uses:
github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14#
3.25.3
with:
sarif_file: results.sarif
(commons-net) branch logretry deleted (was 981ba87c)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch logretry in repository https://gitbox.apache.org/repos/asf/commons-net.git was 981ba87c Try more times The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(incubator-ponymail-foal) 02/02: Rebuild JS
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 3635a88135347960cce05cc99be732bab47a8a32
Author: Sebb
AuthorDate: Fri Apr 26 00:21:30 2024 +0100
Rebuild JS
---
webui/admin.html | 8
webui/index.html | 6 +++---
webui/js/ponymail.js | 4 ++--
webui/list.html | 8
webui/oauth.html | 8
webui/thread.html| 8
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -79,9 +79,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -63,8 +63,8 @@ the License. -->
-
-
+
+
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
/**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
quote = m[0];
i = quote.length;
t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
qdiv = new HTML('div', {
"class": "email_quote_parent"
}, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
-
+
@@ -181,9 +181,9 @@ the License. -->
-
-
-
+
+
+
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet"
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet"
media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js"
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
-
-
-
+
+
+
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
-
+
@@ -97,9 +97,9 @@ the License. -->
-
-
-
+
+
+
(incubator-ponymail-foal) branch drydump updated (95b8a40 -> 3635a88)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch drydump in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git from 95b8a40 Fix old versions new 22455c9 Fix version again new 3635a88 Rebuild JS The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/integration-tests.yml | 2 +- .github/workflows/type-tests.yml| 2 +- .github/workflows/unittest.yml | 2 +- webui/admin.html| 8 webui/index.html| 6 +++--- webui/js/ponymail.js| 4 ++-- webui/list.html | 8 webui/oauth.html| 8 webui/thread.html | 8 9 files changed, 24 insertions(+), 24 deletions(-)
(incubator-ponymail-foal) 01/02: Fix version again
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 22455c954845611c64c41f232b4193c54b9a69bd
Author: Sebb
AuthorDate: Fri Apr 26 00:20:08 2024 +0100
Fix version again
---
.github/workflows/integration-tests.yml | 2 +-
.github/workflows/type-tests.yml| 2 +-
.github/workflows/unittest.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/integration-tests.yml
b/.github/workflows/integration-tests.yml
index 0444a42..0288555 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -50,7 +50,7 @@ jobs:
with:
persist-credentials: false
- name: Setup python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: x64
diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 687c428..d3a828c 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -21,7 +21,7 @@ jobs:
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 32d9350..b4bc938 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -29,7 +29,7 @@ jobs:
repository: apache/incubator-ponymail-unit-tests
path: pmtests
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
(incubator-ponymail-foal) branch drydump updated: Fix old versions
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
The following commit(s) were added to refs/heads/drydump by this push:
new 95b8a40 Fix old versions
95b8a40 is described below
commit 95b8a40e69e6094dc836ea0ec78f10fb70cc6b21
Author: Sebb
AuthorDate: Fri Apr 26 00:14:19 2024 +0100
Fix old versions
---
.github/workflows/integration-tests.yml | 2 +-
.github/workflows/type-tests.yml| 4 ++--
.github/workflows/unittest.yml | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/integration-tests.yml
b/.github/workflows/integration-tests.yml
index 1062ebd..0444a42 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -50,7 +50,7 @@ jobs:
with:
persist-credentials: false
- name: Setup python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: '3.9'
architecture: x64
diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 16cab27..687c428 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -15,13 +15,13 @@ jobs:
strategy:
max-parallel: 1
matrix:
-python-version: ["3.10", 3.7, 3.9]
+python-version: [3.7, 3.9, "3.10"]
steps:
- uses: actions/checkout@master
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 077a395..32d9350 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
- max-parallel: 4
+ max-parallel: 1
matrix:
# python-version: [2.7, 3.5, 3.6, 3.7]
python-version: [3.7, "3.10"]
@@ -29,7 +29,7 @@ jobs:
repository: apache/incubator-ponymail-unit-tests
path: pmtests
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
(incubator-ponymail-foal) 01/01: Allow dump with dryrun
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 9e6dfefa7497b7770db114ab30bd28092f15fe85
Author: Sebb
AuthorDate: Fri Apr 26 00:04:56 2024 +0100
Allow dump with dryrun
---
tools/archiver.py | 44 +---
1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..519f1cb 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -645,6 +645,28 @@ class Archiver(object): # N.B. Also used by import-mbox.py
return output_json, contents, msg_metadata, irt, False
+def dump_message(self, dump, ojson, msg_metadata, raw_message, contents):
+uid = uuid.uuid4()
+mbox_path = os.path.join(dump, "%s.json" % uid)
+print("Dumping data to %s" % mbox_path)
+with open(mbox_path, "w") as f:
+json.dump(
+{
+"id": ojson["mid"],
+"mbox": ojson,
+"mbox_source": {
+"id": ojson["dbid"],
+"permalink": ojson["mid"],
+"message-id": msg_metadata["message-id"],
+"source": mbox_source(raw_message),
+},
+"attachments": contents,
+},
+f,
+indent=2,
+)
+f.close()
+
def archive_message(self, mlist, msg, raw_message=None, dry=False,
dump=None, defaultepoch=None, digest=False):
"""Send the message to the archiver.
@@ -687,6 +709,8 @@ class Archiver(object): # N.B. Also used by import-mbox.py
return lid, ojson["mid"]
if dry:
print(" Dry run, not saving message to database *")
+if dump:
+self.dump_message(dump, ojson, msg_metadata, raw_message,
contents)
return lid, ojson["mid"]
if dump:
@@ -764,25 +788,7 @@ class Archiver(object): # N.B. Also used by import-mbox.py
print(
"Pushing to ES failed, but dumponfail specified, dumping
JSON docs"
)
-uid = uuid.uuid4()
-mbox_path = os.path.join(dump, "%s.json" % uid)
-with open(mbox_path, "w") as f:
-json.dump(
-{
-"id": ojson["mid"],
-"mbox": ojson,
-"mbox_source": {
-"id": ojson["dbid"],
-"permalink": ojson["mid"],
-"message-id": msg_metadata["message-id"],
-"source": mbox_source(raw_message),
-},
-"attachments": contents,
-},
-f,
-indent=2,
-)
-f.close()
+self.dump_message(dump, ojson, msg_metadata, raw_message,
contents)
sys.exit(0) # We're exiting here, the rest can't be done
without ES
# otherwise fail as before
raise err
(incubator-ponymail-foal) branch drydump created (now 9e6dfef)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch drydump in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git at 9e6dfef Allow dump with dryrun This branch includes the following new commits: new 9e6dfef Allow dump with dryrun The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(whimsy) branch master updated: Fix up stale credentials
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new 1810b574 Fix up stale credentials 1810b574 is described below commit 1810b574daf4f48d64662da525f880f4766dd0c2 Author: Sebb AuthorDate: Thu Apr 25 17:22:36 2024 +0100 Fix up stale credentials --- docker-config/25-authz_ldap_group_membership.conf | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-config/25-authz_ldap_group_membership.conf b/docker-config/25-authz_ldap_group_membership.conf index 1ce8054e..1680b2a3 100644 --- a/docker-config/25-authz_ldap_group_membership.conf +++ b/docker-config/25-authz_ldap_group_membership.conf @@ -59,8 +59,8 @@ # LDAP alias: infrastructure AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0 @@ -69,8 +69,8 @@ # LDAP alias: apldap AuthLDAPUrl "ldaps://ldap-us.apache.org:636 ldap-eu.apache.org:636/ou=people,dc=apache,dc=org?uid" - AuthLDAPBindDN cn=nss_p6,ou=users,ou=services,dc=apache,dc=org - AuthLDAPBindPassword "exec:/usr/bin/asfldapsearch --pwd" + AuthLDAPBindDN <%= ldapbinddn %> + AuthLDAPBindPassword "<%= ldapbindpw %>" AuthLDAPGroupAttribute member AuthLDAPGroupAttributeIsDN on AuthLDAPMaxSubGroupDepth 0
Re: Missing Incubator disclaimer text
On Thu, 25 Apr 2024 at 16:56, tison wrote: > > Thanks for your explanation and good catch. I sent [1] to improve the case > here and it should be resolved now. > > [1] https://github.com/apache/incubator-streampark-website/pull/351 > > To search other pages, perhaps you can try to read the /sitemap.xml file to > find pages. Although I can see some hidden pages are included in > StreamPark's sitemap.xml, it's an issue of the project, not the approach to > walk through all the pages by sitemap.xml. The intention is to check a few pages other than the main page. If any pages don't have disclaimers, then it is likely that there are others without disclaimers. Once alerted to this, it is expected that podlings will take responsibility to follow through and check all their pages. Note also that not all podlings have a sitemap.xml file > Best, > tison. > > > sebb 于2024年4月25日周四 22:43写道： > > > On Thu, 25 Apr 2024 at 15:18, tison wrote: > > > > > > > The array is a list of pages in which the disclaimer could not be > > found. > > > > > > I do a quick check for the podlings I'm familiar with: > > > > > > For StreamPark, it reports: > > >"disclaimers": [ > > > 14, > > > [ > > > "https://streampark.incubator.apache.org/team;, > > > "https://streampark.incubator.apache.org/user; > > > ] > > > ] > > > But both pages should have the disclaimer at the footer. > > > > The checker does not currently support pages generated by Javascript. > > > > Those pages display as completely empty if Javascript is not enabled; > > that is not very friendly. > > > > > > > > For Fury, Answer, and HoraeDB, the result seems correct. It reports that > > > HoraeDB doesn't have the DISCLAIMER on all of its pages; this is the > > > case. I'll reach out to them to resolve this. > > > > > > I mentor a new podling GraphAr, which seems missing in the report. > > > > > > Best, > > > tison. > > > > > > > > > sebb 于2024年4月25日周四 22:11写道： > > > > > > > On Wed, 24 Apr 2024 at 13:05, tison wrote: > > > > > > > > > > Hi Sebb, > > > > > > > > > > > quite a few podlings where the text is only present on some of the > > web > > > > > pages > > > > > > > > > > [1] you refers writes: > > > > > > > > > > >> Podling web sites MUST include a clear disclaimer on their website > > > > > > > > > > So, IMO it's clear that every page should contain such info > > (typically as > > > > > part of the footer). If you find any podling violates this policy, > > you > > > > can > > > > > name them and I'd like to give a look. > > > > > > > > I updated the Whimsy site scanner to report on top-level links to > > > > podling pages which don't appear to have the disclaimer. > > > > This does not yet appear in the Whimsy podlings report, but the raw > > > > data is in the JSON file at > > > > > > > > https://whimsy.apache.org/public/pods-scan.json > > > > > > > > Search for "disclaimers", e.g. > > > > > > > > "disclaimers": [ > > > > 1, > > > > [ > > > > "https://hugegraph.incubator.apache.org/docs/;, > > > > " > > https://hugegraph.incubator.apache.org/docs/download/download/;, > > > > "https://hugegraph.incubator.apache.org/community/; > > > > ] > > > > > > > > The initial number (1 above) is the count of references that do appear > > > > to have the disclaimer. > > > > The array is a list of pages in which the disclaimer could not be > > found. > > > > > > > > In the above case, I think they all need the disclaimer, but there may > > > > be some cases where it is not appropriate. > > > > > > > > > For the podlings I participate in, I spread the docu template [2] to > > > > ensure > > > > > that this policy is followed. > > > > > > > > > > [2] > > > > > > > > > > > https://github.com/apache/apache-website-template/blob/f8129ca66fdff1c97e0749eb2ed319f1739f6f34/docusaurus.config.ts#L137 > > > > > > > > > > > and in a
Re: Missing Incubator disclaimer text
On Thu, 25 Apr 2024 at 15:18, tison wrote: > > > The array is a list of pages in which the disclaimer could not be found. > > I do a quick check for the podlings I'm familiar with: > > For StreamPark, it reports: >"disclaimers": [ > 14, > [ > "https://streampark.incubator.apache.org/team;, > "https://streampark.incubator.apache.org/user; > ] > ] > But both pages should have the disclaimer at the footer. The checker does not currently support pages generated by Javascript. Those pages display as completely empty if Javascript is not enabled; that is not very friendly. > > For Fury, Answer, and HoraeDB, the result seems correct. It reports that > HoraeDB doesn't have the DISCLAIMER on all of its pages; this is the > case. I'll reach out to them to resolve this. > > I mentor a new podling GraphAr, which seems missing in the report. > > Best, > tison. > > > sebb 于2024年4月25日周四 22:11写道： > > > On Wed, 24 Apr 2024 at 13:05, tison wrote: > > > > > > Hi Sebb, > > > > > > > quite a few podlings where the text is only present on some of the web > > > pages > > > > > > [1] you refers writes: > > > > > > >> Podling web sites MUST include a clear disclaimer on their website > > > > > > So, IMO it's clear that every page should contain such info (typically as > > > part of the footer). If you find any podling violates this policy, you > > can > > > name them and I'd like to give a look. > > > > I updated the Whimsy site scanner to report on top-level links to > > podling pages which don't appear to have the disclaimer. > > This does not yet appear in the Whimsy podlings report, but the raw > > data is in the JSON file at > > > > https://whimsy.apache.org/public/pods-scan.json > > > > Search for "disclaimers", e.g. > > > > "disclaimers": [ > > 1, > > [ > > "https://hugegraph.incubator.apache.org/docs/;, > > "https://hugegraph.incubator.apache.org/docs/download/download/;, > > "https://hugegraph.incubator.apache.org/community/; > > ] > > > > The initial number (1 above) is the count of references that do appear > > to have the disclaimer. > > The array is a list of pages in which the disclaimer could not be found. > > > > In the above case, I think they all need the disclaimer, but there may > > be some cases where it is not appropriate. > > > > > For the podlings I participate in, I spread the docu template [2] to > > ensure > > > that this policy is followed. > > > > > > [2] > > > > > https://github.com/apache/apache-website-template/blob/f8129ca66fdff1c97e0749eb2ed319f1739f6f34/docusaurus.config.ts#L137 > > > > > > > and in announcement emails > > > > > > This sounds like a new sentence to me. Have we ever had a consensus > > before? > > > I agree that such a policy can help convey the project's status more > > > clearly, and it won't be difficult to add such a section in the > > > announcement email. Most of the podlings may be unaware of this point, > > and > > > I didn't hear about this before. > > > > > > Best, > > > tison. > > > > > > > > > sebb 于2024年4月24日周三 15:58写道： > > > > > > > My understanding is that the Incubator disclaimer text [1] should be > > > > present on all website pages and in announcement emails, so consumers > > > > are clear about the status of the software. > > > > > > > > However there are quite a few podlings where the text is only present > > > > on some of the web pages, and most announce emails don't include the > > > > disclaimer. > > > > > > > > Note that unlike licensing issues, which can be sorted out during > > > > incubation, this is something that must be addressed from the very > > > > beginning. > > > > > > > > Sebb > > > > [1] https://incubator.apache.org/guides/branding.html#disclaimers > > > > > > > > - > > > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > > > > > > > > > - > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
(whimsy) branch master updated: Fix file name
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new cb97709c Fix file name
cb97709c is described below
commit cb97709c1100d9865d1adb904f1b274e926fddc8
Author: Sebb
AuthorDate: Thu Apr 25 15:27:42 2024 +0100
Fix file name
---
lib/whimsy/asf/committee.rb | 4 ++--
www/test/dataflow.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/whimsy/asf/committee.rb b/lib/whimsy/asf/committee.rb
index a2402194..0e9f0e74 100644
--- a/lib/whimsy/asf/committee.rb
+++ b/lib/whimsy/asf/committee.rb
@@ -305,9 +305,9 @@ module ASF
contents
end
-# record termination date in committee-info.yml
+# record termination date in committee-info.yaml
# Params:
-# - input: the contents of committee-info.yml
+# - input: the contents of committee-info.yaml
# - pmc: the pmc name
# - mm: -MM retirement date
# Returns: the updated contents
diff --git a/www/test/dataflow.json b/www/test/dataflow.json
index cac408a4..098ea569 100644
--- a/www/test/dataflow.json
+++ b/www/test/dataflow.json
@@ -19,7 +19,7 @@
"maintainer": "/www/roster/public_committee_info.rb",
"sources": [
"/lib/whimsy/asf/committee.rb",
- "private/committers/board/committee-info.yml"
+ "private/committers/board/committee-info.yaml"
]
},
"https://whimsy.apache.org/public/icla-info.json": {
Re: Missing Incubator disclaimer text
On Wed, 24 Apr 2024 at 13:05, tison wrote: > > Hi Sebb, > > > quite a few podlings where the text is only present on some of the web > pages > > [1] you refers writes: > > >> Podling web sites MUST include a clear disclaimer on their website > > So, IMO it's clear that every page should contain such info (typically as > part of the footer). If you find any podling violates this policy, you can > name them and I'd like to give a look. I updated the Whimsy site scanner to report on top-level links to podling pages which don't appear to have the disclaimer. This does not yet appear in the Whimsy podlings report, but the raw data is in the JSON file at https://whimsy.apache.org/public/pods-scan.json Search for "disclaimers", e.g. "disclaimers": [ 1, [ "https://hugegraph.incubator.apache.org/docs/;, "https://hugegraph.incubator.apache.org/docs/download/download/;, "https://hugegraph.incubator.apache.org/community/; ] The initial number (1 above) is the count of references that do appear to have the disclaimer. The array is a list of pages in which the disclaimer could not be found. In the above case, I think they all need the disclaimer, but there may be some cases where it is not appropriate. > For the podlings I participate in, I spread the docu template [2] to ensure > that this policy is followed. > > [2] > https://github.com/apache/apache-website-template/blob/f8129ca66fdff1c97e0749eb2ed319f1739f6f34/docusaurus.config.ts#L137 > > > and in announcement emails > > This sounds like a new sentence to me. Have we ever had a consensus before? > I agree that such a policy can help convey the project's status more > clearly, and it won't be difficult to add such a section in the > announcement email. Most of the podlings may be unaware of this point, and > I didn't hear about this before. > > Best, > tison. > > > sebb 于2024年4月24日周三 15:58写道： > > > My understanding is that the Incubator disclaimer text [1] should be > > present on all website pages and in announcement emails, so consumers > > are clear about the status of the software. > > > > However there are quite a few podlings where the text is only present > > on some of the web pages, and most announce emails don't include the > > disclaimer. > > > > Note that unlike licensing issues, which can be sorted out during > > incubation, this is something that must be addressed from the very > > beginning. > > > > Sebb > > [1] https://incubator.apache.org/guides/branding.html#disclaimers > > > > - > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > - To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
(whimsy) 02/02: Show anchor for error URLs
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 736aa0fdc2d4517b1e8617b17bc7ee061f1cbdda
Author: Sebb
AuthorDate: Thu Apr 25 14:00:51 2024 +0100
Show anchor for error URLs
---
tools/site-scan.rb | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 1a907412..3790ee23 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -7,7 +7,6 @@
#
# Makes no value judgements. Simply extracts raw data for offline analysis.
$LOAD_PATH.unshift '/srv/whimsy/lib'
-require 'set'
require 'net/http'
require 'nokogiri'
require 'json'
@@ -103,7 +102,7 @@ def parse(id, site, name, podling=false)
end
data[:uri] = uri.to_s
- subpages = Set.new
+ subpages = Hash.new
# FIRST: scan each link's a_href to see if we need to capture it
# also capture script src for events, and some page refs for podlings
doc.traverse do |a|
@@ -167,7 +166,7 @@ def parse(id, site, name, podling=false)
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
if site2.host == uri.host and site2.path.size > 2
- subpages.add site2.to_s
+ subpages[site2.to_s] = a
end
rescue StandardError => e
$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
@@ -205,7 +204,7 @@ def parse(id, site, name, podling=false)
if podling
hasdisclaimer = 0
nodisclaimer = []
-subpages.each do |subpage|
+subpages.each do |subpage, anchor|
begin
uri, response, status = $cache.get(subpage)
if uri&.to_s == subpage or uri&.to_s == subpage + '/'
@@ -219,6 +218,8 @@ def parse(id, site, name, podling=false)
else
nodisclaimer << subpage
end
+else
+ $stderr.puts "#{id} #{subpage} => #{uri} #{status}
'#{anchor.text.strip}'"
end
rescue URI::InvalidURIError
end
(whimsy) branch master updated (83488587 -> 736aa0fd)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git from 83488587 Show error text new ce25fdac Don't show trivial URL changes new 736aa0fd Show anchor for error URLs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: tools/site-scan.rb | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-)
Broken link
https://github.com/apache/incubator-nlpcraft-website/blob/0fc0885c66932fbd3319e642499d47ddcdef674b/_data/news.yml#L27
(whimsy) 01/02: Don't show trivial URL changes
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit ce25fdaca37a7c627e9dc72362bdd1a04eb42425
Author: Sebb
AuthorDate: Thu Apr 25 13:46:07 2024 +0100
Don't show trivial URL changes
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9877fb58..1a907412 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -208,7 +208,11 @@ def parse(id, site, name, podling=false)
subpages.each do |subpage|
begin
uri, response, status = $cache.get(subpage)
-puts "#{id} #{subpage} => #{uri} #{status}" # uri might be nil
+if uri&.to_s == subpage or uri&.to_s == subpage + '/'
+ puts "#{id} #{uri} #{status}"
+else
+ puts "#{id} #{subpage} => #{uri} #{status}"
+end
if %w{unchanged recent updated}.include? status
if response =~
SiteStandards::PODLING_CHECKS['disclaimer'][SiteStandards::CHECK_CAPTURE]
hasdisclaimer += 1
Broken link "Teaclave SGX SDK"
https://github.com/apache/incubator-teaclave-website/blob/fd8047a66a69e2710926ea6c4fd19e8d33ef56a6/site/.vuepress/config.js#L46 - To unsubscribe, e-mail: dev-unsubscr...@teaclave.apache.org For additional commands, e-mail: dev-h...@teaclave.apache.org
(whimsy) branch master updated: Show error text
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 83488587 Show error text
83488587 is described below
commit 83488587ec6ced95e8c31be86b99082e0c7ab202
Author: Sebb
AuthorDate: Thu Apr 25 13:26:12 2024 +0100
Show error text
---
tools/site-scan.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 96d1d2bd..9877fb58 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -169,8 +169,8 @@ def parse(id, site, name, podling=false)
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
- rescue StandardError
-$stderr.puts "#{id}: Bad a_href #{a_href}"
+ rescue StandardError => e
+$stderr.puts "#{id}: Bad a_href #{a_href} #{e}"
end
end
end
(whimsy) branch master updated: Needs to be a URI
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 8ac7efea Needs to be a URI
8ac7efea is described below
commit 8ac7efea44f494d0372aa386a992e41307fcf5e7
Author: Sebb
AuthorDate: Thu Apr 25 13:17:39 2024 +0100
Needs to be a URI
---
tools/site-scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 92255621..96d1d2bd 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -162,7 +162,7 @@ def parse(id, site, name, podling=false)
unless a_href =~ %r{^(#|mailto:)}
begin
if a_href =~ %r{^https?://} # no need to rebase this
- site2 = a_href
+ site2 = URI.parse(a_href) # needs to be a URI
else
site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
end
(whimsy) branch master updated: Have to do it ourselves now
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new df051701 Have to do it ourselves now
df051701 is described below
commit df05170108f8776f9bcb6fe64b4bb48b6e48f9c3
Author: Sebb
AuthorDate: Thu Apr 25 13:11:03 2024 +0100
Have to do it ourselves now
---
.github/workflows/unittestlib.yml | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index eb1ed68a..5653624a 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -15,8 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
-# Subversion not currently present on macos-13+
-os: [macos-12, ubuntu-20.04, ubuntu-22.04]
+os: [macos-latest, ubuntu-20.04, ubuntu-22.04]
ruby: [2.7, 3.1]
# 2.7 not supported on 22.04
exclude:
@@ -24,13 +23,17 @@ jobs:
ruby: 2.7
runs-on: ${{ matrix.os }}
steps:
-- name: setup # needed for installing ruby-ldap
+- name: setup non-macOS # needed for installing ruby-ldap
run: |
sudo apt-get update
sudo apt-get install libldap2-dev
sudo apt-get install libsasl2-dev
sudo apt-get install libyaml-dev # seems to be needed for installing
ruby since psych 5.0.0 release
- if: matrix.os != 'macos-latest'
+ if: ${{ runner.os != 'macOS' }}
+- name: setup macos
+ run: |
+brew install subversion
+ if: ${{ runner.os == 'macOS' }}
- uses: actions/checkout@v3
with:
persist-credentials: false
(whimsy) branch master updated: Tidy up matched text
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 6d03c8b5 Tidy up matched text
6d03c8b5 is described below
commit 6d03c8b53bba67c25e375ba460121978fb94652d
Author: Sebb
AuthorDate: Thu Apr 25 13:01:04 2024 +0100
Tidy up matched text
---
tools/download_check.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index b62d3135..c5c1fc06 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -488,8 +488,10 @@ def _checkDownloadPage(path, tlp, version)
hasGPGverify = false
# Check if GPG verify has two parameters
- body.scan(%r{^.+gpg --verify.+$}) { |m|
+ body.scan(%r{gpg --verify.+$}) { |m|
hasGPGverify = true
+# Hack to tidy matched text: drop spans and truncate at or
+m.gsub!(%r{]+>|}, '').sub!(%r{(https://www.apache.org/info/verification.html#specify_both;
end
(whimsy) branch master updated: Allow for missing Subversion
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git The following commit(s) were added to refs/heads/master by this push: new d53c6b39 Allow for missing Subversion d53c6b39 is described below commit d53c6b39da4b873b9e901f3c4c5b29c1e7c1924d Author: Sebb AuthorDate: Thu Apr 25 12:33:36 2024 +0100 Allow for missing Subversion --- .github/workflows/unittestlib.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unittestlib.yml b/.github/workflows/unittestlib.yml index aea0ee98..eb1ed68a 100644 --- a/.github/workflows/unittestlib.yml +++ b/.github/workflows/unittestlib.yml @@ -15,7 +15,8 @@ jobs: strategy: fail-fast: false matrix: -os: [macos-latest, ubuntu-20.04, ubuntu-22.04] +# Subversion not currently present on macos-13+ +os: [macos-12, ubuntu-20.04, ubuntu-22.04] ruby: [2.7, 3.1] # 2.7 not supported on 22.04 exclude:
(whimsy) branch master updated: Match new log messages
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new a9a500d0 Match new log messages
a9a500d0 is described below
commit a9a500d08869af4185986194e9c255726a199dea
Author: Sebb
AuthorDate: Thu Apr 25 11:41:25 2024 +0100
Match new log messages
---
www/status/monitors/site_scan.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/status/monitors/site_scan.rb b/www/status/monitors/site_scan.rb
index 4fcca158..d2cca96d 100644
--- a/www/status/monitors/site_scan.rb
+++ b/www/status/monitors/site_scan.rb
@@ -20,7 +20,7 @@ def Monitor.site_scan(previous_status)
log = File.read(logfile)
# Drop standard cache info
- log.gsub! /^([-\w]+ )*https?:\S+ \w+\n/, ''
+ log.gsub! /^([-\w]+ )*https?:\S+ (=> \S* )?\w+\n/, ''
# Drop other info (must agree with scanner script)
log.gsub! %r{^(Started|Ended|Events):.+\n}, '' # drop 'Events: already have'
(whimsy) branch master updated: Fix up relative links
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 591e32cb Fix up relative links
591e32cb is described below
commit 591e32cb2af5384522663ce3c573bd12326f1396
Author: Sebb
AuthorDate: Thu Apr 25 11:20:31 2024 +0100
Fix up relative links
---
tools/site-scan.rb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/site-scan.rb b/tools/site-scan.rb
index 9e2c614d..92255621 100755
--- a/tools/site-scan.rb
+++ b/tools/site-scan.rb
@@ -161,7 +161,11 @@ def parse(id, site, name, podling=false)
end
unless a_href =~ %r{^(#|mailto:)}
begin
-site2 = URI.join(site,a_href.gsub(' ','+'))
+if a_href =~ %r{^https?://} # no need to rebase this
+ site2 = a_href
+else
+ site2 = URI.join(site,a_href.gsub(' ','%20')) # HACK
+end
if site2.host == uri.host and site2.path.size > 2
subpages.add site2.to_s
end
