From b28b02a15305a8d6cb78df1dab58fdb8bab95bbe Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Fri, 26 Feb 2021 11:30:06 +0100
Subject: [PATCH] work
---
artwork/TODO.md | 2 -
build.sh | 53 +++++++++++++------
lsp/conf/xml.json | 0
...script_get_python_requirements_from_txt.py | 2 +-
...script_get_python_requirements_from_txt.sh | 2 +
scripts/script_npm_install.py | 2 +-
scripts/script_setup_requirements.py | 2 +-
7 files changed, 42 insertions(+), 21 deletions(-)
delete mode 100644 artwork/TODO.md
delete mode 100644 lsp/conf/xml.json
mode change 100644 => 100755 scripts/script_get_python_requirements_from_txt.py
mode change 100644 => 100755 scripts/script_get_python_requirements_from_txt.sh
mode change 100644 => 100755 scripts/script_npm_install.py
mode change 100644 => 100755 scripts/script_setup_requirements.py
diff --git a/artwork/TODO.md b/artwork/TODO.md
deleted file mode 100644
index b6dbda7f..00000000
--- a/artwork/TODO.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO
-
diff --git a/build.sh b/build.sh
index bc65f630..1745dfa5 100755
--- a/build.sh
+++ b/build.sh
@@ -1,21 +1,42 @@
-# deactivate
-# rm -rf venv
-# py -3 -m venv venv
-# venv\Scripts\activate
+#!/usr/bin/env bash
-pip-compile -r requirements/build.in
-pip-compile -r requirements/docs.in
-pip-compile -r requirements/tests.in
-pip-compile -r requirements/dev.in
+function setup_venv() {
+ deactivate
+ rm -rf venv
+ py -3 -m venv venv
+ venv/Scripts/activate
+}
-pip install -r requirements/build.in --log logfile1.txt
-pip install -r requirements/docs.in --log logfile2.txt
-pip install -r requirements/tests.in --log logfile3.txt
-pip install -r requirements/dev.in --log logfile4.txt
+function pip_compile() {
+ pip-compile -r requirements/build.in
+ pip-compile -r requirements/docs.in
+ pip-compile -r requirements/tests.in
+ pip-compile -r requirements/dev.in
+ . scripts/script_get_python_requirements_from_txt.sh
+}
-. scripts/script_get_python_requirements_from_txt.sh
+function pip_install() {
+ pip install -r requirements/build.in --log logfile1.txt
+ pip install -r requirements/docs.in --log logfile2.txt
+ pip install -r requirements/tests.in --log logfile3.txt
+ pip install -r requirements/dev.in --log logfile4.txt
+}
-# pip install -e . --compile --force-reinstall --progress-bar pretty --log logfile5.txt
-pip install -e . --compile --progress-bar pretty --log logfile5.txt
+function pip_install_via_setup_py() {
+ # pip install -e . --compile --force-reinstall --progress-bar pretty --log logfile5.txt
+ pip install -e . --compile --progress-bar pretty --log logfile5.txt
+}
-# python -m build --wheel
+function build_wheel() {
+ python -m build --wheel
+}
+
+function main() {
+ #setup_venv
+ pip_compile
+ pip_install
+ pip_install_via_setup_py
+ #build_wheel
+}
+
+main
diff --git a/lsp/conf/xml.json b/lsp/conf/xml.json
deleted file mode 100644
index e69de29b..00000000
diff --git a/scripts/script_get_python_requirements_from_txt.py b/scripts/script_get_python_requirements_from_txt.py
old mode 100644
new mode 100755
index d48c8342..f48e66b8
--- a/scripts/script_get_python_requirements_from_txt.py
+++ b/scripts/script_get_python_requirements_from_txt.py
@@ -1,4 +1,4 @@
-#!/user/bin/env python
+#!/usr/bin/env python
import os
import sys
diff --git a/scripts/script_get_python_requirements_from_txt.sh b/scripts/script_get_python_requirements_from_txt.sh
old mode 100644
new mode 100755
index 57360dd5..6e3938a8
--- a/scripts/script_get_python_requirements_from_txt.sh
+++ b/scripts/script_get_python_requirements_from_txt.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
cat requirements/build.txt | grep -v '#' | sed 's/^/\t"/g' | sed 's/$/",/g' > requirements/req_build.py
cat requirements/docs.txt | grep -v '#' | sed 's/^/\t"/g' | sed 's/$/",/g' > requirements/req_docs.py
cat requirements/tests.txt | grep -v '#' | sed 's/^/\t"/g' | sed 's/$/",/g' > requirements/req_tests.py
diff --git a/scripts/script_npm_install.py b/scripts/script_npm_install.py
old mode 100644
new mode 100755
index 073b9e05..9c643408
--- a/scripts/script_npm_install.py
+++ b/scripts/script_npm_install.py
@@ -1,4 +1,4 @@
-#!/user/bin/env python
+#!/usr/bin/env python
import os
import sys
diff --git a/scripts/script_setup_requirements.py b/scripts/script_setup_requirements.py
old mode 100644
new mode 100755
index 5f536fb6..daa93342
--- a/scripts/script_setup_requirements.py
+++ b/scripts/script_setup_requirements.py
@@ -1,4 +1,4 @@
-#!/user/bin/env python
+#!/usr/bin/env python
import os
import sys
--
GitLab