From 6464067b666890ec5f7a7d3e954eeaea35f659ae Mon Sep 17 00:00:00 2001 From: Kieran Lane Date: Sat, 3 May 2025 21:03:16 +0100 Subject: [PATCH] Updated requirements and removed venv --- requirements.txt | 2 +- venv/bin/Activate.ps1 | 8 +------- venv/bin/activate | 5 +---- venv/bin/activate.csh | 5 ++--- venv/bin/activate.fish | 13 ++++--------- venv/pyvenv.cfg | 4 ++-- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0c54c9a..d22f8ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,6 @@ pyinstaller==6.7.0 pyinstaller-hooks-contrib==2024.6 pytest==8.2.1 pytest-mock==3.14.0 -rcon==2.4.6 +rcon==2.4.9 style==1.1.0 tomli==2.0.1 diff --git a/venv/bin/Activate.ps1 b/venv/bin/Activate.ps1 index b49d77b..2fb3852 100644 --- a/venv/bin/Activate.ps1 +++ b/venv/bin/Activate.ps1 @@ -96,11 +96,6 @@ function global:deactivate ([switch]$NonDestructive) { Remove-Item -Path env:VIRTUAL_ENV } - # Just remove VIRTUAL_ENV_PROMPT altogether. - if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) { - Remove-Item -Path env:VIRTUAL_ENV_PROMPT - } - # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force @@ -202,7 +197,7 @@ else { $Prompt = $pyvenvCfg['prompt']; } else { - Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)" + Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virutal environment)" Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" $Prompt = Split-Path -Path $venvDir -Leaf } @@ -233,7 +228,6 @@ if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " _OLD_VIRTUAL_PROMPT } - $env:VIRTUAL_ENV_PROMPT = $Prompt } # Clear PYTHONHOME diff --git a/venv/bin/activate b/venv/bin/activate index 462a7cd..c388610 100644 --- a/venv/bin/activate +++ b/venv/bin/activate @@ -28,7 +28,6 @@ deactivate () { fi unset VIRTUAL_ENV - unset VIRTUAL_ENV_PROMPT if [ ! "${1:-}" = "nondestructive" ] ; then # Self destruct! unset -f deactivate @@ -38,7 +37,7 @@ deactivate () { # unset irrelevant variables deactivate nondestructive -VIRTUAL_ENV="/home/breath/repos/reforger-whitelist-py/venv" +VIRTUAL_ENV="/Users/kieranlane/Documents/ReforgerWhitelistPy/venv" export VIRTUAL_ENV _OLD_VIRTUAL_PATH="$PATH" @@ -57,8 +56,6 @@ if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then _OLD_VIRTUAL_PS1="${PS1:-}" PS1="(venv) ${PS1:-}" export PS1 - VIRTUAL_ENV_PROMPT="(venv) " - export VIRTUAL_ENV_PROMPT fi # This should detect bash and zsh, which have a hash command that must diff --git a/venv/bin/activate.csh b/venv/bin/activate.csh index 17f8b5c..ee7a050 100644 --- a/venv/bin/activate.csh +++ b/venv/bin/activate.csh @@ -3,12 +3,12 @@ # Created by Davide Di Blasi . # Ported to Python 3.3 venv by Andrew Svetlov -alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; unsetenv VIRTUAL_ENV_PROMPT; test "\!:*" != "nondestructive" && unalias deactivate' +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' # Unset irrelevant variables. deactivate nondestructive -setenv VIRTUAL_ENV "/home/breath/repos/reforger-whitelist-py/venv" +setenv VIRTUAL_ENV "/Users/kieranlane/Documents/ReforgerWhitelistPy/venv" set _OLD_VIRTUAL_PATH="$PATH" setenv PATH "$VIRTUAL_ENV/bin:$PATH" @@ -18,7 +18,6 @@ set _OLD_VIRTUAL_PROMPT="$prompt" if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then set prompt = "(venv) $prompt" - setenv VIRTUAL_ENV_PROMPT "(venv) " endif alias pydoc python -m pydoc diff --git a/venv/bin/activate.fish b/venv/bin/activate.fish index 50349e4..a0799a8 100644 --- a/venv/bin/activate.fish +++ b/venv/bin/activate.fish @@ -13,17 +13,13 @@ function deactivate -d "Exit virtual environment and return to normal shell env end if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + functions -e fish_prompt set -e _OLD_FISH_PROMPT_OVERRIDE - # prevents error when using nested fish instances (Issue #93858) - if functions -q _old_fish_prompt - functions -e fish_prompt - functions -c _old_fish_prompt fish_prompt - functions -e _old_fish_prompt - end + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt end set -e VIRTUAL_ENV - set -e VIRTUAL_ENV_PROMPT if test "$argv[1]" != "nondestructive" # Self-destruct! functions -e deactivate @@ -33,7 +29,7 @@ end # Unset irrelevant variables. deactivate nondestructive -set -gx VIRTUAL_ENV "/home/breath/repos/reforger-whitelist-py/venv" +set -gx VIRTUAL_ENV "/Users/kieranlane/Documents/ReforgerWhitelistPy/venv" set -gx _OLD_VIRTUAL_PATH $PATH set -gx PATH "$VIRTUAL_ENV/bin" $PATH @@ -65,5 +61,4 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" end set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" - set -gx VIRTUAL_ENV_PROMPT "(venv) " end diff --git a/venv/pyvenv.cfg b/venv/pyvenv.cfg index 0537ffc..4760c1f 100644 --- a/venv/pyvenv.cfg +++ b/venv/pyvenv.cfg @@ -1,3 +1,3 @@ -home = /usr/bin +home = /Library/Developer/CommandLineTools/usr/bin include-system-site-packages = false -version = 3.10.12 +version = 3.9.6