updated dependencies, modified config loading

9-FS · May 11, 2024 · 9fec8ba · 9fec8ba
1 parent c80f394
commit 9fec8ba
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 97 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -9,5 +9,6 @@ config/
 doc_templates/
 log/
 
+.env
 docker-image.tar
 tests/test.py
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,6 @@ config/
 doc_templates/
 log/
 
+.env
 docker-image.tar
 tests/test.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,19 +6,19 @@ name = ""
 package-mode = false # this is an application, not library
 readme = "readme.md"
 repository = "https://github.com/9-FS/2022-10-23-nHentai-to-PDF-Server"
-version = "3.2.0"
+version = "3.3.0"
 
 [tool.poetry.dependencies]
-kfsconfig = "^1.0.0"
+kfsconfig = "^2.0.0"
 kfsfstr = "^1.0.0"
-kfslog = "^1.0.0"
-kfsmedia = "^2.5.1"
+kfslog = "^2.0.0"
+kfsmedia = "^2.5.0"
 kfssleep = "^1.0.0"
 python = "^3.12.0"
 
 [tool.poetry.group.dev.dependencies]
 hypothesis = "^6.0.0"
-pytest = "^7.0.0"
+pytest = "^8.0.0"
 
 [build-system]
 build-backend = "poetry.core.masonry.api"

diff --git a/requirements.txt b/requirements.txt
@@ -2,14 +2,15 @@ certifi==2024.2.2 ; python_full_version >= "3.12.0" and python_full_version < "4
 charset-normalizer==3.3.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 colorama==0.4.6 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 idna==3.7 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfsconfig==1.1.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfsfstr==1.1.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfslog==1.1.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfsmath==1.0.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfsmedia==2.5.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
-kfssleep==1.0.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfsconfig==2.1.4 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfsfstr==1.1.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfslog==2.0.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfsmath==1.0.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfsmedia==2.5.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+kfssleep==1.0.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 olefile==0.47 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 pebble==5.0.7 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 pillow==10.3.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 requests==2.31.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
+result==0.16.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
 urllib3==2.2.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"