Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made deploy_hed2 directory on hed2_archive #90

Merged
merged 1 commit into from
Nov 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions hedtools/venv/Scripts/Activate.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
function global:deactivate ([switch]$NonDestructive) {
# Revert to original values
if (Test-Path function:_OLD_VIRTUAL_PROMPT) {
copy-item function:_OLD_VIRTUAL_PROMPT function:prompt
remove-item function:_OLD_VIRTUAL_PROMPT
}

if (Test-Path env:_OLD_VIRTUAL_PYTHONHOME) {
copy-item env:_OLD_VIRTUAL_PYTHONHOME env:PYTHONHOME
remove-item env:_OLD_VIRTUAL_PYTHONHOME
}

if (Test-Path env:_OLD_VIRTUAL_PATH) {
copy-item env:_OLD_VIRTUAL_PATH env:PATH
remove-item env:_OLD_VIRTUAL_PATH
}

if (Test-Path env:VIRTUAL_ENV) {
remove-item env:VIRTUAL_ENV
}

if (!$NonDestructive) {
# Self destruct!
remove-item function:deactivate
}
}

deactivate -nondestructive

$env:VIRTUAL_ENV="D:\Research\HEDPython\hed-python\hedtools\venv"

if (! $env:VIRTUAL_ENV_DISABLE_PROMPT) {
# Set the prompt to include the env name
# Make sure _OLD_VIRTUAL_PROMPT is global
function global:_OLD_VIRTUAL_PROMPT {""}
copy-item function:prompt function:_OLD_VIRTUAL_PROMPT
function global:prompt {
Write-Host -NoNewline -ForegroundColor Green '(venv) '
_OLD_VIRTUAL_PROMPT
}
}

# Clear PYTHONHOME
if (Test-Path env:PYTHONHOME) {
copy-item env:PYTHONHOME env:_OLD_VIRTUAL_PYTHONHOME
remove-item env:PYTHONHOME
}

# Add the venv to the PATH
copy-item env:PATH env:_OLD_VIRTUAL_PATH
$env:PATH = "$env:VIRTUAL_ENV\Scripts;$env:PATH"
76 changes: 76 additions & 0 deletions hedtools/venv/Scripts/activate
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# This file must be used with "source bin/activate" *from bash*
# you cannot run it directly

deactivate () {
# reset old environment variables
if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then
PATH="${_OLD_VIRTUAL_PATH:-}"
export PATH
unset _OLD_VIRTUAL_PATH
fi
if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then
PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}"
export PYTHONHOME
unset _OLD_VIRTUAL_PYTHONHOME
fi

# This should detect bash and zsh, which have a hash command that must
# be called to get it to forget past commands. Without forgetting
# past commands the $PATH changes we made may not be respected
if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
hash -r
fi

if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then
PS1="${_OLD_VIRTUAL_PS1:-}"
export PS1
unset _OLD_VIRTUAL_PS1
fi

unset VIRTUAL_ENV
if [ ! "${1:-}" = "nondestructive" ] ; then
# Self destruct!
unset -f deactivate
fi
}

# unset irrelevant variables
deactivate nondestructive

VIRTUAL_ENV="D:\Research\HEDPython\hed-python\hedtools\venv"
export VIRTUAL_ENV

_OLD_VIRTUAL_PATH="$PATH"
PATH="$VIRTUAL_ENV/Scripts:$PATH"
export PATH

# unset PYTHONHOME if set
# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
# could use `if (set -u; : $PYTHONHOME) ;` in bash
if [ -n "${PYTHONHOME:-}" ] ; then
_OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}"
unset PYTHONHOME
fi

if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
_OLD_VIRTUAL_PS1="${PS1:-}"
if [ "x(venv) " != x ] ; then
PS1="(venv) ${PS1:-}"
else
if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then
# special case for Aspen magic directories
# see http://www.zetadev.com/software/aspen/
PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1"
else
PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1"
fi
fi
export PS1
fi

