Skip to content

Commit

Permalink
Preparations for next automx2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
rseichter committed Aug 1, 2024
1 parent 53d24c4 commit 1fe7f05
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/qa-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu-latest']
python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
python: ['3.8', '3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v4
- name: Set up Python
Expand Down
8 changes: 4 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
Bundle documentation for offline use.
Permit network tests to be enabled/disabled on demand.

2024.2 (TBA): Fix: Interpret STARTTLS as "uses SSL" in mobileconfig.
Feature: Support CalDAV/CardDAV in mobileconfig.
Update CI tests (drop Python version 3.7, include 3.13).
Introduce environment variable PERMIT_CLEARTEXT_PASSWORD for mobileconfig.
2024.2 (2024-08-01): Fix: Interpret STARTTLS as "uses SSL" in mobileconfig.
Feature: Support CalDAV and CardDAV in mobileconfig.
Feature: Support passwords in mobileconfig (disabled by default, opt-in required to enable).
CI: Drop Python version 3.7 from matrix.
2 changes: 1 addition & 1 deletion automx2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import logging

IDENTIFIER = 'automx2' # Do not change this!
VERSION = '2024.2.dev2'
VERSION = '2024.2'

PLACEHOLDER_ADDRESS = r'%EMAILADDRESS%'
PLACEHOLDER_DOMAIN = r'%EMAILDOMAIN%'
Expand Down
6 changes: 4 additions & 2 deletions contrib/seed-example.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"servers": [
{"type": "imap", "name": "imap.example.com"},
{"type": "smtp", "name": "smtp.example.com"},
{"type": "caldav", "port": 47443,
"url": "https://www.horus-it.com:47443/SOGo/dav/%EMAILADDRESS%/Calendar/personal/"}
{"type": "caldav", "port": 443,
"url": "https://www.example.net/SOGo/dav/%EMAILADDRESS%/Calendar/personal/"},
{"type": "carddav", "port": 443,
"url": "https://www.example.net/SOGo/dav/%EMAILADDRESS%/Contacts/personal/"}
]
}
4 changes: 2 additions & 2 deletions docs/automx2.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
= automx2: Email client configuration made easy
:keywords: autoconfig, autodiscover, mobileconfig, automx, automx2
:subject: automx2: Email client configuration made easy
:revnumber: 2024.2.dev2
:revdate: 2024-07-29
:revnumber: 2024.2
:revdate: 2024-08-01
:copyright: © 2019-2024 Ralph Seichter
:publisher: Ralph Seichter
:lang: en
Expand Down
Binary file modified docs/automx2.pdf
Binary file not shown.
14 changes: 8 additions & 6 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@
<div id="header">
<h1>automx2: Email client configuration made easy</h1>
<div class="details">
<span id="revnumber">version 2024.2.dev2,</span>
<span id="revdate">2024-07-29</span>
<span id="revnumber">version 2024.2,</span>
<span id="revdate">2024-08-01</span>
</div>
<div id="toc" class="toc2">
<div id="toctitle">Table of Contents</div>
Expand Down Expand Up @@ -1143,8 +1143,10 @@ <h4 id="_sqlite"><a class="anchor" href="#_sqlite"></a>7.5.2. SQLite</h4>
</span><span class="nl">"servers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
</span><span class="p">{</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"imap"</span><span class="p">,</span><span class="w"> </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"imap.example.com"</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"smtp"</span><span class="p">,</span><span class="w"> </span><span class="nl">"name"</span><span class="p">:</span><span class="w"> </span><span class="s2">"smtp.example.com"</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"caldav"</span><span class="p">,</span><span class="w"> </span><span class="nl">"port"</span><span class="p">:</span><span class="w"> </span><span class="mi">47443</span><span class="p">,</span><span class="w">
</span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"https://www.horus-it.com:47443/SOGo/dav/%EMAILADDRESS%/Calendar/personal/"</span><span class="p">}</span><span class="w">
</span><span class="p">{</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"caldav"</span><span class="p">,</span><span class="w"> </span><span class="nl">"port"</span><span class="p">:</span><span class="w"> </span><span class="mi">443</span><span class="p">,</span><span class="w">
</span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"https://www.example.net/SOGo/dav/%EMAILADDRESS%/Calendar/personal/"</span><span class="p">},</span><span class="w">
</span><span class="p">{</span><span class="nl">"type"</span><span class="p">:</span><span class="w"> </span><span class="s2">"carddav"</span><span class="p">,</span><span class="w"> </span><span class="nl">"port"</span><span class="p">:</span><span class="w"> </span><span class="mi">443</span><span class="p">,</span><span class="w">
</span><span class="nl">"url"</span><span class="p">:</span><span class="w"> </span><span class="s2">"https://www.example.net/SOGo/dav/%EMAILADDRESS%/Contacts/personal/"</span><span class="p">}</span><span class="w">
</span><span class="p">]</span><span class="w">
</span><span class="p">}</span></code></pre>
</div>
Expand Down Expand Up @@ -1716,8 +1718,8 @@ <h2 id="sponsorship"><a class="anchor" href="#sponsorship"></a>12. Sponsorship</
</div>
<div id="footer">
<div id="footer-text">
Version 2024.2.dev2<br>
Last updated 2024-07-29 03:01:44 +0200
Version 2024.2<br>
Last updated 2024-08-01 09:20:51 +0200
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ project_urls =
Source = https://github.com/rseichter/automx2
Tracker = https://github.com/rseichter/automx2/issues
url = https://github.com/rseichter/automx2
version = 2024.2.dev2
version = 2024.2

[options]
install_requires =
Expand Down

0 comments on commit 1fe7f05

Please sign in to comment.