updated circinus build script to remove unnecessary dependency on extra library

3 files changed, 6 insertions, 6 deletions

diff --git a/new/image_builder.py b/new/image_builder.py
index 4914093..2659ea5 100755
--- a/new/image_builder.py
+++ b/new/image_builder.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 import argparse
 from contextlib import closing
+from datetime import datetime
 from http.server import ThreadingHTTPServer, SimpleHTTPRequestHandler
 import logging
 import os
@@ -11,7 +12,6 @@ from threading import Thread
 from time import monotonic
 
 import netifaces
-import pendulum
 
 from lib.debranding import Debranding
 from lib.docker import Docker
@@ -83,7 +83,8 @@ class ImageBuilder:
             if self.branch in self.version_mapping:
                 version = self.version_mapping[self.branch]
             else:
-                version = "%s-%s" % (self.branch, pendulum.now().format("YYYY-MM-DD"))
+                now = datetime.now().astimezone().strftime("%Y-%m-%d")
+                version = "%s-%s" % (self.branch, now)
 
         # build image
         build_image_pieces = [
diff --git a/new/install-dependencies.sh b/new/install-dependencies.sh
index 6dfe839..e7a132f 100755
--- a/new/install-dependencies.sh
+++ b/new/install-dependencies.sh
@@ -11,7 +11,7 @@ sudo apt-get update -y
 sudo apt-get install -y git gpg reprepro
 
 # python dependencies (python3-yaml is pyyaml)
-sudo apt-get install -y python3 python3-yaml python3-requests python3-pendulum python3-netifaces python3-tomlkit
+sudo apt-get install -y python3 python3-yaml python3-requests python3-netifaces python3-tomlkit
 
 # docker
 if [ ! -f /etc/apt/sources.list.d/docker.list ]; then
diff --git a/new/package_builder.py b/new/package_builder.py
index 85d8585..7438519 100755
--- a/new/package_builder.py
+++ b/new/package_builder.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python3
 import argparse
+from datetime import datetime
 import logging
 import os.path
 from shlex import quote
 from time import time, monotonic
 
-import pendulum
-
 from lib.apt import Apt
 from lib.cache import Cache
 from lib.debranding import Debranding
@@ -193,7 +192,7 @@ class PackageBuilder:
             self.cache.set("packages", packages)
 
         else:
-            date = pendulum.from_timestamp(float(packages_timestamp)).in_tz("local").format("YYYY-MM-DD HH:mm:ss")
+            date = datetime.fromtimestamp(float(packages_timestamp)).astimezone().strftime("%Y-%m-%d %H:%M:%S")
             logging.info("Using previously generated package metadata (%s)" % date)
 
         return packages