Skip to content

Commit

Permalink
updated dependencies, modified config loading
Browse files Browse the repository at this point in the history
  • Loading branch information
9-FS committed May 12, 2024
1 parent 12c31de commit 4c810f0
Show file tree
Hide file tree
Showing 9 changed files with 137 additions and 126 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ database/
doc_templates/
log/

.env
docker-image.tar
tests/test.py
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ database/
doc_templates/
log/

.env
docker-image.tar
tests/test.py
3 changes: 0 additions & 3 deletions config/discord_bot_channel_names.txt

This file was deleted.

86 changes: 47 additions & 39 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ name = ""
package-mode = false # this is an application, not library
readme = "readme.md"
repository = "https://github.com/9-FS/2022-01-26-Metric-METAR-for-Discord"
version = "1.1.5"
version = "1.2.0"

[tool.poetry.dependencies]
discord = "^2.3.2"
jsonpickle = "^3.0.2"
kfsconfig = "^1.0.0"
discord = "^2.3.0"
jsonpickle = "^3.0.0"
kfsconfig = "^2.0.0"
kfsconvert-to-si = "^1.0.0"
kfsfstr = "^1.0.0"
kfslog = "^1.0.0"
pandas = "^2.1.0"
python = "^3.11.0"
kfslog = "^2.0.0"
pandas = "^2.2.0"
python = "^3.12.0"
requests = "^2.31.0"

[tool.poetry.group.dev.dependencies]
hypothesis = "^6.87.0"
pytest = "^7.4.2"
hypothesis = "^6.0.0"
pytest = "^8.0.0"

[build-system]
build-backend = "poetry.core.masonry.api"
Expand Down
54 changes: 27 additions & 27 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
aiohttp==3.8.6 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
aiosignal==1.3.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
async-timeout==4.0.3 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
attrs==23.1.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
certifi==2023.7.22 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
charset-normalizer==3.3.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
colorama==0.4.6 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
discord-py==2.3.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
discord==2.3.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
frozenlist==1.4.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
idna==3.4 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
jsonpickle==3.0.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
kfsconfig==1.0.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
kfsconvert-to-si==1.0.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
kfsfstr==1.1.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
kfslog==1.0.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
kfsmath==1.0.1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
multidict==6.0.4 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
numpy==1.26.1 ; python_version == "3.11"
pandas==2.1.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
python-dateutil==2.8.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
pytz==2023.3.post1 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
requests==2.31.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
six==1.16.0 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
tzdata==2023.3 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
urllib3==2.0.7 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
yarl==1.9.2 ; python_full_version >= "3.11.0" and python_full_version < "4.0.0"
aiohttp==3.9.5 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
aiosignal==1.3.1 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
attrs==23.2.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
certifi==2024.2.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
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"
discord-py==2.3.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
discord==2.3.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
frozenlist==1.4.1 ; 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"
jsonpickle==3.0.4 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
kfsconfig==2.1.5 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
kfsconvert-to-si==1.0.2 ; 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"
multidict==6.0.5 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
numpy==1.26.4 ; python_version >= "3.12" and python_full_version < "4.0.0"
pandas==2.2.2 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
python-dateutil==2.9.0.post0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
pytz==2024.1 ; 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"
six==1.16.0 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
tzdata==2024.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"
yarl==1.9.4 ; python_full_version >= "3.12.0" and python_full_version < "4.0.0"
2 changes: 1 addition & 1 deletion src/init_DB.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from DB_Type import DB_Type


def init_DB(DB_type: DB_Type, DB: pandas.DataFrame, now_DT: dt.datetime, DOWNLOAD_TIMEOUT: int) -> pandas.DataFrame:
def init_DB(DB_type: DB_Type, DB: pandas.DataFrame, now_DT: dt.datetime, DOWNLOAD_TIMEOUT: float) -> pandas.DataFrame:
DB_filenames: list[str] # databases existing filenames
DB_filepath: str # filepath to database, date can be in past
DB_TODAY_FILEPATH: str=f"./database/{now_DT.strftime('%Y-%m-%d')} {DB_type.name} DB.csv" # filepath to database
Expand Down
Loading

0 comments on commit 4c810f0

Please sign in to comment.