skilleter-thingy 0.0.45__py3-none-any.whl → 0.0.46__py3-none-any.whl

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.dist-info → skilleter_thingy-0.0.46.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.0.46.dist-info}/RECORD

@@ -37,12 +37,11 @@ skilleter_thingy/sysmon.py,sha256=XRZG6EVSzoVYan_N16qVB1l1RaU51uvLWlRA0CDjC54,11
 skilleter_thingy/tfm.py,sha256=3ejKNI2P65lGz-50mxRMxW_o5NmoeMDcmhji_0uALhI,33703
 skilleter_thingy/tfparse.py,sha256=u1IZH2J_WH1aORyMozKSI2JKok7_S1MMJhiobzmhlUI,2988
 skilleter_thingy/trimpath.py,sha256=IJU3zl4Hg08g0eU24LZyDlGfNa-5k-TZM5s9zR4OIdA,2385
-skilleter_thingy/venv_create.py,sha256=JZzOGbGJehNIGuumeZG0jrtU2M0ijvLE67NqjLXfxyg,1428
+skilleter_thingy/venv_create.py,sha256=tE4Pgubyt7gZs2cb6d_Fds5Df-oUWJswzSSGdSuzbGA,1142
 skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63sqJK8,3128
 skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
-skilleter_thingy/thingy/bash_venv.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
 skilleter_thingy/thingy/colour.py,sha256=D-RTYsND6Xm6m3xl0mOe9QSrTNYsyY0K_a8x3id2gvg,7031
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
@@ -50,7 +49,6 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQq1NRJbg,12264
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=8wXUHEGALhHvYtJewjSNwHFw-hGHFYbWH9_40lJj5ZY,4257
-skilleter_thingy/thingy/fish_venv.py,sha256=NKL9I5DKNyT7R6UpKRIiYmxg4kxzmywuuYO07uCBCrQ,1004
 skilleter_thingy/thingy/git.py,sha256=9y58KhFx6t9nNyqMbixM5cl8LBcD2sdCh9UgyVPv4bo,38043
 skilleter_thingy/thingy/git2.py,sha256=xfQrOpOk4SLdE6T-pr0FTuYGn0gSY92VMDpmqvX3gDM,35751
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
@@ -61,9 +59,10 @@ skilleter_thingy/thingy/process.py,sha256=88pKHQZXBP1m3Ja7t3DtKJ4Njn7HS2OtcI0Z0i
 skilleter_thingy/thingy/run.py,sha256=051lGahG4liYLckQFpmSaGuE9Chd-lFdmJO85LdmeXE,12607
 skilleter_thingy/thingy/tfm_pane.py,sha256=40DmQeLMEUPiKKIJkgN1MEpIen00V70I1HB7Q6git44,19814
 skilleter_thingy/thingy/tidy.py,sha256=wzkyxzCsHXyY46G3Rjqu4ZrqiL8QMbRXyJEeYOmpy-o,5402
-skilleter_thingy-0.0.45.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.45.dist-info/METADATA,sha256=00YYxQOpeYPEng-K6B4hx-1WxPGu_pbnA55MVZ65wYs,5313
-skilleter_thingy-0.0.45.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-skilleter_thingy-0.0.45.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
-skilleter_thingy-0.0.45.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.45.dist-info/RECORD,,
+skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
+skilleter_thingy-0.0.46.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.46.dist-info/METADATA,sha256=RtT0thW60tu7gdRnk7xyNn6NlyblaIZbpF7D55atgDY,5313
+skilleter_thingy-0.0.46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+skilleter_thingy-0.0.46.dist-info/entry_points.txt,sha256=IT6cZSbGHrd2UzIQbiMRotKiTJnYJBkESC4fAe8gjsE,2026
+skilleter_thingy-0.0.46.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.46.dist-info/RECORD,,

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
-"""