From 7db93ff68acc196867efb7c6a3af404c0b589a33 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Tue, 24 Dec 2024 18:17:56 +0300 Subject: [PATCH] chore: Prepare for release --- selfprivacy_api/dependencies.py | 2 +- selfprivacy_api/services/__init__.py | 11 +++-------- selfprivacy_api/services/templated_service.py | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/selfprivacy_api/dependencies.py b/selfprivacy_api/dependencies.py index b26635a..1efbc4d 100644 --- a/selfprivacy_api/dependencies.py +++ b/selfprivacy_api/dependencies.py @@ -27,4 +27,4 @@ async def get_token_header( def get_api_version() -> str: """Get API version""" - return "3.4.0" + return "3.5.0" diff --git a/selfprivacy_api/services/__init__.py b/selfprivacy_api/services/__init__.py index 3bc611e..25e7c21 100644 --- a/selfprivacy_api/services/__init__.py +++ b/selfprivacy_api/services/__init__.py @@ -54,11 +54,7 @@ class ServiceManager(Service): @staticmethod def get_enabled_services() -> list[Service]: - return [ - service - for service in get_services() - if service.is_enabled() - ] + return [service for service in get_services() if service.is_enabled()] # This one is not currently used by any code. @staticmethod @@ -82,7 +78,7 @@ class ServiceManager(Service): dns_records: list[ServiceDnsRecord] = [] - # TODO: Reenable with 3.5.0 release when clients are ready. + # TODO: Reenable with 3.6.0 release when clients are ready. # Do not forget about tests! # try: # dns_records.append( @@ -333,11 +329,10 @@ def get_services(exclude_remote=False) -> List[Service]: if module in service_ids: continue try: - # TODO: Replace the branch! templated_services.append( get_remote_service( module, - f"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=inex/experimental-templating&dir=sp-modules/{module}", + f"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/{module}", ttl_hash=get_ttl_hash(3600), ) ) diff --git a/selfprivacy_api/services/templated_service.py b/selfprivacy_api/services/templated_service.py index 9eeee67..aeffb5f 100644 --- a/selfprivacy_api/services/templated_service.py +++ b/selfprivacy_api/services/templated_service.py @@ -256,7 +256,7 @@ class TemplatedService(Service): raise FileNotFoundError("Suggested modules file not found") with FlakeServiceManager() as service_manager: service_manager.services[name] = ( - f"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=inex/experimental-templating&dir=sp-modules/{name}" + f"git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/{name}" ) if "location" in self.options: with WriteUserData() as user_data: diff --git a/setup.py b/setup.py index ecdb02c..8415ee3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="selfprivacy_api", - version="3.4.0", + version="3.5.0", packages=find_packages(), scripts=[ "selfprivacy_api/app.py",