Merge remote-tracking branch 'origin/develop'

Author: László Vaskó

README.md

@@ -1,9 +1,10 @@
 # openconnect-sso
 Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication
+to Cisco SSL-VPNs
 
 ## TL; DR
 ```bash
-$ pip install openconnect-sso-$VERSION.whl
+$ pip install openconnect-sso
 $ openconnect-sso --server vpn.server.com/group
 ```
 
@@ -12,13 +13,13 @@ If you want to save credentials and get them automatically
 injected in the web browser:
 ```bash
 $ openconnect-sso --server vpn.server.com/group --user [email protected]
-Password ([email protected]): 
+Password ([email protected]):
 [info     ] Authenticating to VPN endpoint ...
 ```
 
 User credentials are automatically saved to the users login keyring (if available).
 
-If you already have Cisco Anyconnect set-up, then `--server` argument is optional.
+If you already have Cisco AnyConnect set-up, then `--server` argument is optional.
 Also, the last used `--server` address is saved between sessions so there is no need
 to always type in the same arguments:
 

openconnect_sso/__init__.py

@@ -1,4 +1,2 @@
-__version__ = "0.3.1"
-__description__ = (
-    "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
-)
+__version__ = "0.3.2"
+__description__ = "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication to Cisco SSL-VPNs"

poetry.lock

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "openconnect-sso"
-version = "0.3.1"
-description = "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
+version = "0.3.2"
+description = "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication to Cisco SSL-VPNs"
 authors = ["László Vaskó <[email protected]>"]
 readme = "README.md"
 
 classifiers = [
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Environment :: X11 Applications :: Qt",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: POSIX :: Linux",
@@ -20,7 +20,7 @@ openconnect-sso = "openconnect_sso.cli:main"
 python = "^3.6"
 PyQt5 = "^5.12"
 PyQtWebEngine = "^5.12"
-attrs = "^18.2"
+attrs = ">=18.2, <20.0"
 colorama = "^0.4"
 lxml = "^4.3"
 keyring = "^18.0"
@@ -33,6 +33,7 @@ toml = "^0.10"
 [tool.poetry.dev-dependencies]
 pytest = "^3.0"
 black = "=19.3b0"
+reno = "^2.11"
 
 [build-system]
 requires = ["poetry>=0.12"]

pyproject.toml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Relaxed version requirements of `attrs` package. As `attrs` is also used
+    as a transitive dependency being too restrictive of its version can break
+    dependency resolution during installation.

releasenotes/notes/attrs-version-relaxed-a1a4c43f88c7ca98.yaml

@@ -0,0 +1,4 @@
+---
+prelude: >
+    I consider the software beta quality from now on as multiple users report
+    that they can install it and authenticate to their VPN endpoints.

releasenotes/notes/development-status-48152b58c305eda3.yaml

@@ -3,15 +3,17 @@
 from openconnect_sso.config import HostProfile
 
 
-@pytest.mark.parametrize(("server", "group", "expected_url"), (
+@pytest.mark.parametrize(
+    ("server", "group", "expected_url"),
+    (
         ("hostname", "", "https://hostname"),
         ("hostname", "group", "https://hostname/group"),
         ("hostname/group", "", "https://hostname/group"),
         ("https://hostname", "group", "https://hostname/group"),
         ("https://server.com", "group", "https://server.com/group"),
         ("https://hostname/group", "", "https://hostname/group"),
         ("https://hostname:8443/group", "", "https://hostname:8443/group"),
-))
+    ),
+)
 def test_vpn_url(server, group, expected_url):
     assert HostProfile(server, group).vpn_url == expected_url
-

tests/test_hostprofile.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == '0.3.1'
+    assert __version__ == "0.3.2"