You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2022/02/04 00:38:56 UTC
[incubator-ponymail-foal] branch master updated (a1b4634 -> b3b81db)
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 a1b4634 Bump server version
new 4a1eea6 Temp testing hack
new 7b97a60 Test with 3.10
new b3b81db Bump server version
The 3 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 | 4 ++--
server/main.py | 15 ++++++++++++---
server/server_version.py | 2 +-
3 files changed, 15 insertions(+), 6 deletions(-)
[incubator-ponymail-foal] 01/03: Temp testing hack
Posted by se...@apache.org.
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 4a1eea66be0e2ea0e1a7c974f3296239ff7d7132
Author: Sebb <se...@apache.org>
AuthorDate: Fri Feb 4 00:36:48 2022 +0000
Temp testing hack
---
server/main.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/main.py b/server/main.py
index 3c804bd..5b1ae60 100644
--- a/server/main.py
+++ b/server/main.py
@@ -70,6 +70,7 @@ class Server(plugins.server.BaseServer):
print(
"==== Apache Pony Mail (Foal v/%s ~%s) starting... ====" % (PONYMAIL_FOAL_VERSION, PONYMAIL_SERVER_VERSION)
)
+ self.args = args
# Load configuration
yml = yaml.safe_load(open(args.config))
self.config = plugins.configuration.Configuration(yml)
@@ -243,11 +244,13 @@ class Server(plugins.server.BaseServer):
await self.dbpool.get_nowait().client.close()
def run(self):
+ if self.args.new_loop:
# Does not work; GH test fails with: RuntimeError: Task .. got Future <Future pending> attached to a different loop
- # loop = asyncio.new_event_loop()
- # asyncio.set_event_loop(loop)
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
# revert to original (deprecated) code
- loop = asyncio.get_event_loop() # This needs to be replaced, as it will fail in Python 3.11
+ else:
+ loop = asyncio.get_event_loop() # This needs to be replaced, as it will fail in Python 3.11
try:
loop.run_until_complete(self.server_loop())
except KeyboardInterrupt:
@@ -290,5 +293,11 @@ if __name__ == "__main__":
action='store_true',
help="Enable test endpoints",
)
+ # temporary hack to allow testing alternate loop code on GH python versions
+ parser.add_argument(
+ "--new_loop",
+ action='store_true',
+ help="test new loop impl",
+ )
cliargs = parser.parse_args()
Server(cliargs).run()
[incubator-ponymail-foal] 02/03: Test with 3.10
Posted by se...@apache.org.
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 7b97a60f2f54b7d1eda96787572294cce15052b7
Author: Sebb <se...@apache.org>
AuthorDate: Fri Feb 4 00:38:25 2022 +0000
Test with 3.10
---
.github/workflows/integration-tests.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 97c8e25..0b7feaa 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -52,7 +52,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v2
with:
- python-version: '3.7'
+ python-version: '3.10'
architecture: x64
- name: Install dependencies
run: |
@@ -95,7 +95,7 @@ jobs:
- name: Server
run: |
cd server
- python -u main.py --apilog DEBUG --logger DEBUG --stoppable --refreshable --testendpoints > main.log 2>&1 &
+ python -u main.py --apilog DEBUG --logger DEBUG --stoppable --refreshable --testendpoints --new_loop > main.log 2>&1 &
sleep 5 # allow time to start up properly
curl -sq http://localhost:8080/api/refresh # This will fail if the server is not ready
- name: Show Database
[incubator-ponymail-foal] 03/03: Bump server version
Posted by se...@apache.org.
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 b3b81db80769d77dcdefa0eab0a2da02fb41c3c2
Author: Sebb <se...@apache.org>
AuthorDate: Fri Feb 4 00:38:45 2022 +0000
Bump 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 aa7daeb..e5b4924 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 = 'e8f4979'
+PONYMAIL_SERVER_VERSION = '4a1eea6'