# This should detect bash and zsh, which have a hash command that must
# be called to get it to forget past commands. Without forgetting
# past commands the $PATH changes we made may not be respected
if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then
hash -r
fi
33 changes: 33 additions & 0 deletions hedtools/venv/Scripts/activate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@echo off

rem This file is UTF-8 encoded, so we need to update the current code page while executing it
for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
set _OLD_CODEPAGE=%%a
)
if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul
)

set VIRTUAL_ENV=D:\Research\HEDPython\hed-python\hedtools\venv

if not defined PROMPT set PROMPT=$P$G

if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%

set _OLD_VIRTUAL_PROMPT=%PROMPT%
set PROMPT=(venv) %PROMPT%

if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
set PYTHONHOME=

if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%

set PATH=%VIRTUAL_ENV%\Scripts;%PATH%

:END
if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
set _OLD_CODEPAGE=
)
21 changes: 21 additions & 0 deletions hedtools/venv/Scripts/deactivate.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@echo off

if defined _OLD_VIRTUAL_PROMPT (
set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
)
set _OLD_VIRTUAL_PROMPT=

if defined _OLD_VIRTUAL_PYTHONHOME (
set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
set _OLD_VIRTUAL_PYTHONHOME=
)

if defined _OLD_VIRTUAL_PATH (
set "PATH=%_OLD_VIRTUAL_PATH%"
)

set _OLD_VIRTUAL_PATH=

set VIRTUAL_ENV=

:END
Binary file added hedtools/venv/Scripts/easy_install-3.7.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/easy_install.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/pip.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/pip3.7.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/pip3.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/python.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/python_d.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/pythonw.exe
Binary file not shown.
Binary file added hedtools/venv/Scripts/pythonw_d.exe
Binary file not shown.
3 changes: 3 additions & 0 deletions hedtools/venv/pyvenv.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
home = C:\Program Files\Python37
include-system-site-packages = false
version = 3.7.9
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions hedweb/deploy/config.py → hedweb/deploy_hed2/config.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class DevelopmentConfig(Config):
class ProductionConfig(Config):
DEBUG = False
TESTING = False
URL_PREFIX = 'hed'
STATIC_URL_PATH = '/hed/static'


class TestConfig(Config):
Expand Down
4 changes: 2 additions & 2 deletions hedweb/deploy/deploy.sh → hedweb/deploy_hed2/deploy.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ IMAGE_NAME="hedtools-validation:latest"
CONTAINER_NAME="hedtools-validation"
GIT_REPO_URL="https://github.com/hed-standard/hed-python"
GIT_DIR="${PWD}/hed-python"
GIT_REPO_BRANCH="master"
GIT_REPO_BRANCH="hed2_archive"
HOST_PORT=33000
CONTAINER_PORT=80

DEPLOY_DIR="hed-python/hedweb/deploy"
DEPLOY_DIR="hed-python/hedweb/deploy_hed2"
CODE_DEPLOY_DIR="${DEPLOY_DIR}/hedtools"
CONFIG_FILE="${ROOT_DIR}/config.py"
WSGI_FILE="${DEPLOY_DIR}/webinterface.wsgi"
Expand Down
2 changes: 1 addition & 1 deletion hedweb/deploy/deploy_dev.sh → hedweb/deploy_hed2/deploy_dev.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GIT_REPO_BRANCH="master"
HOST_PORT=33000;
CONTAINER_PORT=80;

DEPLOY_DIR="${ROOT_DIR}/hed-python/hedweb/deploy"
DEPLOY_DIR="${ROOT_DIR}/hed-python/hedweb/deploy_hed2"
CODE_DEPLOY_DIR="${DEPLOY_DIR}/hedtools"
CONFIG_FILE="${ROOT_DIR}/config.py"
WSGI_FILE="${DEPLOY_DIR}/webinterface.wsgi"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.