making some progress

This commit is contained in:
2025-04-09 21:40:29 -07:00
parent c7c3d75ec9
commit 28ad830bef
22 changed files with 1191895 additions and 141984 deletions

View File

@@ -219,6 +219,8 @@ deactivate -nondestructive
# that there is an activated venv. # that there is an activated venv.
$env:VIRTUAL_ENV = $VenvDir $env:VIRTUAL_ENV = $VenvDir
$env:VIRTUAL_ENV_PROMPT = $Prompt
if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
Write-Verbose "Setting prompt to '$Prompt'" Write-Verbose "Setting prompt to '$Prompt'"
@@ -233,7 +235,6 @@ if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {
Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) "
_OLD_VIRTUAL_PROMPT _OLD_VIRTUAL_PROMPT
} }
$env:VIRTUAL_ENV_PROMPT = $Prompt
} }
# Clear PYTHONHOME # Clear PYTHONHOME

View File

@@ -14,8 +14,9 @@ deactivate () {
unset _OLD_VIRTUAL_PYTHONHOME unset _OLD_VIRTUAL_PYTHONHOME
fi fi
# Call hash to forget past commands. Without forgetting # Call hash to forget past locations. Without forgetting
# past commands the $PATH changes we made may not be respected # past locations the $PATH changes we made may not be respected.
# See "man bash" for more details. hash is usually a builtin of your shell
hash -r 2> /dev/null hash -r 2> /dev/null
if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
@@ -36,19 +37,26 @@ deactivate () {
deactivate nondestructive deactivate nondestructive
# on Windows, a path can contain colons and backslashes and has to be converted: # on Windows, a path can contain colons and backslashes and has to be converted:
if [ "${OSTYPE:-}" = "cygwin" ] || [ "${OSTYPE:-}" = "msys" ] ; then case "$(uname)" in
# transform D:\path\to\venv to /d/path/to/venv on MSYS CYGWIN*|MSYS*|MINGW*)
# and to /cygdrive/d/path/to/venv on Cygwin # transform D:\path\to\venv to /d/path/to/venv on MSYS and MINGW
export VIRTUAL_ENV=$(cygpath "/home/dadams/Repos/california_equity_git/.venv") # and to /cygdrive/d/path/to/venv on Cygwin
else VIRTUAL_ENV=$(cygpath /home/dadams/Repos/california_equity_git/.venv)
# use the path as-is export VIRTUAL_ENV
export VIRTUAL_ENV="/home/dadams/Repos/california_equity_git/.venv" ;;
fi *)
# use the path as-is
export VIRTUAL_ENV=/home/dadams/Repos/california_equity_git/.venv
;;
esac
_OLD_VIRTUAL_PATH="$PATH" _OLD_VIRTUAL_PATH="$PATH"
PATH="$VIRTUAL_ENV/bin:$PATH" PATH="$VIRTUAL_ENV/"bin":$PATH"
export PATH export PATH
VIRTUAL_ENV_PROMPT=.venv
export VIRTUAL_ENV_PROMPT
# unset PYTHONHOME if set # unset PYTHONHOME if set
# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) # this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
# could use `if (set -u; : $PYTHONHOME) ;` in bash # could use `if (set -u; : $PYTHONHOME) ;` in bash
@@ -59,10 +67,8 @@ fi
if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
_OLD_VIRTUAL_PS1="${PS1:-}" _OLD_VIRTUAL_PS1="${PS1:-}"
PS1="(.venv) ${PS1:-}" PS1="(".venv") ${PS1:-}"
export PS1 export PS1
VIRTUAL_ENV_PROMPT="(.venv) "
export VIRTUAL_ENV_PROMPT
fi fi
# Call hash to forget past commands. Without forgetting # Call hash to forget past commands. Without forgetting

View File

@@ -9,17 +9,17 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA
# Unset irrelevant variables. # Unset irrelevant variables.
deactivate nondestructive deactivate nondestructive
setenv VIRTUAL_ENV "/home/dadams/Repos/california_equity_git/.venv" setenv VIRTUAL_ENV /home/dadams/Repos/california_equity_git/.venv
set _OLD_VIRTUAL_PATH="$PATH" set _OLD_VIRTUAL_PATH="$PATH"
setenv PATH "$VIRTUAL_ENV/bin:$PATH" setenv PATH "$VIRTUAL_ENV/"bin":$PATH"
setenv VIRTUAL_ENV_PROMPT .venv
set _OLD_VIRTUAL_PROMPT="$prompt" set _OLD_VIRTUAL_PROMPT="$prompt"
if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then
set prompt = "(.venv) $prompt" set prompt = "(".venv") $prompt:q"
setenv VIRTUAL_ENV_PROMPT "(.venv) "
endif endif
alias pydoc python -m pydoc alias pydoc python -m pydoc

View File

@@ -33,10 +33,11 @@ end
# Unset irrelevant variables. # Unset irrelevant variables.
deactivate nondestructive deactivate nondestructive
set -gx VIRTUAL_ENV "/home/dadams/Repos/california_equity_git/.venv" set -gx VIRTUAL_ENV /home/dadams/Repos/california_equity_git/.venv
set -gx _OLD_VIRTUAL_PATH $PATH set -gx _OLD_VIRTUAL_PATH $PATH
set -gx PATH "$VIRTUAL_ENV/bin" $PATH set -gx PATH "$VIRTUAL_ENV/"bin $PATH
set -gx VIRTUAL_ENV_PROMPT .venv
# Unset PYTHONHOME if set. # Unset PYTHONHOME if set.
if set -q PYTHONHOME if set -q PYTHONHOME
@@ -56,7 +57,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
set -l old_status $status set -l old_status $status
# Output the venv prompt; color taken from the blue of the Python logo. # Output the venv prompt; color taken from the blue of the Python logo.
printf "%s%s%s" (set_color 4B8BBE) "(.venv) " (set_color normal) printf "%s(%s)%s " (set_color 4B8BBE) .venv (set_color normal)
# Restore the return status of the previous command. # Restore the return status of the previous command.
echo "exit $old_status" | . echo "exit $old_status" | .
@@ -65,5 +66,4 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
end end
set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV"
set -gx VIRTUAL_ENV_PROMPT "(.venv) "
end end

View File

@@ -1,4 +1,4 @@
#!/home/dadams/Repos/california_equity_git/.venv/bin/python #!/home/dadams/Repos/california_equity_git/.venv/bin/python3.13
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

View File

@@ -1,4 +1,4 @@
#!/home/dadams/Repos/california_equity_git/.venv/bin/python #!/home/dadams/Repos/california_equity_git/.venv/bin/python3.13
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

View File

@@ -1,4 +1,4 @@
#!/home/dadams/Repos/california_equity_git/.venv/bin/python #!/home/dadams/Repos/california_equity_git/.venv/bin/python3.13
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

View File

@@ -1,4 +1,4 @@
#!/home/dadams/Repos/california_equity_git/.venv/bin/python #!/home/dadams/Repos/california_equity_git/.venv/bin/python3.13
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

View File

@@ -1,4 +1,4 @@
#!/home/dadams/Repos/california_equity_git/.venv/bin/python #!/home/dadams/Repos/california_equity_git/.venv/bin/python3.13
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import re import re
import sys import sys

View File

@@ -1,5 +1,5 @@
home = /usr/bin home = /usr/bin
include-system-site-packages = false include-system-site-packages = false
version = 3.12.7 version = 3.13.2
executable = /usr/bin/python3.12 executable = /usr/bin/python3.13
command = /usr/bin/python -m venv /home/dadams/Repos/california_equity_git/.venv command = /home/dadams/Repos/california_equity_git/.venv/bin/python -m venv /home/dadams/Repos/california_equity_git/.venv

1577
01_analyzer.ipynb Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

1837
cci_analyzer.py Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

447656
gpd Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 KiB

BIN
output/carb_analysis.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 363 KiB

BIN
output/cci_overview.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 555 KiB

300279
plt Normal file

File diff suppressed because it is too large Load Diff

298557
sns Normal file

File diff suppressed because it is too large Load Diff