docs/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2023\-01\-25" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2023\-01\-16" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.6.1
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

src/ahriman/core/auth/__init__.py

@@ -18,3 +18,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.auth.auth import Auth
+
+from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth.oauth import OAuth

src/ahriman/core/auth/auth.py

@@ -78,10 +78,10 @@ class Auth(LazyLogging):
         """
         provider = AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled"))
         if provider == AuthSettings.Configuration:
-            from ahriman.core.auth.mapping import Mapping
+            from ahriman.core.auth import Mapping
             return Mapping(configuration, database)
         if provider == AuthSettings.OAuth:
-            from ahriman.core.auth.oauth import OAuth
+            from ahriman.core.auth import OAuth
             return OAuth(configuration, database)
         return cls(configuration)
 

src/ahriman/core/auth/oauth.py

@@ -21,7 +21,7 @@ import aioauth_client
 
 from typing import Optional, Type
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.exceptions import OptionError

src/ahriman/version.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.6.1"
+__version__ = "2.6.0"

src/ahriman/web/views/user/login.py

@@ -53,7 +53,7 @@ class LoginView(BaseView):
         Examples:
             This request must not be used directly.
         """
-        from ahriman.core.auth.oauth import OAuth
+        from ahriman.core.auth import OAuth
 
         oauth_provider = self.validator
         if not isinstance(oauth_provider, OAuth):  # there is actually property, but mypy does not like it anyway

tests/ahriman/core/auth/conftest.py

@@ -1,7 +1,6 @@
 import pytest
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping, OAuth
-from ahriman.core.auth.oauth import OAuth
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 

tests/ahriman/core/auth/test_auth.py

@@ -1,6 +1,4 @@
-from ahriman.core.auth import Auth
+from ahriman.core.auth import Auth, Mapping, OAuth
-from ahriman.core.auth.mapping import Mapping
-from ahriman.core.auth.oauth import OAuth
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.models.user import User

tests/ahriman/core/auth/test_mapping.py

@@ -1,6 +1,6 @@
 from pytest_mock import MockerFixture
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess
 

tests/ahriman/core/auth/test_oauth.py

@@ -3,7 +3,7 @@ import pytest
 
 from pytest_mock import MockerFixture
 
-from ahriman.core.auth.oauth import OAuth
+from ahriman.core.auth import OAuth
 from ahriman.core.exceptions import OptionError
 
 

tests/ahriman/web/conftest.py

@@ -9,7 +9,7 @@ from unittest.mock import MagicMock
 
 import ahriman.core.auth.helpers
 
-from ahriman.core.auth.oauth import OAuth
+from ahriman.core.auth import OAuth
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository