mirror/archivebox
1
0
Fork 0
mirror of https://github.com/pirate/ArchiveBox.git synced 2025-08-21 05:41:54 +02:00
Code Issues Releases Wiki Activity

remove unused GIT_SHA config option

Browse Source
This commit is contained in:
Nick Sweeting
2021-02-15 20:42:33 -05:00
parent 9cd4ba38f0
commit 78463c243a
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
archivebox/config.py
View File

@@ -288,7 +288,6 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0]}, 'ARCHIVEBOX_BINARY': {'default': lambda c: sys.argv[0]},
'VERSION': {'default': lambda c: json.loads((Path(c['PACKAGE_DIR']) / 'package.json').read_text().strip())['version']}, 'VERSION': {'default': lambda c: json.loads((Path(c['PACKAGE_DIR']) / 'package.json').read_text().strip())['version']},
'GIT_SHA': {'default': lambda c: c['VERSION'].split('+')[-1] or 'unknown'},
'PYTHON_BINARY': {'default': lambda c: sys.executable}, 'PYTHON_BINARY': {'default': lambda c: sys.executable},
'PYTHON_ENCODING': {'default': lambda c: sys.stdout.encoding.upper()}, 'PYTHON_ENCODING': {'default': lambda c: sys.stdout.encoding.upper()},

3
archivebox/index/html.py
View File

@@ -20,7 +20,6 @@ from ..util import (
from ..config import ( from ..config import (
OUTPUT_DIR, OUTPUT_DIR,
VERSION, VERSION,
GIT_SHA,
FOOTER_INFO, FOOTER_INFO,
HTML_INDEX_FILENAME, HTML_INDEX_FILENAME,
SAVE_ARCHIVE_DOT_ORG, SAVE_ARCHIVE_DOT_ORG,
@@ -60,7 +59,7 @@ def main_index_template(links: List[Link], template: str=MAIN_INDEX_TEMPLATE) ->
return render_django_template(template, { return render_django_template(template, {
'version': VERSION, 'version': VERSION,
'git_sha': GIT_SHA, 'git_sha': VERSION, # not used anymore, but kept for backwards compatibility
'num_links': str(len(links)), 'num_links': str(len(links)),
'date_updated': datetime.now().strftime('%Y-%m-%d'), 'date_updated': datetime.now().strftime('%Y-%m-%d'),
'time_updated': datetime.now().strftime('%Y-%m-%d %H:%M'), 'time_updated': datetime.now().strftime('%Y-%m-%d %H:%M'),

3
archivebox/index/json.py
View File

@@ -15,7 +15,6 @@ from ..config import (
VERSION, VERSION,
OUTPUT_DIR, OUTPUT_DIR,
FOOTER_INFO, FOOTER_INFO,
GIT_SHA,
DEPENDENCIES, DEPENDENCIES,
JSON_INDEX_FILENAME, JSON_INDEX_FILENAME,
ARCHIVE_DIR_NAME, ARCHIVE_DIR_NAME,
@@ -30,7 +29,7 @@ MAIN_INDEX_HEADER = {
'meta': { 'meta': {
'project': 'ArchiveBox', 'project': 'ArchiveBox',
'version': VERSION, 'version': VERSION,
'git_sha': GIT_SHA, 'git_sha': VERSION, # not used anymore, but kept for backwards compatibility
'website': 'https://ArchiveBox.io', 'website': 'https://ArchiveBox.io',
'docs': 'https://github.com/ArchiveBox/ArchiveBox/wiki', 'docs': 'https://github.com/ArchiveBox/ArchiveBox/wiki',
'source': 'https://github.com/ArchiveBox/ArchiveBox', 'source': 'https://github.com/ArchiveBox/ArchiveBox',