skilleter-thingy 0.0.45__tar.gz → 0.0.46__tar.gz

{skilleter_thingy-0.0.45/skilleter_thingy.egg-info → skilleter_thingy-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.45
+Version: 0.0.46
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.45 → skilleter_thingy-0.0.46}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.45"
+version = "0.0.46"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.0.45 → skilleter_thingy-0.0.46}/skilleter_thingy/venv_create.py

@@ -4,8 +4,7 @@ import os
 import stat
 import argparse
 
-import thingy.bash_venv as bash_venv
-import thingy.fish_venv as fish_venv
+import thingy.venv_template as venv_template
 
 ################################################################################
 
@@ -17,24 +16,16 @@ def main():
 
     args = parser.parse_args()
 
-    shell = os.getenv('SHELL').split('/')[-1]
+    script = args.name[0]
 
-    if shell == 'fish':
-        template = fish_venv.TEMPLATE
-    else:
-        if shell != 'bash':
-            print(f'Warning: Unknown shell: {shell} - using Bash template by default')
+    with open(script, 'wt') as scriptfile:
+        scriptfile.write(venv_template.TEMPLATE)
 
-        template = bash_venv.TEMPLATE
+    statinfo = os.stat(script)
 
-    with open(args.name[0], 'wt') as scriptfile:
-        scriptfile.write(template)
+    os.chmod(script, statinfo.st_mode|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
 
-    statinfo = os.stat(args.name[0])
-
-    os.chmod(args.name[0], statinfo.st_mode|stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
-
-    print(f'Created virtual environment: {args.name[0]}')
+    print(f'Created virtual environment: {script}')
 
 ################################################################################
 

{skilleter_thingy-0.0.45 → skilleter_thingy-0.0.46/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.45
+Version: 0.0.46
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.0.45 → skilleter_thingy-0.0.46}/skilleter_thingy.egg-info/SOURCES.txt

@@ -51,7 +51,6 @@ skilleter_thingy.egg-info/entry_points.txt
 skilleter_thingy.egg-info/requires.txt
 skilleter_thingy.egg-info/top_level.txt
 skilleter_thingy/thingy/__init__.py
-skilleter_thingy/thingy/bash_venv.py
 skilleter_thingy/thingy/colour.py
 skilleter_thingy/thingy/dc_curses.py
 skilleter_thingy/thingy/dc_defaults.py
@@ -59,7 +58,6 @@ skilleter_thingy/thingy/dc_util.py
 skilleter_thingy/thingy/dircolors.py
 skilleter_thingy/thingy/docker.py
 skilleter_thingy/thingy/files.py
-skilleter_thingy/thingy/fish_venv.py
 skilleter_thingy/thingy/git.py
 skilleter_thingy/thingy/git2.py
 skilleter_thingy/thingy/gitlab.py
@@ -69,4 +67,5 @@ skilleter_thingy/thingy/popup.py
 skilleter_thingy/thingy/process.py
 skilleter_thingy/thingy/run.py
 skilleter_thingy/thingy/tfm_pane.py
-skilleter_thingy/thingy/tidy.py
+skilleter_thingy/thingy/tidy.py
+skilleter_thingy/thingy/venv_template.py

skilleter_thingy-0.0.45/skilleter_thingy/thingy/fish_venv.py

@@ -1,41 +0,0 @@
-TEMPLATE = \
-"""#!/usr/bin/env fish
-
-################################################################################
-
-set VENV_NAME $(basename "$0")
-set VENV_DIR __venv__
-
-set GREEN "\e[42m"
-set NORMAL "\e[0m"
-
-################################################################################
-
-function box
-   echo -e "$GREEN################################################################################$NORMAL"
-   echo -e "$GREEN# $argv$NORMAL"
-   echo -e "$GREEN################################################################################$NORMAL"
-end
-
-################################################################################
-
-box "Creating & activating $VENV_NAME virtual environment"
-
-python3 -m venv $VENV_DIR
-
-source $VENV_DIR/bin/activate.fish
-
-if test -f requirements.txt
-   box "Installing/Upgrading packages"
-
-   python3 -m pip install -r requirements.txt
-end
-
-if test -f $VENV_NAME.py
-    box "Running $VENV_NAME script"
-
-    python3 ./$VENV_NAME.py $argv
-
-    deactivate
-end
-"""