From 67f4ae1a59175574bc5367f037b1427494210e53 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:26:34 +0100 Subject: [PATCH 01/10] Removed jenkins* files --- build_tools/jenkins_linux_build.sh | 86 ----------------- build_tools/jenkins_linux_pylint.sh | 16 ---- build_tools/jenkins_linux_test.sh | 14 --- build_tools/jenkins_osx_build.sh | 92 ------------------ build_tools/jenkins_qt5_centos.sh | 52 ----------- build_tools/jenkins_qt5_win.bat | 85 ----------------- build_tools/jenkins_qt5_win_commercial.bat | 85 ----------------- build_tools/jenkins_rhel6_build.sh | 73 --------------- build_tools/jenkins_ubuntu_build.sh | 74 --------------- build_tools/jenkins_win64_build.bat | 96 ------------------- build_tools/jenkins_win_build.bat | 104 --------------------- 11 files changed, 777 deletions(-) delete mode 100755 build_tools/jenkins_linux_build.sh delete mode 100755 build_tools/jenkins_linux_pylint.sh delete mode 100755 build_tools/jenkins_linux_test.sh delete mode 100755 build_tools/jenkins_osx_build.sh delete mode 100644 build_tools/jenkins_qt5_centos.sh delete mode 100644 build_tools/jenkins_qt5_win.bat delete mode 100644 build_tools/jenkins_qt5_win_commercial.bat delete mode 100755 build_tools/jenkins_rhel6_build.sh delete mode 100644 build_tools/jenkins_ubuntu_build.sh delete mode 100644 build_tools/jenkins_win64_build.bat delete mode 100644 build_tools/jenkins_win_build.bat diff --git a/build_tools/jenkins_linux_build.sh b/build_tools/jenkins_linux_build.sh deleted file mode 100755 index 34ea2b91bf..0000000000 --- a/build_tools/jenkins_linux_build.sh +++ /dev/null @@ -1,86 +0,0 @@ -export PATH=$PATH:/usr/local/bin/ - -PYTHON=${PYTHON:-`which python`} -EASY_INSTALL=${EASY_INSTALL:-`which easy_install`} -PYLINT=${PYLINT:-`which pylint`} - -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/utils -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/sasview-install - - -cd $WORKSPACE - - -# SET SASVIEW GITHASH -cd $WORKSPACE -cd sasview/src/sas/sasview -githash=$( git rev-parse HEAD ) -sed -i.bak s/GIT_COMMIT/$githash/g __init__.py - - -# SASMODLES -cd $WORKSPACE -cd sasmodels - -rm -rf build -rm -rf dist - -$PYTHON setup.py clean -$PYTHON setup.py build - - -# SASMODLES - BUILD DOCS -cd doc -make html - -cd $WORKSPACE -cd sasmodels -$PYTHON setup.py bdist_egg -$PYTHON -m sasmodels.model_test all - -# SASVIEW -cd $WORKSPACE -cd sasview -rm -rf sasview-install -mkdir sasview-install -rm -rf utils -mkdir utils -rm -rf dist -rm -rf build - - -# INSTALL SASMODELS -cd $WORKSPACE -cd sasmodels -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/utils sasmodels*.egg - - -# BUILD SASVIEW -cd $WORKSPACE -cd sasview -$PYTHON setup.py clean -$PYTHON setup.py build docs bdist_egg - -# CREATE PDF FROM LATEX -#cd $WORKSPACE -#cd sasview/docs/sphinx-docs/build/latex -#pdflatex SasView.tex - -# INSTALL SASVIEW -cd $WORKSPACE -cd sasview -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg - - -# TEST -cd $WORKSPACE -cd sasview -cd test -$PYTHON utest_sasview.py - -## PYLINT -#cd $WORKSPACE -#cd sasview -#$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee test/sasview.txt diff --git a/build_tools/jenkins_linux_pylint.sh b/build_tools/jenkins_linux_pylint.sh deleted file mode 100755 index 4ec7f53e22..0000000000 --- a/build_tools/jenkins_linux_pylint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh -set -x - -# try to find reasonable settings, if not provided in the environment -PYTHON=${PYTHON:-`which python`} -PYLINT=${PYLINT:-`which pylint`} -BUILD_TOOLS_DIR=`dirname $0` -WORKSPACE=${WORKSPACE:-`readlink -f $BUILD_TOOLS_DIR/..`} -# WORKSPACE top level of source - -export PYTHONPATH=$WORKSPACE/sasview-install:$WORKSPACE/utils:$PYTHONPATH - -cd $WORKSPACE -rm -f test/sasview.txt - -$PYLINT --rcfile "$WORKSPACE/build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview > test/sasview.txt || exit 0 diff --git a/build_tools/jenkins_linux_test.sh b/build_tools/jenkins_linux_test.sh deleted file mode 100755 index b1030b4492..0000000000 --- a/build_tools/jenkins_linux_test.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh - -# try to find reasonable settings, if not provided in the environment -PYTHON=${PYTHON:-`which python`} -PYLINT=${PYLINT:-`which pylint`} -BUILD_TOOLS_DIR=`dirname $0` -WORKSPACE=${WORKSPACE:-`readlink -f $BUILD_TOOLS_DIR/..`} -# WORKSPACE top level of source - -cd $WORKSPACE/test - -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview-install:$WORKSPACE/utils - -$PYTHON utest_sasview.py diff --git a/build_tools/jenkins_osx_build.sh b/build_tools/jenkins_osx_build.sh deleted file mode 100755 index c0c34f747e..0000000000 --- a/build_tools/jenkins_osx_build.sh +++ /dev/null @@ -1,92 +0,0 @@ -export PATH=$PATH:/usr/local/bin/ - -PYTHON=${PYTHON:-`which python`} -EASY_INSTALL=${EASY_INSTALL:-`which easy_install`} -PYLINT=${PYLINT:-`which pylint`} - -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/utils -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/sasview-install -export PYTHONPATH=$PYTHONPATH:/Library/Python/2.7/site-packages - -export LC_ALL=en_US.UTF-8 -export LANG=en_US.UTF-8 - - -cd $WORKSPACE - -# SET SASVIEW GITHASH -cd $WORKSPACE -cd sasview/src/sas/sasview -githash=$( git rev-parse HEAD ) -sed -i.bak s/GIT_COMMIT/$githash/g __init__.py - - -# SASMODLES -cd $WORKSPACE -cd sasmodels - -rm -rf build -rm -rf dist - -$PYTHON setup.py clean -$PYTHON setup.py build - - -# SASMODLES - BUILD DOCS -cd doc -make html - -#SASMODELS - BUILDING AND TESTING -cd $WORKSPACE -cd sasmodels -$PYTHON setup.py bdist_egg -$PYTHON -m sasmodels.model_test all - -# SASVIEW -cd $WORKSPACE -cd sasview -rm -rf sasview-install -mkdir sasview-install -rm -rf utils -mkdir utils -rm -rf dist -rm -rf build - - -# INSTALL SASMODELS -cd $WORKSPACE -cd sasmodels -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/utils sasmodels*.egg - - -# BUILD SASVIEW -cd $WORKSPACE -cd sasview -$PYTHON setup.py clean -$PYTHON setup.py build docs bdist_egg - - -# INSTALL SASVIEW -cd $WORKSPACE -cd sasview -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg - - -# TEST -cd $WORKSPACE -cd sasview -cd test -$PYTHON utest_sasview.py - -# PYLINT -cd $WORKSPACE -cd sasview -$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee test/sasview.txt - -# BUILD APP -cd $WORKSPACE -cd sasview/installers -$PYTHON setup_mac.py py2app - diff --git a/build_tools/jenkins_qt5_centos.sh b/build_tools/jenkins_qt5_centos.sh deleted file mode 100644 index 494f647cc0..0000000000 --- a/build_tools/jenkins_qt5_centos.sh +++ /dev/null @@ -1,52 +0,0 @@ -# Activate new env -cd $WORKSPACE -cd sasview -cd build_tools - -conda_env_name="$(grep 'name: ' conda_qt5_min_centos.yml)" -echo $conda_env_name -conda_env_name=${conda_env_name:6} -echo $conda_env_name - -source activate $conda_env_name - - -# Now build Sasview - -# Sasmodels -cd $WORKSPACE -cd sasmodels -python setup.py build - -cd $WORKSPACE -cd sasmodels -cd doc -make html - -cd $WORKSPACE -cd sasmodels -python setup.py build install - - -# SasView -cd $WORKSPACE -cd sasview -python src/sas/qtgui/convertUI.py -python setup.py build docs install - - -# Pyinstaller -cd $WORKSPACE -cd sasview -cd installers -pyinstaller sasview_qt5_min_centos.spec - -cd $WORKSPACE -cd sasview -cd installers -cp run_sasview.sh dist/sasview -cp set_sasview_qt5_path.sh dist/sasview -cd dist -mv sasview SasView -tar czvf SasView.tar.gz SasView - diff --git a/build_tools/jenkins_qt5_win.bat b/build_tools/jenkins_qt5_win.bat deleted file mode 100644 index f9a49eb0cd..0000000000 --- a/build_tools/jenkins_qt5_win.bat +++ /dev/null @@ -1,85 +0,0 @@ -:: Find ENV NAME -cd %WORKSPACE% -cd sasview -cd build_tools -findstr "name:" conda_qt5_win.yml > condaenv_name.txt -set /p condaname= condaenv_name.txt -set /p condaname= env-build.yml -conda list --explicit > explicit.yml - -a='/home/sasview/logs/' -b='_env_build.yml' -DEST_FILE=$a$BUILD_NUMBER$b -cp env-build.yml $DEST_FILE \ No newline at end of file diff --git a/build_tools/jenkins_win64_build.bat b/build_tools/jenkins_win64_build.bat deleted file mode 100644 index a411ad7dad..0000000000 --- a/build_tools/jenkins_win64_build.bat +++ /dev/null @@ -1,96 +0,0 @@ -set PYTHON=python.exe -set EASY_INSTALL=easy_install.exe -set PYLINT=pylint.exe -set INNO="C:\util\inno\ISCC.exe" -set GIT_SED=C:\"Program Files"\Git\bin\sed.exe -set SAS_COMPILER=tinycc - -set PYTHONPATH=%WORKSPACE%\sasview\utils -set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\sasview-install - -echo %PYTHONPATH% -echo %WORKSPACE% - - -:: SET SASVIEW GITHASH ################################################ -cd %WORKSPACE% -cd sasview\src\sas\sasview -git rev-parse HEAD > tmpFile_githash -SET /p githash= < tmpFile_githash -DEL tmpFile_githash -%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py - -:: MAKE DIR FOR EGGS ################################################## -cd %WORKSPACE% -cd sasview -MD sasview-install -MD utils - -:: TINYCC build #################################################### -cd %WORKSPACE% -cd tinycc -%PYTHON% setup.py build -xcopy /S build\lib\* %WORKSPACE%\sasview\utils\ - - -:: SASMODELS build #################################################### -cd %WORKSPACE% -cd sasmodels -%PYTHON% setup.py build - -:: SASMODELS doc ###################################################### -cd doc -make html - -:: SASMODELS build egg ################################################ -cd %WORKSPACE% -cd sasmodels -%PYTHON% setup.py bdist_egg -%PYTHON% -m sasmodels.model_test all - -:: SASMODELS install egg ############################################## -cd %WORKSPACE% -cd sasmodels -cd dist -echo F | xcopy sasmodels-*.egg sasmodels.egg /Y -%EASY_INSTALL% -d %WORKSPACE%\sasview\utils sasmodels.egg - - -:: NOW BUILD SASVIEW - -:: SASVIEW build egg ################################################ -cd %WORKSPACE% -cd sasview -%PYTHON% setup.py build docs bdist_egg - - -:: SASVIEW utest ###################################################### -cd %WORKSPACE%\sasview\test -%PYTHON% utest_sasview.py - - -:: SASVIEW INSTALL EGG ################################################ -cd %WORKSPACE% -cd sasview -cd dist -echo F | xcopy sasview-*.egg sasview.egg /Y -%EASY_INSTALL% -d %WORKSPACE%\sasview\sasview-install sasview.egg - - -:: SASVIEW INSTALLER ################################################## -cd %WORKSPACE% -cd sasview -cd installers -%PYTHON% setup_exe.py py2exe -%PYTHON% installer_generator.py -%INNO% installer.iss -cd Output -xcopy setupSasView.exe %WORKSPACE%\sasview\dist - -:: SASVIEW PYLINT ##################################################### -cd %WORKSPACE%\sasview -%PYLINT% --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sas sasview > test/sasview.txt - - -:: GO BACK ############################################################ -cd %WORKSPACE% diff --git a/build_tools/jenkins_win_build.bat b/build_tools/jenkins_win_build.bat deleted file mode 100644 index bdf3f95635..0000000000 --- a/build_tools/jenkins_win_build.bat +++ /dev/null @@ -1,104 +0,0 @@ -set PYTHON=c:\python27\python -set EASY_INSTALL=c:\python27\scripts\easy_install.exe -set PATH=c:\python27;c:\mingw\bin;%PATH% -set PYLINT= C:\Python27\Scripts\pylint -set INNO="C:\Program Files (x86)\Inno Setup 5\ISCC.exe" -set GIT_SED=C:\"Program Files (x86)"\Git\bin\sed.exe -set SAS_COMPILER=mingw - - -set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\utils -set PYTHONPATH=%PYTHONPATH%;%WORKSPACE%\sasview\sasview-install - -echo %PYTHONPATH% -echo %WORKSPACE% - - -:: SET SASVIEW GITHASH ################################################ -cd %WORKSPACE% -cd sasview\src\sas\sasview -git rev-parse HEAD > tmpFile_githash -SET /p githash= < tmpFile_githash -DEL tmpFile_githash -%GIT_SED% -i.bak "s/GIT_COMMIT/%githash%/g" __init__.py - - - -:: MAKE DIR FOR EGGS ################################################## -cd %WORKSPACE% -cd sasview -MD sasview-install -MD utils - - -:: SASMODELS build #################################################### -cd %WORKSPACE% -cd sasmodels -%PYTHON% setup.py build - - - -:: SASMODELS doc ###################################################### -cd doc -make html - - -:: SASMODELS build egg ################################################ -cd %WORKSPACE% -cd sasmodels -%PYTHON% setup.py bdist_egg -%PYTHON% -m sasmodels.model_test all - -:: SASMODELS install egg ############################################## -cd %WORKSPACE% -cd sasmodels -cd dist -echo F | xcopy sasmodels-*.egg sasmodels.egg /Y -%EASY_INSTALL% -d %WORKSPACE%\sasview\utils sasmodels.egg - - -:: NOW BUILD SASVIEW - -:: SASVIEW build egg ################################################ -:: Remember to modify C:\Python27\Lib\distutils\distutils.cfg to you compiler -cd %WORKSPACE% -cd sasview -%PYTHON% setup.py build docs bdist_egg - - -:: SASVIEW utest ###################################################### -cd %WORKSPACE%\sasview\test -%PYTHON% utest_sasview.py - - -:: SASVIEW INSTALL EGG ################################################ -cd %WORKSPACE% -cd sasview -cd dist -echo F | xcopy sasview-*.egg sasview.egg /Y -%EASY_INSTALL% -d %WORKSPACE%\sasview\sasview-install sasview.egg - - -:: TINYCC build #################################################### -cd %WORKSPACE% -cd tinycc -%PYTHON% setup.py build -xcopy /S build\lib\* %WORKSPACE%\sasview\utils\ - -:: SASVIEW INSTALLER ################################################## -cd %WORKSPACE% -cd sasview -cd installers -%PYTHON% setup_exe.py py2exe -%PYTHON% installer_generator.py -%INNO% installer.iss -cd Output -xcopy setupSasView.exe %WORKSPACE%\sasview\dist - -:: SASVIEW PYLINT ##################################################### -cd %WORKSPACE%\sasview -%PYLINT% --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview.egg/sas sasview > test/sasview.txt - - -:: GO BACK ############################################################ -cd %WORKSPACE% From 887b71b1dcc607b7a6d9740b8a4d155ef8c4f99f Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:27:14 +0100 Subject: [PATCH 02/10] Removed outdated .spec --- build_tools/sasview.spec | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 build_tools/sasview.spec diff --git a/build_tools/sasview.spec b/build_tools/sasview.spec deleted file mode 100644 index a1af074a6d..0000000000 --- a/build_tools/sasview.spec +++ /dev/null @@ -1,38 +0,0 @@ -Summary: sasview -Name: sasview -Version: 4.0.0 -Release: 8 -Group: Applications/Engineering -prefix: /opt/sasview -BuildRoot: %{_tmppath}/%{name} -License: Open -Source: sasview.tgz - -%define debug_package %{nil} -%define site_packages %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") - -%description -SasView analysis application for small-angle scattering - -%prep -%setup -q -n %{name} - -%build - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{site_packages} - -export PYTHONPATH=$PYTHONPATH:%{buildroot}%{site_packages} -easy_install -s %{buildroot}%{_bindir} -d %{buildroot}%{site_packages} sasview*.egg -easy_install -d %{buildroot}%{site_packages} sasmodels*.egg -%post - -%files -/usr/lib/python2.7 -/usr/bin/sasview -/usr/bin/bumps - - - - From 7f6d85c66e9bb0ce1b54432fac39d1cf1bb2a1bd Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:28:08 +0100 Subject: [PATCH 03/10] Removed cx_setup.py - clearly outdated --- build_tools/cx_setup.py | 170 ---------------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 build_tools/cx_setup.py diff --git a/build_tools/cx_setup.py b/build_tools/cx_setup.py deleted file mode 100644 index 97ce0a393e..0000000000 --- a/build_tools/cx_setup.py +++ /dev/null @@ -1,170 +0,0 @@ -import os -import sys -import scipy -import matplotlib -import cython - -import zmq.libzmq -import periodictable -import sasmodels -import sasmodels.core - -from cx_Freeze import setup -from cx_Freeze import Executable -from distutils.filelist import findall -from distutils.sysconfig import get_python_lib -from distutils.filelist import findall -from distutils.util import get_platform - -try: - import tinycc -except ImportError: - warnings.warn("TinyCC package is not available and will not be included") - tinycc = None - -# Full path to sasview/build/lib.-2.7 -root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -platform = '%s-%s'%(get_platform(), sys.version[:3]) -build_path = os.path.join(root, 'build', 'lib.'+platform) -sys.path.insert(0, build_path) -python_root = os.path.dirname(os.path.abspath(sys.executable)) - - -# Excluded packages -excl = ['collections.sys', 'collections._weakref', 'Tkinter'] - -# Explicityl included modules -incl = [ -'pygments', 'pygments.lexers','pygments.lexers.python', -'pygments.styles','pygments.styles.default', -'ipykernel', 'ipykernel.datapub', -'atexit', 'cython', 'sip', 'xhtml2pdf', -'zmq', 'zmq.utils', 'zmq.utils.strtypes', -'zmq.utils.jsonapi','zmq.utils.garbage', -'zmq.backend.cython','zmq.backend.cffi', -'site','lxml._elementpath','lxml.etree', -] - -# Extra packages -packs = [ -'periodictable.core', -'matplotlib', -'encodings', -'comtypes', -'bumps', -'sasmodels', -'win32com', -] - -if tinycc: - packs.append('tinycc') - - -# Holder for extra files -data_files = [] - -data_files.append(zmq.libzmq.__file__) -data_files.append("local_config.py") -data_files.append("custom_config.py") -data_files.append("logging.ini") -data_files.append("media/") -data_files.append("images/") -data_files.append("test/") -data_files.append("plugin_models/") -data_files.append("compiled_models/") - -def append_data(tups): - # Convert py2exe tuple into cx_freeze tuple - for tup in tups: - target = tup[0] - files = tup[1] - for file in files: - basename = os.path.basename(file) - t = os.path.join(target, basename) - data_files.append((file, t)) - -# Documents -doc_source = os.path.join(build_path, 'doc/') -data_files.append((doc_source, 'doc/')) - -# OPENCL -site_loc = get_python_lib() -opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl") -for f in findall(opencl_include_dir): - target = os.path.join("includes", "pyopencl", os.path.basename(f)) - data_files.append((f, target)) - - -append_data(periodictable.data_files()) -append_data(sasmodels.data_files()) -if tinycc: - append_data(tinycc.data_files()) - -# MATPLOTLIB -matplotlibdatadir = matplotlib.get_data_path() -matplotlibdata = findall(matplotlibdatadir) -for f in matplotlibdata: - dirname = os.path.join('mpl-data', f[len(matplotlibdatadir)+1:]) - target = os.path.join(dirname, os.path.basename(f)) - data_files.append((f, dirname)) - -# Numerical libraries -def dll_check(dll_path, dlls): - dll_includes = [os.path.join(dll_path, dll+'.dll') for dll in dlls] - return [dll for dll in dll_includes if os.path.exists(dll)] - -# Check for ATLAS -dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core') -dlls = ['numpy-atlas'] -atlas_dlls = dll_check(dll_path, dlls) - -# Check for MKL -dll_path = os.path.join(python_root, 'Library', 'bin') -dlls = ['mkl_core', 'mkl_def', 'libiomp5md', 'libmmd', - 'libmmdd', 'libiomp5md', 'libifcoremd', 'libifcoremdd'] -mkl_dlls = dll_check(dll_path, dlls) - -to_include = mkl_dlls -if atlas_dlls: - to_include = atlas_dlls - -for library in to_include: - target = os.path.basename(library) - data_files.append((library, target)) - - -# Precompile models and add them -dll_path = os.path.join(build_path, 'compiled_models') -#compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double') -#for library in compiled_dlls: -# target = os.path.join('compiled_models', os.path.basename(library)) -# data_files.append((library, target)) - -# Extra logic for scipy -scipy_path = os.path.dirname(scipy.__file__) -data_files.append(scipy_path) - - -buildOptions = dict(packages = packs, excludes = excl, includes = incl, - include_files = data_files) - - -base = 'Win32GUI' if sys.platform=='win32' else None - -icon = os.path.join('images','ball.ico') - -executables = [ - Executable('sasview.py', - icon=icon, - base=base) -] - -setup( - name='sasview', - version = '5.0', - description = 'SasviewQt Program', - options = dict(build_exe = buildOptions), - executables = executables -) - - From f9fef35545fae3eb8535f92b647af94e08aff908 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:29:00 +0100 Subject: [PATCH 04/10] Removed jenkins associated deploy.bat --- build_tools/deploy.bat | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 build_tools/deploy.bat diff --git a/build_tools/deploy.bat b/build_tools/deploy.bat deleted file mode 100755 index b204efe828..0000000000 --- a/build_tools/deploy.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -cd "c:\program files\putty" - -rem Copy new installer to the temp directory on the test server -pscp -scp -v -i sasview.ppk C:\jenkins\workspace\SasView_Win7\sasview\installers\Output\setupSasView.exe sasview@192.168.1.18:AppData\Local\Temp\ -rem Execute the test on the remote server -plink -i sasview.ppk -ssh sasview@192.168.1.18 c:\\jenkins\\test_deployment.bat - -cd c:\jenkins From 3e53e47ea4d74734cb069fc8994c6d96cbc65de1 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:31:31 +0100 Subject: [PATCH 05/10] Removed travis related stuff --- .travis.yml | 56 ------------------------------ build_tools/travis_build.sh | 68 ------------------------------------- 2 files changed, 124 deletions(-) delete mode 100644 .travis.yml delete mode 100644 build_tools/travis_build.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6ec6b4dc0e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -matrix: - include: - - os: linux - language: generic - env: - - MINICONDA=https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh - - PY=3.6 - - os: osx - language: generic - env: - - MINICONDA=https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - - PY=3.6 -branches: - only: - - master - - main -addons: - apt: - packages: - - python-pyopencl - - ocl-icd-opencl-dev - - opencl-headers - - libblas-dev - - libatlas-dev - - libatlas-base-dev - - liblapack-dev - - gfortran - - libhdf5-serial-dev -services: - - xvfb -before_install: -- echo $TRAVIS_OS_NAME -- wget $MINICONDA -O miniconda.sh -- bash miniconda.sh -b -p $HOME/miniconda -- export PATH="$HOME/miniconda/bin:$PATH" -- hash -r -#- conda update --yes conda -- conda info -a -- conda install --yes python=$PY numpy scipy cython pylint wxpython matplotlib lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole -install: -- pip install periodictable xhtml2pdf unittest-xml-reporting pylint qt5reactor -# Note: use "... || true" below to silently ignore failure -- pip install pyopencl -script: -- cd .. -- export WORKSPACE=$(pwd) -- git clone --depth=50 --branch=master /~https://github.com/SasView/sasmodels.git sasmodels -- git clone --depth=50 --branch=master /~https://github.com/bumps/bumps.git -- ls -ltr -- mkdir -p utils -- /bin/sh -xe sasview/build_tools/travis_build.sh -- export LC_ALL=en_US.UTF-8 -- export LANG=en_US.UTF-8 -notifications: - slack: - secure: TlsEpZiMLmOOgnmdG0I/oB4tq3bbQYeBBQi6S5qLlkYE9EjUTbbfg7oz0JYUsQ56FAsdFR8zswpBsX7PebZerzrq0ZmvfHSiJhOFIdBfY5Nb7bmLW8/9pUNWV57ON/8Gw2fE5ytc7FgvCGR64yb2QISI/150SIUwvdL5HXTxRWI= diff --git a/build_tools/travis_build.sh b/build_tools/travis_build.sh deleted file mode 100644 index e10d788361..0000000000 --- a/build_tools/travis_build.sh +++ /dev/null @@ -1,68 +0,0 @@ -# Simplified build for Travis CI -export PATH=$PATH:/usr/local/bin/ - -PYTHON=${PYTHON:-`which python`} -EASY_INSTALL=${EASY_INSTALL:-`which easy_install`} - -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/utils -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/sasview-install - -# SET SASVIEW GITHASH -cd $WORKSPACE/sasview/src/sas/sasview -githash=$( git rev-parse HEAD ) -sed -i.bak s/GIT_COMMIT/$githash/g __init__.py - -# SASMODELS -cd $WORKSPACE/sasmodels -rm -rf build -rm -rf dist -$PYTHON setup.py clean -$PYTHON setup.py build -$PYTHON setup.py bdist_egg - -# SASVIEW -cd $WORKSPACE/sasview -rm -rf sasview-install -mkdir sasview-install -rm -rf utils -mkdir utils -rm -rf dist -rm -rf build - -# INSTALL SASMODELS -cd $WORKSPACE/sasmodels/dist -$EASY_INSTALL -d $WORKSPACE/sasview/utils sasmodels*.egg - -# BUILD SASVIEW -cd $WORKSPACE/sasview -$PYTHON setup.py clean -# $PYTHON setup.py build docs bdist_egg -$PYTHON setup.py bdist_egg - -# BUILD DOCS -NUM=4 -mkdir -p ~/.sasmodels/compiled_models -make PYTHON=$PYTHON -j $NUM -C $WORKSPACE/bumps/doc html -make PYTHON=$PYTHON -j $NUM -C $WORKSPACE/sasmodels/doc html -cd $WORKSPACE/sasview/docs/sphinx-docs/ -$PYTHON build_sphinx.py - -# INSTALL SASVIEW -cd $WORKSPACE/sasview/dist -$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg - -for egg in $WORKSPACE/sasview/utils/*egg $WORKSPACE/sasview/sasview-install/*egg; do - PYTHONPATH=$egg:$PYTHONPATH -done - -# TEST -cd $WORKSPACE/sasview/test -$PYTHON utest_sasview.py -# If a display is available, also run the GUI tests -if [ -n "$DISPLAY" ]; then - cd $WORKSPACE/sasview/src/sas/qtgui - # suppress errors from the GUI tests until a baseline 'pass' is obtained - $PYTHON GUITests.py || true -else - echo "NOTE: GUITests.py skipped as no DISPLAY was found" -fi From 666d4551ab2559156603a403c0d93a8c0b74902a Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:33:22 +0100 Subject: [PATCH 06/10] Removed Vagrant related stuff --- .../Ubuntu1404/Build_deb_rpm/CMakeLists.txt | 58 -------- .../Ubuntu1404/Build_deb_rpm/README.md | 18 --- .../Ubuntu1404/Build_deb_rpm/environment.yml | 127 ------------------ .../jenkins_linux_deb_rpm_build.sh | 107 --------------- build_tools/Vagrant/Ubuntu1404/README.md | 51 ------- build_tools/Vagrant/Ubuntu1404/Vagrantfile | 48 ------- .../Vagrant/Ubuntu1404/provision/bootstrap.sh | 6 - .../Vagrant/Ubuntu1404/provision/developer.sh | 22 --- .../Ubuntu1404/provision/environment.yml | 35 ----- .../Vagrant/Ubuntu1404/provision/miniconda.sh | 12 -- 10 files changed, 484 deletions(-) delete mode 100644 build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt delete mode 100644 build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md delete mode 100644 build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml delete mode 100755 build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh delete mode 100644 build_tools/Vagrant/Ubuntu1404/README.md delete mode 100644 build_tools/Vagrant/Ubuntu1404/Vagrantfile delete mode 100644 build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh delete mode 100644 build_tools/Vagrant/Ubuntu1404/provision/developer.sh delete mode 100644 build_tools/Vagrant/Ubuntu1404/provision/environment.yml delete mode 100644 build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt deleted file mode 100644 index 276b78584f..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -cmake_minimum_required(VERSION 2.6) - -# This will install a pyinstaller-generated sasview -project(sasview C) - -# Define the version of sasview being packaged -option(SAS_VERSION "Define SASView version to package" off) - -if (NOT ${SAS_VERSION}) - message(FATAL_ERROR "SASView version unspecified!\n" - "Please use e.g. -DSAS_VERSION=4.1 ") -endif() - -# main install work is done in this function -macro(installDir path) - # Main install location is defined via CMAKE_INSTALL_PREFIX - # - what is chosen here is a subdirectory - install ( - DIRECTORY "${path}/" - DESTINATION "sasview/${SAS_VERSION}" - PATTERN "Makefile*" EXCLUDE # skip makefiles - PATTERN "#*" EXCLUDE # skip backup files - PATTERN ".*" EXCLUDE # skip hidden files - PATTERN "*.out" EXCLUDE # skip binary files - PATTERN "*.*.in" EXCLUDE # skip configure processed template files - PATTERN "*" - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ - ) -endmacro() - -# CPack configuration -set(CPACK_PACKAGE_NAME "sasview-${SAS_VERSION}") -set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}../../LICENSE.TXT") -set(CPACK_PACKAGE_CONTACT "pkwi@fysik.dtu.dk") - -set(CPACK_PACKAGE_VERSION "1.0") -set(CPACK_PACKAGE_VERSION_MAJOR "1") -set(CPACK_PACKAGE_VERSION_MINOR "0") - -# Have CPack respect install prefix -set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Avoid e.g. /usr/local being "part" of the RPMs -set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST - ${CMAKE_INSTALL_PREFIX} - ${CMAKE_INSTALL_PREFIX}/bin - ${CMAKE_INSTALL_PREFIX}/sasview - ) - -installDir("${PROJECT_SOURCE_DIR}/sasview") - -execute_process(COMMAND ln -s ${CMAKE_INSTALL_PREFIX}/sasview/${SAS_VERSION}/sasview sasview) -install(FILES ${CMAKE_BINARY_DIR}/sasview DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/) - -include(CPack) diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md deleted file mode 100644 index 565af76ba1..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md +++ /dev/null @@ -1,18 +0,0 @@ -Build tools for Debian and RPM ------------------------------- - -How-to build SasView Debian and RPM packages on Ubuntu using Anaconda - - - Set up conda environment using the environment.yml file - - Use pyopencl from conda - - Do not use pyopencl from pip - this will cause pyinstaller to fail finding pyopencl - - Copy CMakelist.txt to the sasview/build_tools folder - - -Known Issues: -------------- - - pyopencl from conda is not the newest version - - To bypass one could build new pyopencl package based on the pip pyopencl package - - Windows, OSX, Linux all have different versions of pyopencl available on conda - - diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml deleted file mode 100644 index 63e1aadc78..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml +++ /dev/null @@ -1,127 +0,0 @@ -name: sasviewqt_new -channels: !!python/tuple -- !!python/unicode - 'defaults' -dependencies: -- anaconda::alabaster=0.7.9=py27_0 -- anaconda::astroid=1.4.7=py27_0 -- anaconda::babel=2.3.4=py27_0 -- anaconda::backports=1.0=py27_0 -- anaconda::backports_abc=0.5=py27_0 -- anaconda::cairo=1.12.18=6 -- anaconda::decorator=4.0.10=py27_1 -- anaconda::docutils=0.12=py27_2 -- anaconda::enum34=1.1.6=py27_0 -- anaconda::fontconfig=2.11.1=6 -- anaconda::freetype=2.5.5=1 -- anaconda::funcsigs=1.0.2=py27_0 -- anaconda::get_terminal_size=1.0.0=py27_0 -- anaconda::glib=2.43.0=1 -- anaconda::harfbuzz=0.9.39=1 -- anaconda::html5lib=0.999=py27_0 -- anaconda::imagesize=0.7.1=py27_0 -- anaconda::ipykernel=4.5.2=py27_0 -- anaconda::ipython=5.1.0=py27_0 -- anaconda::ipython-qtconsole=4.0.1=py27_0 -- anaconda::ipython_genutils=0.1.0=py27_0 -- anaconda::jbig=2.1=0 -- anaconda::jinja2=2.8=py27_1 -- anaconda::jpeg=8d=2 -- anaconda::jupyter_client=4.4.0=py27_0 -- anaconda::jupyter_core=4.2.1=py27_0 -- anaconda::lazy-object-proxy=1.2.1=py27_0 -- anaconda::libffi=3.2.1=0 -- anaconda::libgfortran=3.0.0=1 -- anaconda::libiconv=1.14=0 -- anaconda::libpng=1.6.17=0 -- anaconda::libsodium=1.0.10=0 -- anaconda::libtiff=4.0.6=2 -- anaconda::libxml2=2.9.4=0 -- anaconda::libxslt=1.1.28=0 -- anaconda::lxml=3.6.4=py27_0 -- anaconda::markupsafe=0.23=py27_2 -- anaconda::mkl=11.3.3=0 -- anaconda::mock=2.0.0=py27_0 -- anaconda::openssl=1.0.2j=0 -- anaconda::pango=1.39.0=1 -- anaconda::path.py=8.2.1=py27_0 -- anaconda::pathlib2=2.1.0=py27_0 -- anaconda::pbr=1.10.0=py27_0 -- anaconda::pexpect=4.0.1=py27_0 -- anaconda::pickleshare=0.7.4=py27_0 -- anaconda::pillow=3.4.2=py27_0 -- anaconda::pip=9.0.1=py27_1 -- anaconda::pixman=0.32.6=0 -- anaconda::prompt_toolkit=1.0.9=py27_0 -- anaconda::ptyprocess=0.5.1=py27_0 -- anaconda::py2cairo=1.10.0=py27_2 -- anaconda::pygments=2.1.3=py27_0 -- anaconda::pylint=1.5.4=py27_1 -- anaconda::pyparsing=2.0.3=py27_0 -- anaconda::pyqt=4.11.4=py27_4 -- anaconda::python=2.7.12=1 -- anaconda::python-dateutil=2.4.2=py27_0 -- anaconda::pytz=2016.10=py27_0 -- anaconda::pyzmq=16.0.2=py27_0 -- anaconda::qt=4.8.7=4 -- anaconda::qtconsole=4.2.1=py27_0 -- anaconda::readline=6.2=2 -- anaconda::reportlab=3.3.0=py27_0 -- anaconda::setuptools=19.2=py27_0 -- anaconda::simplegeneric=0.8.1=py27_1 -- anaconda::singledispatch=3.4.0.3=py27_0 -- anaconda::sip=4.18=py27_0 -- anaconda::six=1.10.0=py27_0 -- anaconda::snowballstemmer=1.2.1=py27_0 -- anaconda::sphinx=1.4.8=py27_0 -- anaconda::sqlite=3.13.0=0 -- anaconda::ssl_match_hostname=3.4.0.2=py27_1 -- anaconda::tk=8.5.18=0 -- anaconda::tornado=4.4.2=py27_0 -- anaconda::traitlets=4.3.1=py27_0 -- anaconda::wcwidth=0.1.7=py27_0 -- anaconda::wheel=0.29.0=py27_0 -- anaconda::wrapt=1.10.8=py27_0 -- anaconda::wxpython=3.0.0.0=py27_2 -- anaconda::xz=5.2.2=0 -- anaconda::zeromq=4.1.5=0 -- anaconda::zlib=1.2.8=3 -- h5py=3.1=0 -- hdf5=1.8.15.1=3 -- matplotlib=1.4.3=np19py27_2 -- numpy=1.9.3=py27_3 -- py=1.4.31=py27_0 -- pytest=3.0.5=py27_0 -- scipy=0.17.1=np19py27_1 -- timrudge::appdirs=1.4.0=py27_0 -- timrudge::mako=1.0.1=py27_0 -- timrudge::pyopencl=2014.1=np19py27_0 -- timrudge::pytools=2014.3.5=py27_0 -- pip: - - backports-abc==0.5 - - backports.shutil-get-terminal-size==1.0.0 - - backports.ssl-match-hostname==3.4.0.2 - - bumps==0.7.6 - - cffi==1.9.1 - - constantly==15.1.0 - - incremental==16.10.1 - - ipython-genutils==0.1.0 - - jupyter-client==4.4.0 - - jupyter-core==4.2.1 - - periodictable==1.4.1 - - pisa==3.0.33 - - prompt-toolkit==1.0.9 - - pycparser==2.17 - - pyinstaller==3.2 - - pypdf2==1.26.0 - - qt4reactor==1.6 - - sasmodels==0.94 - - sasview==4.0 - - stdeb==0.8.5 - - twisted==16.5.0 - - unittest-xml-reporting==2.1.0 - - wxpython-common==3.0.0.0 - - xhtml2pdf==0.0.6 - - zope.interface==4.3.2 -prefix: /home/vagrant/miniconda2/envs/sasviewqt_new - diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh deleted file mode 100755 index a54e2be95a..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/jenkins_linux_deb_rpm_build.sh +++ /dev/null @@ -1,107 +0,0 @@ -# This build script is tested for Ubuntu build VM -# This build script generates SasView Debian and RPM packages - -export PATH=$PATH:/usr/local/bin/ - -PYTHON=${PYTHON:-`which python`} -EASY_INSTALL=${EASY_INSTALL:-`which easy_install`} -PYLINT=${PYLINT:-`which pylint`} - -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/utils -export PYTHONPATH=$PYTHONPATH:$WORKSPACE/sasview/sasview-install - - -cd $WORKSPACE - - -# SET SASVIEW GITHASH -cd $WORKSPACE -cd sasview/sasview -githash=$( git rev-parse HEAD ) -sed -i.bak s/GIT_COMMIT/$githash/g __init__.py - - -# SASMODLES -cd $WORKSPACE -cd sasmodels - -rm -rf build -rm -rf dist - -$PYTHON setup.py clean -$PYTHON setup.py build - - -# SASMODLES - BUILD DOCS -cd doc -make html - -cd $WORKSPACE -cd sasmodels -$PYTHON setup.py bdist_egg - - -# SASVIEW -cd $WORKSPACE -cd sasview -rm -rf sasview-install -mkdir sasview-install -rm -rf utils -mkdir utils -rm -rf dist -rm -rf build - - -# INSTALL SASMODELS -cd $WORKSPACE -cd sasmodels -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/utils sasmodels*.egg - - -# BUILD SASVIEW -cd $WORKSPACE -cd sasview -$PYTHON setup.py clean -$PYTHON setup.py build docs bdist_egg - - -# INSTALL SASVIEW -cd $WORKSPACE -cd sasview -cd dist -$EASY_INSTALL -d $WORKSPACE/sasview/sasview-install sasview*.egg - - -# TEST -cd $WORKSPACE -cd sasview -cd test -$PYTHON utest_sasview.py - -## PYLINT -cd $WORKSPACE -cd sasview -$PYLINT --rcfile "build_tools/pylint.rc" -f parseable sasview-install/sasview*.egg/sas sasview | tee test/sasview.txt - -# PYINSTALLER - SASVIEW -cd $WORKSPACE -cd sasview -cd sasview -pyinstaller ./sasview.spec - -# CMake Debian RPM package - SASVIEW -cd $WORKSPACE -cd sasview -cd sasview -cd dist -cp $WORKSPACE/sasview/build_tools/CMakeLists.txt . -mkdir tmp -cd tmp -cmake .. -DSAS_VERSION=4.1 -DCMAKE_INSTALL_PREFIX=/usr/local -cpack -G DEB -cpack -G RPM - -# Back to WORKSPACE -cd $WORKSPACE - diff --git a/build_tools/Vagrant/Ubuntu1404/README.md b/build_tools/Vagrant/Ubuntu1404/README.md deleted file mode 100644 index b31bf1f61f..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/README.md +++ /dev/null @@ -1,51 +0,0 @@ -Ubuntu Vagrant Setup for SasViewQt ----------------------------------- - -How-to setup VM SasViewQt Ubuntu1404 developer env using Vagrant - -A: Provision VM ---------------- - -B: Log on to VM - Setup Anaconda --------------------------------- - -1. Install miniconda: $ bash ./Miniconda2-latest-Linux-x86_64.sh -2. Export miniconda path: $ export PATH=/home/vagrant/miniconda2/bin:$PATH -3. Make sasviewqt env in minicona: conda env create -f environment.yml - -C: Build SasView ----------------- -1. clone sasview: git clone /~https://github.com/SasView/sasview -2. clone sasmodels: git clone /~https://github.com/SasView/sasmodels -3. show sasview branch: git remote show origin -4. checkout ESS\_GUI: git checkout ESS\_GUI -5. build sasmodels: python setup.py build -6. build sasmodels doc: make html -7. build sasview: python setup.py build -8. build sasview: python setup.py docs -9. run sasview: python run.py -10. cd SasView/sasview/src/sas/qtgui -11. make gui: ./make_ui.sh -12. python run.py / python Main\_Window.py depending on on your cloned githash - -Tips: ----- - - - $ export PATH=/home/vagrant/miniconda2/bin:$PATH - - $ conda env export > environment.yml - - $ conda env create -f environment.yml - -To activate this environment, use: - - - $ source activate sasviewqt - -To deactivate this environment, use: - - - $ source deactivate sasviewqt - - -Known problems: ---------------- - - - libxml2 not installed. - diff --git a/build_tools/Vagrant/Ubuntu1404/Vagrantfile b/build_tools/Vagrant/Ubuntu1404/Vagrantfile deleted file mode 100644 index 4d1183d5f6..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/Vagrantfile +++ /dev/null @@ -1,48 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -HOST_NAME = "Ub1404-SasViewQt-Ver2" - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure(2) do |config| - # Ubuntu 14.04 - config.vm.box = "ubuntu/trusty64" - config.vm.define HOST_NAME do |h| - end - - # This is the hostname that the virtual machine uses internally. - config.vm.hostname = HOST_NAME - - - config.vm.provider "virtualbox" do |vb| - # Display the VirtualBox GUI when booting the machine - vb.name = HOST_NAME - vb.gui = true - vb.customize ["modifyvm", :id, "--memory", "8192"] - vb.customize ["modifyvm", :id, "--cpus", "4"] - vb.customize ["modifyvm", :id, "--graphicscontroller", "vboxvga"] - vb.customize ["modifyvm", :id, "--accelerate3d", "on"] - vb.customize ["modifyvm", :id, "--ioapic", "on"] - vb.customize ["modifyvm", :id, "--vram", "32"] - vb.customize ["modifyvm", :id, "--hwvirtex", "on"] - end - - - # Install ubuntu-desktop and virtualbox additions and all of the rest - # Take one provision file at the time. - # Do the loop: - # terminal: vagrant up --provision - # Check install packages - # terminal: vagrant halt - # Comment in/out the appropriate lines - - # 1. - #config.vm.provision "shell", path: "provision/bootstrap.sh" - # 2. - #config.vm.provision "shell", path: "provision/developer.sh" - # 3. - config.vm.provision "shell", path: "provision/miniconda.sh" -end diff --git a/build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh b/build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh deleted file mode 100644 index 71d0547064..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/provision/bootstrap.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -# Install ubuntu-desktop and virtualbox additions -sudo apt-get update -sudo apt-get install -y ubuntu-desktop virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11 - diff --git a/build_tools/Vagrant/Ubuntu1404/provision/developer.sh b/build_tools/Vagrant/Ubuntu1404/provision/developer.sh deleted file mode 100644 index 426e1994df..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/provision/developer.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/bash - -# Install basic developer tools - -sudo apt-get update -sudo apt-get install -y git -sudo apt-get install -y vim build-essential - - -sudo apt-get install dpkg-dev fakeroot lintian - -# Now with mpistuff -sudo apt-get install -y openmpi-bin openmpi-doc libopenmpi-dev - -#Install viewer to nexus files -sudo apt-get install -y hdfview - -# Install PyCharm community edition -sudo add-apt-repository ppa:mystic-mirage/pycharm -sudo apt-get update -sudo apt-get install -y --force-yes pycharm-community - diff --git a/build_tools/Vagrant/Ubuntu1404/provision/environment.yml b/build_tools/Vagrant/Ubuntu1404/provision/environment.yml deleted file mode 100644 index e57586913b..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/provision/environment.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: sasviewqt -channels: !!python/tuple -- !!python/unicode 'defaults' -dependencies: -- python=2.7.12 -- anaconda::pyqt=4.11.4 -- anaconda::qt=4.8.7 -- anaconda::wxpython=3.0.0.0 -- html5lib=0.999 -- ipython=5.1.0 -- ipython-qtconsole=4.0.1 -- lxml=3.6.4 -- matplotlib=1.4.3 -- numpy=1.10.4 -- pillow=3.4.2 -- pip=9.0.1 -- pylint=1.5.4 -- pyparsing=2.0.3 -- python-dateutil=2.6.0 -- qtconsole=4.2.1 -- reportlab=3.3.0 -- scipy=0.17.1 -- sphinx=1.4.8 -- h5py=3.1 -- pip: - - bumps==0.7.6 - - periodictable==1.4.1 - - pisa==3.0.33 - - pypdf2==1.26.0 - - qt4reactor==1.6 - - twisted==16.5.0 - - unittest-xml-reporting==2.1.0 - - xhtml2pdf==0.0.6 -prefix: /home/vagrant/miniconda2/envs/sasviewqt - diff --git a/build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh b/build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh deleted file mode 100644 index 5440e23046..0000000000 --- a/build_tools/Vagrant/Ubuntu1404/provision/miniconda.sh +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/bash - -# Install miniconda -# download - wget -wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh - -# To set up through vagrant provision - seems however to cause read/write sudo issues later when pip or conda install -#wget https://repo.continuum.io/archive/Anaconda2-4.2.0-Linux-x86_64.sh -#chmod +x Anaconda2-4.2.0-Linux-x86_64.sh -#mv Anaconda2-4.2.0-Linux-x86_64.sh anaconda.sh -#./anaconda.sh -b -p /home/vagrant/anaconda - From 0906a6e459c538d9de1a5b6a9df9213855c52599 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:35:23 +0100 Subject: [PATCH 07/10] Removed empty .py file --- build_tools/parse_gh_list.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 build_tools/parse_gh_list.py diff --git a/build_tools/parse_gh_list.py b/build_tools/parse_gh_list.py deleted file mode 100644 index e69de29bb2..0000000000 From ff96ee81e9b23b5e0f5e9583e469360cc2338529 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:41:52 +0100 Subject: [PATCH 08/10] Removed Jenkins deployment test --- build_tools/test_deployment.bat | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 build_tools/test_deployment.bat diff --git a/build_tools/test_deployment.bat b/build_tools/test_deployment.bat deleted file mode 100644 index 0152be070c..0000000000 --- a/build_tools/test_deployment.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -cd c:\jenkins - -rem sasview.exe is an AutoIt3 generated binary based on sasview_deploy_test.au3 -start /wait c:\jenkins\sasview.exe %1 %2 - -echo %errorlevel% - From 9da629df027cdecb614456fc6519915d6c42c943 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 11:42:27 +0100 Subject: [PATCH 09/10] Removed a deployment test - at best it was in the wrong place --- build_tools/sasview_deploy_test.au3 | 179 ---------------------------- 1 file changed, 179 deletions(-) delete mode 100755 build_tools/sasview_deploy_test.au3 diff --git a/build_tools/sasview_deploy_test.au3 b/build_tools/sasview_deploy_test.au3 deleted file mode 100755 index 422de31920..0000000000 --- a/build_tools/sasview_deploy_test.au3 +++ /dev/null @@ -1,179 +0,0 @@ -; ****** REMEMBER TO SWITCH OFF UAC ON TARGET MACHINE!!! ********* -; -; This script will install, run and uninstall SasView -; given location of the installer. The exit code of the script -; points at failure location: -; -; 0 - OK -; 1 - Installer failure -; 2 - Problems running SasView (simple fitting) -; 3 - Uninstaller failure - -#include -#include -#include -#include - -; Modifiable globals -Global $fInstallerLocation = @TempDir & "\setupSasView.exe" -if $CmdLine[0] > 0 Then - ; If argument present - use it as local download path - $fInstallerLocation = $CmdLine[1] -EndIf - -Global $fUninstallerLocation = "C:\Program Files (x86)\SasView\unins000.exe" -Global $lTimeout = 10 ; 10 sec timeout for waiting on windows -Global $lInstallTimeout = 120 ; 2 min timeout for the installation process - -; General globals -Global $installerPID = 0 - -;; MAIN SCRIPT -Install() -RunSasView() -Uninstall() -Exit(0) - -;============================================================== - -Func Install() - ;;;;; APPLICATION INSTALLED ;;;;;;; - Local $sSetupWindow = "Setup - SasView" - Local $iFailFlag = 1 - ; Run setup - if FileExists($fInstallerLocation) Then - $installerPID = Run($fInstallerLocation) - Assert($installerPID, $iFailFlag) - Sleep(1000) - Else - ;$Error = ObjEvent(AutoIt.Error, "Setup file does not exist","123") - Exit($iFailFlag) - EndIf - - ; License click through - WinActivate($sSetupWindow) - Local $test = WinWaitActive($sSetupWindow, "License Agreement", $lTimeout) - ;ConsoleWrite("license agreement: " & $test) - Assert($test, $iFailFlag) - sleep(1000) - - Send("{TAB}{up}{ENTER}") - - ; Location - Sleep(1000) - $test = WinWaitActive($sSetupWindow, "Select Destination Location", $lTimeout) - Assert($test, $iFailFlag) - Send("{ENTER}") - - ; Icons, Startup entry - Sleep(1000) - $test = WinWaitActive($sSetupWindow, "Select Additional Tasks", $lTimeout) - Assert($test, $iFailFlag) - Send("{ENTER}") - - ; Ready to install... - Sleep(1000) - $test = WinWaitActive($sSetupWindow, "Ready to Install", $lTimeout) - Assert($test, $iFailFlag) - Send("{ENTER}") - - ; Final OK on running - Sleep(5000) - $test = WinWaitActive($sSetupWindow, "Completing the SasView Setup Wizard", $lInstallTimeout) - Assert($test, $iFailFlag) - Send("{ENTER}") - ;ConsoleWrite("Installed" & @CRLF) - -EndFunc - - -Func RunSasView() - ;;;;; APPLICATION STARTED ;;;;;;; - ; Start app - DEBUG ONLY - ;;Run("C:\Program Files (x86)\SasView\SasView.exe") - local $sActiveWindow = "SasView - Fitting -" - Local $iFailFlag = 2 - ; Wait for the window - Sleep(1000) - Local $hWnd = WinWaitActive($sActiveWindow, "", $lTimeout) - Assert($hWnd, $iFailFlag) - - ;;;;; Load a File - ; Open File Load dialog - Send("!{f}{ENTER}") - WinWaitActive("Choose a file", "", $lTimeout) - Assert($hWnd, $iFailFlag) - Sleep(200) - - ; Focus is in file chooser - enter filename - Send("C:\Program Files (x86)\SasView\test\1d_data\cyl_400_20.txt") - Sleep(1000) - Send("{ENTER}") - - ;; Send file to fitting - ControlClick($hWnd, "Send To", 231) - - ;; Choose a python model - ControlCommand($hWnd, "", "ComboBox3", "SetCurrentSelection", 1) - ;; Calculate the model - ControlClick($hWnd, "Compute", 211) - ;; Assure we got the charts - Local $hPlot = WinWait($sActiveWindow, "Graph2", $lTimeout) - Assert($hPlot, $iFailFlag) - $hPlot = WinWait($sActiveWindow, "Graph3", $lTimeout) - Assert($hPlot, $iFailFlag) - - sleep(1000) - ;; Calculate a compiled model - ControlClick($hWnd, "Send To", 231) - - ;; Choose Shapes/Cylinder - ControlCommand($hWnd, "", "ComboBox2", "SetCurrentSelection", 1) - ControlCommand($hWnd, "", "ComboBox3", "SetCurrentSelection", 11) - ;; Calculate the model - ControlClick($hWnd, "Compute", 211) - - ;; Assure we got another chart - $hPlot = WinWait($sActiveWindow, "Graph4", $lTimeout) - Assert($hPlot, $iFailFlag) - - ;; Close SasView - WinClose($hWnd) - - Local $hEnd = WinWaitActive("Confirm Exit", "", $lTimeout) - Assert($hEnd, $iFailFlag) - ControlClick($hEnd, "", "[CLASS:Button; INSTANCE:1]") - - Local $sv_closed = WinWaitClose($hWnd, "", $lTimeout) - Assert($sv_closed, $iFailFlag) - -EndFunc - -Func Uninstall() -;;;;; UNINSTALL ;;;;;;; - Local $iFailFlag = 3 - $installerPID = Run($fUninstallerLocation) - Assert($installerPID, $iFailFlag) - - Local $sSetupWindow = "SasView Uninstall" - - Local $test = WinWaitActive($sSetupWindow, "", $lTimeout) - Assert($test, $iFailFlag) - Send("{TAB}{ENTER}") - - WinActivate("SasView Uninstal") - $test = WinWaitActive($sSetupWindow, "SasView was successfully removed", $lTimeout) - Assert($test, $iFailFlag) - Send("{ENTER}") - -EndFunc - - -;;; HELPER FUNCTIONS ;;;; -Func Assert($test, $lExitValue) - ;;; Asserts $test to be non-zero and exit with code $lExitValue ;;; - if $test == 0 Then - ProcessClose($installerPID) - Exit($lExitValue) - EndIf -EndFunc From e867c9b134b6967f1b8e0d0d1d4b5d5babd01327 Mon Sep 17 00:00:00 2001 From: lucas-wilkins Date: Thu, 18 Aug 2022 13:30:31 +0100 Subject: [PATCH 10/10] Removed dmgpack.sh and Makefile_RHEL7 --- build_tools/Makefile_RHEL7 | 45 -------------------------- build_tools/dmgpack.sh | 65 -------------------------------------- 2 files changed, 110 deletions(-) delete mode 100644 build_tools/Makefile_RHEL7 delete mode 100755 build_tools/dmgpack.sh diff --git a/build_tools/Makefile_RHEL7 b/build_tools/Makefile_RHEL7 deleted file mode 100644 index 8e856cf80d..0000000000 --- a/build_tools/Makefile_RHEL7 +++ /dev/null @@ -1,45 +0,0 @@ -# For the docs to build and go in the right place, docs/sphinx-docs/build_sphinx.py -# has to be modified with -# SASVIEW_DOCS = os.path.join(SASVIEW_BUILD, "sas/sasview/doc") - -site_packages := `python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"` - -prefix := '../../' - -check: - # Check dependencies - @cd ..; python check_packages.py - -sasmodels/core: - cd ${prefix}sasmodels; rm -rf build - cd ${prefix}sasmodels; rm -rf dist - cd ${prefix}sasmodels; python setup.py clean - cd ${prefix}sasmodels; python setup.py build - -sasmodels/docs: - cd ${prefix}sasmodels/doc; make html - -sasmodels: sasmodels/core sasmodels/docs - @rm -rf ${prefix}sasmodels/build - @rm -rf ${prefix}sasmodels/dist - cd ${prefix}sasmodels; python setup.py bdist_egg - -sasview: - @rm -rf ../build - @rm -rf ../dist - @cd ..; python setup.py build docs bdist_egg - -rpm: - @echo "Creating RPMs" - rm -rf ../build/sasview - mkdir ../build/sasview - cp -pr ../dist/sasview*.egg ../build/sasview - cp -pr ${prefix}sasmodels/dist/sasmodels*.egg ../build/sasview - - cd ../build;tar -czf ~/rpmbuild/SOURCES/sasview.tgz sasview - rpmbuild -ba sasview.spec - -.PHONY: check -.PHONY: sasview -.PHONY: rpm -.PHONY: sasmodels diff --git a/build_tools/dmgpack.sh b/build_tools/dmgpack.sh deleted file mode 100755 index 5ae874c178..0000000000 --- a/build_tools/dmgpack.sh +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/bash - -# dmgpack volume [file|dir]+ -# -# Copy a group of files/directories to a compressed disk image. -# The resulting image is stored in volume.dmg. -# -# Files are copied with 'ditto' to preserve resource forks. For -# convenience we also call FixupResourceForks after copying. This -# allows you to use /Developer/Tools/SplitFork on your tree and -# manipulate it with CVS, tar, etc. Don't forget the -kb option -# when adding or committing app and ._app files to CVS! -# -# This command will fail if a volume of the given name is already -# mounted. It could also fail if the size of the resource forks -# is large compared to the size of the data forks. Change the -# scale factor internally from 11/10 to a more appropriate number -# if it complains it is running out of space. -# -# It is possible to add a license agreement to a dmg file. See -# the "Software License Agreements for UDIFs" sdk available at -# http://developer.apple.com/sdk/index.html - -test $# -lt 2 && echo "usage: $0 diskname [file|dir]+" && exit 1 -#set -x -NAME="${1%.dmg}" ; shift -DISK=/tmp/dmgpack$$.dmg -COMPRESSED="$NAME.dmg" -VOLUME="$NAME" - -# compute needed image size; scale it by 10% -SIZE=$(du -ck "$@" | tail -1 | sed -e 's/ *total//') -SIZE=$(echo $SIZE*11/10 | bc) -test $SIZE -lt 4200 && SIZE=4200 - -# create the disk -rm -f $DISK -hdiutil create -size ${SIZE}k $DISK -layout NONE - -# create a file system on the disk; last line of output is -# the device on which the disk was attached. -DEVICE=$(hdiutil attach $DISK -nomount | tail -1) -newfs_hfs -v "$VOLUME" $DEVICE - -# mount the file system -mkdir $DISK-mount -mount -t hfs $DEVICE $DISK-mount || (echo "mount $DISK-mount failed" && exit 1) - -# copy stuff to the disk and fixup resource forks -for f in "$@"; do - f=${f%/} ;# strip trailing / - dest="$DISK-mount/${f##*/}" - ditto -rsrc "$f" "$dest" - test -d "$f" && /System/Library/CoreServices/FixupResourceForks "$dest" -done - -# eject the disk -umount $DISK-mount -rmdir $DISK-mount -hdiutil eject $DEVICE - -# compress the disk and make it read only -rm -f "$COMPRESSED" -hdiutil convert -format UDZO $DISK -imagekey zlib-level=9 -o "$COMPRESSED" -rm -f $DISK