diff --git a/README.md b/README.md index f6916edc0925ffc108586cc8724207c00fde9907..0be09e83b179b0c9566699766d947769bfdcfa55 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ This project does depend on python packages. python3 -m venv wikstraktorenv #optional for basic version . wikstraktorenv/bin/activate #activate environment (optional) pip install -r requirements.txt -./setup.py ``` ### Wikstraktor Server @@ -38,7 +37,6 @@ The following commands are extracted from the aforementionned documentation, it python3 -m venv wikstraktorenv #create wikstraktorenv environment . wikstraktorenv/bin/activate #activate environment pip install -r server_requirements.txt -./setup.py ``` ## Use diff --git a/requirements.txt b/requirements.txt index 89d5182e7e7691cc8c9f3871d3a580ad8d2027ef..665ffb7a40d2289f6dece5f881cc6cec9295457c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,4 @@ #necessary pywikibot>=8.1.2 wikitextparser>=0.51.0 -#importlib>=1.0.4 provided by default - -#for setup script -GitPython==3.1.31 +GitPython>=3.1.31 diff --git a/setup.py b/setup.py deleted file mode 100755 index cd3142b21757a640147b51c8ad6c159f0814e1c9..0000000000000000000000000000000000000000 --- a/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python3 - -import git -sha = git.Repo(search_parent_directories=True).head.object.hexsha - -v = open("wikstraktor_version.py", "w") -v.write(f"version = '{sha}'") -v.close() diff --git a/wikstraklog.py b/wikstraklog.py index 239ee013491ab9d840eeeecdabd293aa10750146..74b912b5fd1dc128d7b302342431de1e37809e0a 100755 --- a/wikstraklog.py +++ b/wikstraklog.py @@ -42,7 +42,7 @@ class Wikstraklog: return res if __name__ == "__main__": - from wikstraktor_version import version as the_version - log = Wikstraklog(the_version, "en", "fr") + import git + log = Wikstraklog(git.Repo(search_parent_directories=True).head.object.hexsha, "en", "fr") log.set_context("blue", 123456789) log.add_log("exampleMethod", "no relevant content") diff --git a/wikstraktor.py b/wikstraktor.py index 27d43befcf92fa4dd69aa614297828b6e8224d68..a6830540e42c764cd5ea2942fd0e48f6f0506e03 100755 --- a/wikstraktor.py +++ b/wikstraktor.py @@ -3,7 +3,10 @@ import pywikibot import wikitextparser import importlib import json -from wikstraktor_version import version as the_version +#version +import git +the_version = git.Repo(search_parent_directories=True).head.object.hexsha +#logging from wikstraklog import Wikstraklog def get_list_string_level(wikitext): diff --git a/wikstraktor.sqlite b/wikstraktor.sqlite index 92143d2d1b070c712a39af7d177eb677f90613f7..820ba209b1673599473290babaa68756f6b40630 100644 Binary files a/wikstraktor.sqlite and b/wikstraktor.sqlite differ