From 043f7c1bc7077e6b128d690d8c4d31ad56999823 Mon Sep 17 00:00:00 2001
From: Mathieu Loiseau <mathieu.loiseau@liris.cnrs.fr>
Date: Thu, 11 Jan 2024 11:12:39 +0100
Subject: [PATCH] suppression setup.py
---
README.md | 2 --
requirements.txt | 5 +----
setup.py | 8 --------
wikstraklog.py | 4 ++--
wikstraktor.py | 5 ++++-
wikstraktor.sqlite | Bin 36864 -> 36864 bytes
6 files changed, 7 insertions(+), 17 deletions(-)
delete mode 100755 setup.py
diff --git a/README.md b/README.md
index f6916ed..0be09e8 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 89d5182..665ffb7 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 cd3142b..0000000
--- 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 239ee01..74b912b 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 27d43be..a683054 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
GIT binary patch
delta 425
zcmZozz|^pSX@WFk(?l6(#-@!4OX``07^5e%H^_1@A7{GDWX>49u~45ev@xQQk;^z%
zP*9Y`voYStz{o_`z);uFP{Gi^3WN*|(=3t_&5}&h3{5S}j1p7Kj1$dF%}oqaO$^M;
zOf8HIOo0+6hAF9esd+{D#i=awY|SShG}D?qw>v(lk%1Fxb}99YR+$`7WDryjb#-WC
wA+?NFtkjt--|IU0OR!pSTpiqes)dSTrS@clD(=a`eMXa0det_sYzgNE0BAULs{jB1
delta 36
scmZozz|^pSX@WFk-9#B@#=4COOX`{VSXNACZ;;(s*ut`TMN0%X0P5-t@&Et;
--
GitLab