Skip to content

Commit

Permalink
Fix python virtual environment support.
Browse files Browse the repository at this point in the history
This works with python 3.9, 3.10, 3.11 and 3.12 on MacOS.
  • Loading branch information
doncho-gunchev committed Jul 15, 2024
1 parent b3f0f66 commit 6271df8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ help:
@echo "▀▀▀▀▀▀"
@echo
@echo "Available targets:"
@echo " dist: create source distribution package in dist/"
@echo " rpm: create an RPM package"
@echo " changelog: Add a changelog entry to gwebu-profile.spec.in"
@echo " dist: Create source distribution package in dist/."
@echo " rpm: Create an RPM package."
@echo " podman_rpm Create an RPM package using podman on MacOS."
@echo " changelog: Add a changelog entry to gwebu-profile.spec.in."
@echo
@echo " clean: clean all generated files"
@echo " clean: Clean all generated files."
@echo
@echo "Version $(ver), rpm_ver=$(rpm_ver), rpm_rev=$(rpm_rev)."
.PHONY: help
Expand Down Expand Up @@ -50,10 +51,9 @@ clean:


.PHONY: podman_rpm
podman_rpm:
podman_rpm: dist
podman buildx build -t podman_rpm_build -f Dockerfile-build . # --platform linux/amd64
# Extract the RPMs from the container to ./dist/ locally.
if ! test -d dist; then mkdir dist; fi
podman run --rm -d --name=build localhost/podman_rpm_build /usr/bin/bash -c "trap : TERM INT; sleep infinity & wait"
podman cp build:/tmp/RPMS/. ./dist/
podman stop build
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DIST_PRE="${PLATFORM_ID##*:}" # el8
DIST="${DIST:-${DIST_PRE%%[0-9]*}}" # el
OUT_DIR="/tmp/RPMS"

export LANG='en_US.UTF-8'
export LANG='C.UTF-8'
export LANGUAGE="${LANG}"
export LC_ALL="${LANG}"
export LC_MEASUREMENT="${LANG}"
Expand Down
4 changes: 2 additions & 2 deletions etc/profile.d/z-ps-twtty-7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ function prompt_command() {
local prompt="--($my_D, Err ${my_P[*]}, $my_TTY)---($PWD)--"

if [ -n "${VIRTUAL_ENV:-}" ] && [ -n "$_OLD_VIRTUAL_PS1" ]; then
my_VENV="${VIRTUAL_ENV_PROMPT}"
export my_VENV="${VIRTUAL_ENV##*/}"
prompt="--($my_D, Err ${my_P[*]}, $my_TTY, $my_VENV)---($PWD)--"
if [ "${PS1:1:${#VIRTUAL_ENV_PROMPT}}" == "$VIRTUAL_ENV_PROMPT" ]; then
if [ "${PS1:0:${#my_VENV}+3}" == "($my_VENV) " ]; then
# PS1 will be restored by virtual environment's deactivate script.
# Yeah, that has to be done better, 172 is correct but magic number.
export PS1="${_OLD_VIRTUAL_PS1:0:172}, ${my_VENV}${_OLD_VIRTUAL_PS1:172}"
Expand Down
6 changes: 5 additions & 1 deletion gwebu-profile.spec.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: Gwebu profile.d - cool date, prompt with history, aliases
Name: gwebu-profile
Version: 1.0.3
Version: 1.0.4
Release: 0
BuildArch: noarch
License: GPLv2
Expand Down Expand Up @@ -41,6 +41,10 @@ install -m 0644 etc/profile.d/*.sh %{buildroot}%{_sysconfdir}/profile.d/


%changelog
* Mon Jul 15 2024 Doncho Gunchev <[email protected]> - 1.0.4-0
- Fix python virtual environment support.
This works on MacOS with python 3.9, 3.10, 3.11 and 3.12.

* Sun Jul 14 2024 Doncho Gunchev <[email protected]> - 1.0.3-0
- Initial python virtual environment support.

Expand Down

0 comments on commit 6271df8

Please sign in to comment.