diff --git a/.travis.yml b/.travis.yml index 849c50d74..27fb61a38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ before_install: sudo apt-get install cmake libopenmpi-dev python-dev libblas-dev liblapack-dev wget libboost-program-options1.48-dev libboost-filesystem1.48-dev libboost-serialization1.48-dev libboost-thread1.48-dev libboost-iostreams1.48-dev libboost-math1.48-dev libboost-timer1.48-dev libboost-chrono1.48-dev; fi install: - - git clone https://github.com/hashdist/hashdist + - git clone https://github.com/hashdist/hashdist -b cekees/add_bld_mirrors - export PATH=`pwd`/hashdist/bin:$PATH script: - cp tests/$TEST_PROFILE $TEST_PROFILE diff --git a/adh-stack.yaml b/adh-stack.yaml new file mode 100644 index 000000000..2c6bc805e --- /dev/null +++ b/adh-stack.yaml @@ -0,0 +1,33 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: debian.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +packages: + cmake: + openssl: + use: host-openssl + python: + host: false + link: shared + build_with: | + bzip2, sqlite, openssl + blas: + use: openblas + lapack: + use: openblas-lapack + mpi: + use: mpich + parmetis: + sympy: + adh: \ No newline at end of file diff --git a/base/base_package.yaml b/base/base_package.yaml index bba0ffdf7..45e44ab60 100644 --- a/base/base_package.yaml +++ b/base/base_package.yaml @@ -44,6 +44,12 @@ post_process: - "check-ignore=.*\\.pyc\\$" - "check-ignore=.*\\.pyo\\$" + - name: insert_location + when: relocatable != True + after: [default] + hit: + - insert-location + profile_links: - when: platform == 'Cygwin' name: copy_dlls diff --git a/base/cmake_package.py b/base/cmake_package.py index f045b1660..2a07ead86 100644 --- a/base/cmake_package.py +++ b/base/cmake_package.py @@ -33,8 +33,11 @@ def configure(ctx, stage_args): if stage_args['debug']: conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Debug') else: - conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release') - + if stage_args['relwithdebinfo']: + conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo') + else: + conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release') + if stage_args.get('empty_osx_deployment_target', False): conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""') diff --git a/base/cmake_package.yaml b/base/cmake_package.yaml index 3cd08dea1..ff2acfc05 100644 --- a/base/cmake_package.yaml +++ b/base/cmake_package.yaml @@ -15,6 +15,7 @@ build_stages: - name: configure after: setup_builddir debug: {{debug}} + relwithdebinfo: {{relwithdebinfo}} - name: make after: configure diff --git a/cygwin.yaml b/cygwin.yaml index 33d72e5c4..55bf7e5be 100755 --- a/cygwin.yaml +++ b/cygwin.yaml @@ -8,6 +8,7 @@ parameters: HOST_MPIF77: /usr/bin/mpif77 HOST_MPIF90: /usr/bin/mpif90 HOST_MPIEXEC: /usr/bin/mpiexec + HOST_JASPER_DIR: /usr HOST_CMAKE: /usr/bin/cmake HOST_PYTHON: /usr/bin/python HOST_PKG_CONFIG_EXECUTABLE: /usr/bin/pkgconfig diff --git a/examples/adh-stack.yaml b/examples/adh-stack.yaml new file mode 100644 index 000000000..2c6bc805e --- /dev/null +++ b/examples/adh-stack.yaml @@ -0,0 +1,33 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: debian.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +packages: + cmake: + openssl: + use: host-openssl + python: + host: false + link: shared + build_with: | + bzip2, sqlite, openssl + blas: + use: openblas + lapack: + use: openblas-lapack + mpi: + use: mpich + parmetis: + sympy: + adh: \ No newline at end of file diff --git a/examples/proteus.Cygwin.yaml b/examples/proteus.Cygwin.yaml index 799a24a6e..f8b1fe5a2 100755 --- a/examples/proteus.Cygwin.yaml +++ b/examples/proteus.Cygwin.yaml @@ -32,7 +32,9 @@ packages: mpi4py: nose: hdf5: - ipython: + pygments: + tornado: + pyzmq: matplotlib: petsc: build_with: | diff --git a/examples/proteus.Darwin.yaml b/examples/proteus.darwin.yaml similarity index 65% rename from examples/proteus.Darwin.yaml rename to examples/proteus.darwin.yaml index c388db812..43646f429 100644 --- a/examples/proteus.Darwin.yaml +++ b/examples/proteus.darwin.yaml @@ -5,13 +5,14 @@ # at the YAML files in the top-level directory and choose # the most *specific* file that matches your environment. +parameters: + airgap: True + extends: -- file: osx.yaml +- file: osx_clt.yaml -parameters: - fortran: true -# The packages list specifies all the packages that you +# The packages list specifies all the packages that you # require installed. <#> will ensure that all packages # and their dependencies are installed when you build this # profile. @@ -20,45 +21,66 @@ packages: launcher: cmake: + openjpeg: + version: '2.1' python: host: false + link: shared build_with: | blas: use: host-osx-framework-accelerate + lapack: + use: host-osx-framework-accelerate daetk: mpi: - use: mpich + use: openmpi mpi4py: nose: hdf5: + pygments: + tornado: + pyzmq: + parmetis: ipython: matplotlib: petsc: + version: 3.7.5 build_with: | - parmetis + parmetis, cmake, suitesparse download: | superlu, superlu_dist coptflags: -O2 link: shared debug: false + disable_fortran: true petsc4py: + version: 3.7.0 with_conf: true pillow: pytables: + scorec: sphinx: - superlu: + #superlu: sympy: tetgen: triangle: memory_profiler: ipdb: pip: + pexpect: doxygen: - scipy: netcdf4: - netcdf4f: netcdf4cpp: python-netcdf4: h5py: ode: + openblas: + jupyter: + functools: + use: host-functools + yaml: + pytest: + pytest-xdist: + boost: + toolset: darwin diff --git a/examples/proteus.garnet.gnu.yaml b/examples/proteus.garnet.gnu.yaml index 29f423cf0..70f091dec 100644 --- a/examples/proteus.garnet.gnu.yaml +++ b/examples/proteus.garnet.gnu.yaml @@ -1,5 +1,4 @@ # This profile file controls your <#> (HashDist) build environment. - # In the future, we'll provide better incorporation of # automatic environment detection. For now, have a look # at the YAML files in the top-level directory and choose @@ -15,6 +14,7 @@ extends: parameters: machine: CrayXE6 + HOST_MATLAB: '/usr/local/applic/matlab/R2012b/bin/matlab' HOST_MPICC: cc HOST_MPICXX: CC HOST_MPIF77: ftn @@ -23,7 +23,7 @@ parameters: PATH: | /usr/bin:/bin:/usr/sbin:/sbin PROLOGUE: | - source /opt/modules/default/init/bash; export MODULEPATH=/opt/cray/gem/modulefiles:/opt/cray/xt-asyncpe/default/modulefiles:/opt/modulefiles:/opt/cray/modulefiles:/cm/local/modulefiles:/cm/shared/modulefiles:/usr/local/modulefiles/COTS:/usr/local/modulefiles/unsupported; export MODULESHOME=/opt/modules/3.2.6.7; export MODULE_VERSION=3.2.6.7; export MODULE_VERSION_STACK=3.2.6.7; echo "unloading modules"; module unload PrgEnv-pgi; echo "loading modules"; module load PrgEnv-gnu/4.2.34; module load cray-mpich/6.0.0; module unload cray-libsci; module load acml/5.3.1; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp; + unset RCLOCAL_PRGENV; source /etc/bash.bashrc; source /etc/bash.bashrc.local; module swap PrgEnv-cray PrgEnv-gnu; module load cray-mpich; module list; echo "setting default compilers"; export CC=gcc; export CXX=g++; export FC=gfortran; export F77=gfortran; export F90=gfortran; export CPP=cpp; DYNAMIC_EXE_LINKER_FLAGS: -dynamic packages: @@ -31,19 +31,23 @@ packages: cmake: python: host: false + link: shared build_with: | openssl,bzip2,sqlite + link: shared blas: - use: host-acml-blas + use: host-libsci-blas lapack: - use: host-acml-lapack + use: host-libsci-lapack daetk: mpi: use: host-mpi mpi4py: nose: hdf5: - ipython: + pygments: + tornado: + pyzmq: matplotlib: parmetis: without_check: true @@ -64,12 +68,51 @@ packages: tetgen: triangle: memory_profiler: - scipy: +# boost: +# toolset: gcc +# address_model: 64 +# build_with: | +# python +# +# cgal: +# pycgal: + netcdf4: netcdf4f: python-netcdf4: - ipdb: - pip: + vapory: + jasper: + grib_api: + pyproj: + pygrib: + #adh: + # link: shared + stwave: + scipy: +# ipython: +# sources: +# - key: git:68f6519cdfd23581ed7358fa1941ae1bbd76e5b3 +# url: https://github.com/ellisonbg/ipython.git +# h5py: + pydap: +# leafletwidget: +# sources: +# - key: git:f9147c5b13a69b80bc28d3574f7ba6b2c576aed2 +# url: https://github.com/erdc-cm/leafletwidget.git + geojson: + rdp: +# ipython-widgetmode: +# ipython-d3plot: +# ipython-gridwidget: +# shapely: +# rtree: +# matlab: +# use: host-matlab +# pymatbridge: ode: +# ipdb: + pip: + pexpect: + ipdb: # vtk: # pyvtk: diff --git a/examples/proteus.linux2-scorec.yaml b/examples/proteus.linux2-scorec.yaml new file mode 100644 index 000000000..b94cd3e6e --- /dev/null +++ b/examples/proteus.linux2-scorec.yaml @@ -0,0 +1,65 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: debian.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +packages: + + launcher: + cmake: + use: host-cmake + python: + host: false + link: shared + build_with: | + bzip2, sqlite + blas: + use: host-blas + daetk: + mpi: + use: host-mpi + mpi4py: + nose: + hdf5: + ipython: + matplotlib: + petsc: + build_with: | + parmetis + download: | + hypre, blacs, scalapack, superlu, superlu_dist + coptflags: -O2 + link: shared + debug: true + petsc4py: + with_conf: true + pytables: + scorec: + simmetrix: + sphinx: + superlu: + sympy: + tetgen: + triangle: + zoltan: + build_with: | + parmetis + +parameters: + HOST_MPI_DIR: /usr/local/mpich3/3.1.2-thread-multiple + HOST_CMAKE: /usr/local/cmake/latest/bin/cmake + HOST_SIMMETRIX_LIB: /net/common/meshSim/9.0-140816/lib/x64_rhel5_gcc41 + HOST_SIMMETRIX_INCLUDE: /net/common/meshSim/9.0-140816/include + HOST_PYTHON: python + HOST_PKG_CONFIG_EXECUTABLE: pkg-config + PATH: /usr/bin:/bin:/usr/local/mpich3/3.1.2-thread-multiple/bin/ diff --git a/examples/proteus.linux2.yaml b/examples/proteus.linux2.yaml index 2ff5d8009..4fceb1ddf 100644 --- a/examples/proteus.linux2.yaml +++ b/examples/proteus.linux2.yaml @@ -14,18 +14,21 @@ extends: # profile. packages: - clawpack: - launcher: + future: + recordtype: cmake: + openjpeg: #dependency of chrono + version: '2.1' + openssl: python: host: false link: shared build_with: | - bzip2, sqlite + bzip2, sqlite, openssl blas: - use: host-blas + use: openblas lapack: - use: host-lapack + use: openblas-lapack daetk: mpi: use: mpich @@ -33,52 +36,93 @@ packages: nose: coverage: hdf5: - matplotlib: petsc: + version: 3.7.6 + openblas: true build_with: | - parmetis + parmetis, cmake, blas download: | - superlu, superlu_dist, spooles, hypre, blacs, scalapack, mumps + superlu, superlu_dist, hypre, blacs, scalapack, mumps coptflags: -O2 link: shared debug: false petsc4py: + version: 3.7.0 with_conf: true - pillow: pytables: - sphinx: - superlu: - sympy: - tetgen: - triangle: + tetgen: #3D simplex mesh generator + triangle: #2D simplex mesh generator memory_profiler: boost: toolset: gcc address_model: 64 build_with: | python - netcdf4: - python-netcdf4: - netcdf4f: - netcdf4cpp: - jasper: - grib_api: - pyproj: - pygrib: scipy: - ipython: - terminado: h5py: - pydap: - leafletwidget: - geojson: - rdp: - rtree: - ode: - ipdb: pip: - pexpect: - pcs_api: - jupyter-pip: - pythreejs: - jupyter: \ No newline at end of file + chrono: + pytest: + pytest-xdist: + pytest-cov: + pybind11: + gmsh: #used for mesh generation + scorec: #used for MeshAdapt + #matplotlib: # used in testing suite + #pcs_api: #personal cloud storage api + #pyzmq: + #scandir: + # + ## Optional Packages + #buildbot-worker: + #doxygen: #for building documentation + #sphinx: #for building website + #sphinx-bootstrap-theme: + #clawpack: + #pydap: + #julia: + #pyjulia: + #jasper: + #grib_api: + #cgal: computational geometric library + #pyproj: + #pygrib: + #rdp: #remote desktop package + #vapory: + #tornado: + #ipython: + #terminado: + #geojson: + #shapely: + #matlab: + # use: host-matlab + #ipdb: + #jupyterlab: + #jupyter: + #ipyparallel: + #backports-abc: + #backports-shutil-get-terminal-size: + #configparser: + #rtree: + #ipython-d3plot: + #ipython-gridwidget: + #jupyter-pip: + #leafletwidget: + #ipywidgets: + #ipyleaflet: + #pythreejs: + #proteus: + #sympy: #symbolic math library + #ode: #library which has ode solvers + #pygments: + #pillow: #python imaging library + #launcher: + #netcdf4: + #netcdf4f: + #python-netcdf4: + #netcdf4cpp: + #pexpect: + + + + diff --git a/examples/proteus.spirit.yaml b/examples/proteus.spirit.yaml new file mode 100644 index 000000000..8f8b4c5b3 --- /dev/null +++ b/examples/proteus.spirit.yaml @@ -0,0 +1,80 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: suse.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +parameters: + machine: SGIICEX + HOST_MPICC: mpicc + HOST_MPICXX: mpicxx + HOST_MPIF77: mpif90 + HOST_MPIF90: mpif90 + HOST_MPIEXEC: mpiexec_mpt + PATH: | + /usr/bin:/bin:/usr/sbin:/sbin + PROLOGUE: | + export PATH="/app/wpostool/COST/git-2.0.2/intel/bin:/app/sgi/mpt/mpt-2.13-beta/bin:/app/intel/compilers/15/vtune_amplifier_xe/bin64:/app/intel/compilers/15/inspector_xe/bin64:/app/intel/compilers/15/bin:/app/gmpapp/gcc/platform/gcc-4.8.4/bin:/usr/local/krb5/bin:/usr/local/ossh/bin:/opt/sgi/sbin:/opt/sgi/bin:/usr/lib64/qt-3.3/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/c3/bin:/opt/pbs/default/bin:/hafs_x86_64:/hafs_x86_64/bin:/usr/bin/X11:/usr/local/bin:/app/java/jdk1.7.0_17/bin:."; export HOSTTYPE="x86_64-linux"; export VENDOR="unknown"; export OSTYPE="linux"; export MACHTYPE="x86_64"; export GROUP="0089JR40"; export HOST="spirit01"; export HOSTNAME="spirit01"; export MANPATH="/app/sgi/mpt/mpt-2.13-beta/man:/app/intel/compilers/15/vtune_amplifier_xe/man:/app/intel/compilers/15/inspector_xe/man:/app/intel/compilers/15/man/en_US:/app/gmpapp/gcc/platform/gcc-4.8.4/share/man:/usr/local/krb5/man:/usr/local/ossh/man:/opt/c3/man:/opt/pbs/default/man:/opt/sgi/share/man:/usr/share/man:/usr/local/man:/app/man:/hafs_x86_64/man:/usr/share/catman:/usr/catman:/usr/man"; export CVS_RSH="ssh"; export G_BROKEN_FILENAMES="1"; export LANG="en_US.UTF-8"; export LESSOPEN="|/usr/bin/lesspipe.sh %s"; export MODULESHOME="/hafs_x86_64/devel/share/Modules"; export MODULEPATH="/app/wpostool/COST/modules/pkgs:/app/modulefiles:/etc/modulefiles:/hafs_x86_64/modulefiles:/app/daac/modules"; export LOADEDMODULES="costinit:shell.module:alias.module:gcc-compilers/4.8.4:intel-compilers/15.0.2:mpt/2.13-beta:git/intel/2.0.2"; export OSCAR_HOME="/opt/oscar"; export LANGUAGE="en_US.UTF-8"; export ALTAIR_LICENSE_PATH="6200@service12"; export QTDIR="/usr/lib64/qt-3.3"; export QTINC="/usr/lib64/qt-3.3/include"; export QTLIB="/usr/lib64/qt-3.3/lib"; export C3_RSH="ssh -oConnectTimeout=10 -oForwardX11=no"; export APP_AREAS="/hafs_x86_64 /hafs_x86_64/bin /hafs_x86_64/bin"; export CC="gcc"; export COST_HOME="/app/wpostool/COST"; export COST_MODULES_DIR="/app/wpostool/COST/modules/pkgs"; export CPU="x86_64"; export CSI_HOME="/hafs_x86_64"; export CXX="g++"; export DAAC_HOME="/app/daac"; export F77="gfortran"; export F90="gfortran"; export JAVA_HOME="/app/java/jdk1.7.0_17"; export KRB5_CONFIG="/etc/krb5.conf"; export KRB5_HOME="/usr/local/krb5"; export LC_ALL="C"; export LINK_TIMEOUT="3"; export MPICC_CC="gcc"; export MPICXX_CXX="g++"; export MPIF90_F90="gfortran"; export MPSCP_BLOCKED_FILE="/app/mpscp/etc/mpscp_blocked_ports"; export MPSCP_CONFIG_FILENAME="/app/mpscp/etc/mpscp_config"; export PET_HOME="/app/comenv"; export PROJECTS_HOME="/work4/projects"; export _LMFILES_="/hafs_x86_64/modulefiles/costinit:/app/startup/shell.module:/app/startup/alias.module:/hafs_x86_64/modulefiles/gcc-compilers/4.8.4:/app/modulefiles/intel-compilers/15.0.2:/app/modulefiles/mpt/2.13-beta:/app/wpostool/COST/modules/pkgs/git/intel/2.0.2"; export msas="ms1"; export CPATH="/app/sgi/mpt/mpt-2.13-beta/include:/app/intel/compilers/15/mkl/include:/app/gmpapp/gcc/platform/gcc-4.8.4/include"; export FPATH="/app/sgi/mpt/mpt-2.13-beta/include:/app/intel/compilers/15/mkl/include:/app/gmpapp/gcc/platform/gcc-4.8.4/include"; export I_MPI_CC="icc"; export I_MPI_CXX="icpc"; export I_MPI_F90="ifort"; export LD_LIBRARY_PATH="/app/wpostool/COST/git-2.0.2/intel/lib:/app/sgi/mpt/mpt-2.13-beta/lib:/app/intel/compilers/15/mkl/lib/intel64:/app/intel/compilers/15/lib/intel64:/app/gmpapp/gmp/gmp-5.1.1/lib:/app/gmpapp/mpfr/mpfr-3.1.2/lib:/app/gmpapp/mpc/mpc-1.0.1/lib:/app/gmpapp/gcc/platform/gcc-4.8.4/lib64/"; export NPATH="/app/intel/compilers/15/mkl/include:/app/gmpapp/gcc/platform/gcc-4.8.4/include"; export INTEL_LICENSE_FILE="28518@service12"; export LIBRARY_PATH="/app/sgi/mpt/mpt-2.13-beta/lib:/app/intel/compilers/15/mkl/lib/intel64"; export MKLROOT="/app/intel/compilers/15/mkl"; export NLSPATH="/app/intel/compilers/15/lib/intel64/locale/en_US/%N"; export MPI_BUFS_PER_PROC="2048"; export MPI_CONNECTIONS_THRESHOLD="8192"; export MPI_DISPLAY_SETTINGS="1"; export MPI_IB_ACCELERATE_AHS="true"; export MPI_IB_FAILOVER="127"; export MPI_IB_MAX_RDMAS="1"; export MPI_IB_PAYLOAD="128"; export MPI_IB_RECV_MSGS="16384"; export MPI_IB_RNR_TIMER="26"; export MPI_IB_THREAD="1"; export MPI_IB_TIMEOUT="22"; export MPI_MSG_RETRIES="20000000"; export MPI_ROOT="/app/sgi/mpt/mpt-2.13-beta"; export MPI_SYSLOG_COPY="1"; export MPI_VERBOSE="1"; export MPT_VERSION="2.13-beta"; export CMAKE_INCLUDE_PATH="/app/wpostool/COST/git-2.0.2/intel/include"; export CMAKE_LIBRARY_PATH="/app/wpostool/COST/git-2.0.2/intel/lib"; export CSE__INCLUDE_DIR="/app/wpostool/COST/git-2.0.2/intel/include"; export CSE__LIB_DIR="/app/wpostool/COST/git-2.0.2/intel/lib"; export CSE__PREFIX="/app/wpostool/COST/git-2.0.2/intel"; export EDITOR="emacs -nw"; export GIT_SSL_NO_VERIFY="true"; export FC="gfortran"; + + DYNAMIC_EXE_LINKER_FLAGS: -dynamic + +packages: + launcher: + git: + cmake: + python: + host: false + build_with: | + openssl,bzip2,sqlite + blas: + use: host-mkl-blas + lapack: + use: host-mkl-lapack + daetk: + mpi: + use: host-mpi + mpi4py: + nose: + hdf5: + ipython: + matplotlib: + parmetis: + without_check: true + petsc: + version: 3.6.1 + build_with: | + parmetis + download: | + superlu, superlu_dist, hypre + coptflags: -O2 + link: shared + debug: false + fortran: true + petsc4py: + version: 3.6.0 + with_conf: true + pytables: + sphinx: + superlu: + sympy: + tetgen: + triangle: + memory_profiler: + scipy: + netcdf4f: + python-netcdf4: + h5py: + ode: + pip: + # pyode: + # vtk: + # pyvtk: diff --git a/examples/proteus.stampede.gnu.yaml b/examples/proteus.stampede.gnu.yaml new file mode 100644 index 000000000..f44f70458 --- /dev/null +++ b/examples/proteus.stampede.gnu.yaml @@ -0,0 +1,100 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: linux.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +parameters: + machine: PowerEdge + PATH: /usr/lib64/qt-3.3/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:/opt/ofed/bin:/opt/ofed/sbin + HOST_MPICC: /opt/apps/gcc4_9/mvapich2/2.1/bin/mpicc + HOST_MPICXX: /opt/apps/gcc4_9/mvapich2/2.1/bin/mpicxx + HOST_MPIF77: /opt/apps/gcc4_9/mvapich2/2.1/bin/mpif77 + HOST_MPIF90: /opt/apps/gcc4_9/mvapich2/2.1/bin/mpif90 + HOST_MPIEXEC: /opt/apps/gcc4_9/mvapich2/2.1/bin/mpiexec + HOST_OPENSSL: /usr/bin/openssl + PETSC_ARCH: linux-gnu-cxx-opt + HOST_CMAKE: /opt/apps/cmake/3.1.0/bin/cmake + PROLOGUE: export USER=user; export MODULEPATH=/opt/modulefiles:/opt/apps/modulefiles; source /opt/apps/lmod/lmod/init/bash; module load TACC; module swap intel gcc; module load cmake; + +packages: + clawpack: + launcher: + cmake: + use: host-cmake + python: + host: false + link: shared + build_with: | + bzip2, sqlite + blas: + use: openblas + lapack: + daetk: + mpi: + use: host-mpi + mpi4py: + nose: + coverage: + hdf5: + matplotlib: + openssl: + use: host-openssl + petsc: + version: 3.6.1 + build_with: | + parmetis + download: | + superlu, superlu_dist, spooles, hypre, blacs, scalapack, f2cblaslapack + coptflags: -O2 + link: shared + debug: false + petsc4py: + version: 3.6.0 + with_conf: true + pillow: + pytables: + sphinx: + superlu: + sympy: + tetgen: + triangle: + memory_profiler: + boost: + toolset: gcc + address_model: 64 + build_with: | + python + netcdf4: + python-netcdf4: + netcdf4f: + netcdf4cpp: + jasper: + grib_api: + pyproj: + pygrib: + scipy: + ipython: + terminado: + h5py: + pydap: + leafletwidget: + geojson: + rdp: + rtree: + ode: + ipdb: + pip: + pexpect: + pcs_api: + jupyter-pip: + pythreejs: diff --git a/examples/proteus.topaz.yaml b/examples/proteus.topaz.yaml new file mode 100644 index 000000000..bcc1bebb6 --- /dev/null +++ b/examples/proteus.topaz.yaml @@ -0,0 +1,79 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: suse.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +parameters: + machine: SGIICEX + HOST_MPI_DIR: /p/home/apps/sgi/mpt-2.12-sgi712r26 + HOST_MPIEXEC: mpiexec_mpt + HOST_MPICC: /p/home/cekees/bin/mpicc + HOST_MPICXX: /p/home/cekees/bin/mpicxx + HOST_MPIF77: /p/home/cekees/bin/mpif77 + HOST_MPIF90: /p/home/cekees/bin/mpif90 + PATH: | + /p/home/cekees/bin:/p/home/cekees/proteus/topaz/bin:/apps/gnu_compiler/4.9.3/bin:/usr/local/krb5/bin:/opt/pbs/12.2.7.152442/bin:/p/home/apps/sgi/mpt-2.12-sgi712r26/bin:/opt/sgi/sbin:/opt/sgi/bin:/usr/lib64/mpi/gcc/openmpi/bin:/p/home/cekees/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/krb5.20150813/bin:/usr/local/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/opt/c3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/pbs/SLB:/app/unsupported/local/bin:/app/unsupported/local/fta/bin:. + PROLOGUE: | + export HOSTTYPE=x86_64; export VENDOR=unknown; export OSTYPE=linux; export MACHTYPE=x86_64-suse-linux; export CPU=x86_64; export INPUTRC=/etc/inputrc; export JAVA_BINDIR=/usr/lib64/jvm/jre/bin; export JAVA_ROOT=/usr/lib64/jvm/jre; export JAVA_HOME=/usr/lib64/jvm/jre; export JRE_HOME=/usr/lib64/jvm/jre; export MODULESHOME=/p/home/apps/modules_dest/Modules/3.2.10; export LD_LIBRARY_PATH=/p/home/apps/sgi/mpt-2.12-sgi712r26/lib:/p/home/cekees/proteus/topaz/lib:/p/home/cekees/proteus/topaz/lib:/app/unsupported/COST/lapack/3.5.0/gnu/lib:/apps/gnu_compiler/4.9.3/lib64:/p/home/apps/sgi/mpt-2.12-sgi712r26/lib:/usr/lib64/mpi/gcc/openmpi/lib64; export MODULE_VERSION=3.2.10; export MODULE_VERSION_STACK=3.2.10; export MODULEPATH=/p/home/apps/modules_dest/Modules/versions:/p/home/apps/modules_dest/Modules/$MODULE_VERSION/modulefiles:/p/home/apps/modules_dest/Modules/modulefiles:/p/home/apps/modulefiles/devel:/p/home/apps/modulefiles/modulefiles:/p/home/apps/modulefiles/apps:/p/home/apps/modulefiles/unsupported; export LOADEDMODULES=mpi/sgimpt/2.12-11218:pbs/12.2.7.152442:compiler/gcc/4.9.3:costinit:lapack/gnu/3.5.0; export BC_HOST=topaz; export CPATH=/p/home/apps/sgi/mpt-2.12-sgi712r26/include; export _LMFILES_=/p/home/apps/modulefiles/devel/mpi/sgimpt/2.12-11218:/p/home/apps/modulefiles/modulefiles/pbs/12.2.7.152442:/p/home/apps/modulefiles/devel/compiler/gcc/4.9.3; export FPATH=/p/home/apps/sgi/mpt-2.12-sgi712r26/include; export LIBRARY_PATH=/p/home/apps/sgi/mpt-2.12-sgi712r26/lib; export MPI_ROOT=/p/home/apps/sgi/mpt-2.12-sgi712r26; export MPT_VERSION=2.12; export ENV=/etc/bash.bashrc; export CC=gcc; export CXX=g++; export F77=gfortran; export F90=gfortran; export I_MPI_CC=gcc; export I_MPI_CXX=g++; export I_MPI_F77=gfortran; export I_MPI_F90=gfortran; export I_MPI_FC=gfortran; export MPICC_CC=gcc; export MPICXX_CXX=g++; export MPIF90_F90=gfortran; export FC=gfortran; + + DYNAMIC_EXE_LINKER_FLAGS: -Bdynamic + +packages: + launcher: + cmake: + python: + host: false + build_with: | + openssl,bzip2,sqlite + blas: + use: host-blas + lapack: + use: host-lapack + daetk: + mpi: + use: host-mpi + mpi4py: + nose: + hdf5: + ipython: + matplotlib: + parmetis: + without_check: true + petsc: + version: 3.6.1 + build_with: | + parmetis + coptflags: -O2 + link: shared + debug: false + fortran: false + petsc4py: + version: 3.6.0 + with_conf: true + pytables: + sphinx: + superlu: + sympy: + tetgen: + triangle: + memory_profiler: + scipy: + netcdf4f: + python-netcdf4: + h5py: + ode: + pip: + buildbot-worker: + # pyode: + # vtk: + # pyvtk: diff --git a/examples/proteus.util.yaml b/examples/proteus.util.yaml index 35c65060a..5f4ce4174 100644 --- a/examples/proteus.util.yaml +++ b/examples/proteus.util.yaml @@ -48,3 +48,5 @@ packages: sympy: tetgen: triangle: + pip: + pexpect: \ No newline at end of file diff --git a/osx_clt.yaml b/osx_clt.yaml index 8a6c84c05..87989a871 100644 --- a/osx_clt.yaml +++ b/osx_clt.yaml @@ -5,3 +5,5 @@ parameters: platform: Darwin fortran: false PATH: /usr/bin:/bin:/usr/sbin:/sbin + PROLOGUE: | + export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/") diff --git a/pkgs/MarkupSafe.yaml b/pkgs/MarkupSafe.yaml index 7a323e53c..56713325a 100644 --- a/pkgs/MarkupSafe.yaml +++ b/pkgs/MarkupSafe.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.23.tar.gz - key: tar.gz:utwbv72zxfnbjnc6wlrdoynac6pjqmm5 + - key: tar.gz:utwbv72zxfnbjnc6wlrdoynac6pjqmm5 + url: https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/MarkupSafe-0.23.tar.gz diff --git a/pkgs/Twisted.yaml b/pkgs/Twisted.yaml index a0559a6ad..c42eb677d 100644 --- a/pkgs/Twisted.yaml +++ b/pkgs/Twisted.yaml @@ -1,12 +1,12 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: - build: [zope-interface, setuptools, service_identity, pyOpenSSL] - run: [zope-interface, service_identity, pyOpenSSL] + build: [zope-interface, setuptools, service_identity, pyOpenSSL, incremental] + run: [zope-interface, service_identity, pyOpenSSL, incremental] sources: - - url: https://pypi.python.org/packages/source/T/Twisted/Twisted-14.0.0.tar.bz2 - key: tar.bz2:xx6zmgwcefxvyznqp4wduxsrc33hco4m + - key: tar.bz2:2d7bcxvh56gpmmwqkeb54ybvnrxjskzb + url: https://pypi.python.org/packages/dc/c0/a0114a6d7fa211c0904b0de931e8cafb5210ad824996cc6a9d67f3bae22c/Twisted-16.6.0.tar.bz2 when_build_dependency: - prepend_path: PYTHONPATH diff --git a/pkgs/adh/adh.yaml b/pkgs/adh/adh.yaml new file mode 100644 index 000000000..20a69fc99 --- /dev/null +++ b/pkgs/adh/adh.yaml @@ -0,0 +1,130 @@ +extends: [cmake_package] + +dependencies: + build: [python,mpi,parmetis,lapack,blas] + +sources: +- url: git@public.git.erdc.dren.mil:adh/adh.git + key: git:01f9fba7f6f95b77be3560cce8bfaa87f174431e + +build_stages: +- name: fix_link + files: + - fix_link.patch + before: configure + handler: bash + bash: | + patch -p1 < _hashdist/fix_link.patch + +- name: setup_builddir + after: prologue + handler: bash + bash: | + mkdir -p _build + cd _build + +- when: platform == 'Darwin' + name: configure + mode: override + extra: [ + '-DCMAKE_C_COMPILER:FILEPATH=${MPICC}', + '-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}', + '-DCMAKE_Fortran_COMPILER:FILEPATH=${MPIF90}', + '-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}', + '-DPACKAGE_MPI:BOOL=True', + '-DPACKAGE_PARMETIS:BOOL=True', + '-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include', + '-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.dylib', + '-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.dylib', + '-DPACKAGE_UMFPACK:BOOL=False', + '-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}', + '-DUMFPACK_VERSION:STRING=3', + '-DUMFPACK_INT_SIZE:STRING=32', + '-DUMFPACK_LIBRARY:FILEPATH=${UMFPACK_LIBRARY}' + ] + +- when: platform == 'linux' + name: configure + mode: override + extra: [ + '-DCMAKE_C_COMPILER:FILEPATH=${MPICC}', + '-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}', + '-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}', + '-DCMAKE_VERBOSE_MAKEFILE:BOOL=True', + '-DCMAKE_EXE_LINKER_FLAGS:STRING="-L${PARMETIS_DIR}/lib -Wl,-rpath=${PARMETIS_DIR}/lib -L${OPENBLAS_DIR}/lib -lm -Wl,-rpath=${OPENBLAS_DIR}/lib"', + '-DUSE_MPI:BOOL=ON', + '-DPACKAGE_MPI:BOOL=ON', + '-DUSE_BLAS:BOOL=ON', + '-DUSE_LAPACK:BOOL=ON', + '-DBLAS_openblas_LIBRARY:FILEPATH=${OPENBLAS_DIR}/lib/libopenblas.so', + '-DUSE_PARMETIS:BOOL=ON', + '-DPACKAGE_PARMETIS:BOOL=ON', + '-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include', + '-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.so', + '-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.so', + '-DUSE_SUPER_LIBRARY:BOOL=False', + '-DPACKAGE_UMFPACK:BOOL=False', + '-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}', + '-DUMFPACK_VERSION:STRING=3', + '-DUMFPACK_INT_SIZE:STRING=32', + '-DUMFPACK_LIBRARY:FILEPATH=${UMFPACK_LIBRARY}' + ] + +- when: machine == 'CrayXE6' + name: configure + mode: override + extra: [ + '-DCMAKE_C_COMPILER:FILEPATH=${MPICC}', + '-DCMAKE_C_FLAGS:STRING="-fPIC"', + '-DCMAKE_C_FLAGS_DEBUG:STRING="-g -fPIC"', + '-DCMAKE_C_FLAGS_OPT:STRING="-03 -fPIC"', + '-DCMAKE_C_FLAGS_RELEASE:STRING="-O3 -fPIC"', + '-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}', + '-DCMAKE_CXX_FLAGS:STRING="-fPIC"', + '-DCMAKE_CXX_FLAGS_DEBUG:STRING="-g -fPIC"', + '-DCMAKE_CXX_FLAGS_RELEASE:STRING="-O3 -fPIC"', + '-DCMAKE_Fortran_COMPILER:FILEPATH=${MPIF90}', + '-DCMAKE_Fortran_FLAGS:STRING="-fPIC"', + '-DCMAKE_Fortran_FLAGS_DEBUG:STRING="-g -fPIC"', + '-DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O3 -fPIC"', + '-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}', + '-DCMAKE_EXE_LINKER_FLAGS:STRING="-static"', + '-DPACKAGE_MPI:BOOL=True', + '-DPACKAGE_PARMETIS:BOOL=True', + '-DPARMETIS_INCLUDE_DIR:PATH=${PARMETIS_DIR}/include', + '-DPARMETIS_LIBRARY:FILEPATH=${PARMETIS_DIR}/lib/libparmetis.so', + '-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.so', + '-DPACKAGE_UMFPACK:BOOL=False', + '-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}', + '-DUMFPACK_VERSION:STRING=3', + '-DUMFPACK_INT_SIZE:STRING=32', + '-DUMFPACK_LIBRARY:FILEPATH=${UMFPACK_LIBRARY}' + ] + +# Disable metis/parmetis on Cygwin for now +- when: platform == 'Cygwin' + name: configure + mode: override + extra: [ + '-DCMAKE_C_COMPILER:FILEPATH=${MPICC}', + '-DCMAKE_CXX_COMPILER:FILEPATH=${MPICXX}', + '-DCMAKE_Fortran_COMPILER:FILEPATH=${MPIF90}', + '-DCMAKE_INSTALL_PREFIX:PATH=${ARTIFACT}', + '-DPACKAGE_MPI:BOOL=True', + '-DPACKAGE_PARMETIS:BOOL=False', + '-DPACKAGE_UMFPACK:BOOL=False', + '-DUMFPACK_INCLUDE_DIR:PATH=${UMFPACK_INCLUDE}', + '-DUMFPACK_VERSION:STRING=3', + '-DUMFPACK_INT_SIZE:STRING=32', + '-DUMFPACK_LIBRARY:FILEPATH=${UMFPACK_LIBRARY}' + ] + +- name: install + handler: bash + mode: replace + after: make + bash: | + mkdir ${ARTIFACT}/bin + mkdir ${ARTIFACT}/lib + cp bin/* ${ARTIFACT}/bin + cp lib/* ${ARTIFACT}/lib diff --git a/pkgs/adh/fix_link.patch b/pkgs/adh/fix_link.patch new file mode 100644 index 000000000..845ba23c2 --- /dev/null +++ b/pkgs/adh/fix_link.patch @@ -0,0 +1,12 @@ +diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt +index d6224e4..0d45b9d 100644 +--- a/main/CMakeLists.txt ++++ b/main/CMakeLists.txt +@@ -81,6 +81,7 @@ add_executable(adh ${adh_sources}) + set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "") + endif(USE_NSM) + ++ target_link_libraries(adh m) + + ############################################################################## + diff --git a/pkgs/alabaster.yaml b/pkgs/alabaster.yaml new file mode 100644 index 000000000..a9c7c25b2 --- /dev/null +++ b/pkgs/alabaster.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:i6x5ioyiutwkurpdjfxbhgqzhtrwivy6 + url: https://pypi.python.org/packages/71/c3/70da7d8ac18a4f4c502887bd2549e05745fa403e2cd9d06a8a9910a762bc/alabaster-0.7.9.tar.gz diff --git a/pkgs/apipkg.yaml b/pkgs/apipkg.yaml new file mode 100644 index 000000000..0242e2536 --- /dev/null +++ b/pkgs/apipkg.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:fy4dthn6qqujd7ufhetadkvy6qfi6tgf + url: https://pypi.python.org/packages/32/37/6ce6dbaa8035730efa95e60b09498ec17000d137742391ff46974d9ef859/apipkg-1.4.tar.gz diff --git a/pkgs/attrs.yaml b/pkgs/attrs.yaml new file mode 100644 index 000000000..6c5a89929 --- /dev/null +++ b/pkgs/attrs.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:dr4wbth5niafzwpxxkee4yywwxsdbi7r + url: https://pypi.python.org/packages/8b/0b/a06cfcb69d0cb004fde8bc6f0fd192d96d565d1b8aa2829f0f20adb796e5/attrs-17.4.0.tar.gz diff --git a/pkgs/babel.yaml b/pkgs/babel.yaml new file mode 100644 index 000000000..a26893ba9 --- /dev/null +++ b/pkgs/babel.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:yu24iqbyal3owoaxhtkimpsbtyrhjeq2 + url: https://pypi.python.org/packages/6e/96/ba2a2462ed25ca0e651fb7b66e7080f5315f91425a07ea5b34d7c870c114/Babel-2.3.4.tar.gz diff --git a/pkgs/backports-abc.yaml b/pkgs/backports-abc.yaml new file mode 100644 index 000000000..337e2c069 --- /dev/null +++ b/pkgs/backports-abc.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:am56kriuua7ckxpxlrno5d46m4xwmp4t + url: https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8/backports_abc-0.5.tar.gz diff --git a/pkgs/backports-shutil-get-terminal-size.yaml b/pkgs/backports-shutil-get-terminal-size.yaml new file mode 100644 index 000000000..ce20454cd --- /dev/null +++ b/pkgs/backports-shutil-get-terminal-size.yaml @@ -0,0 +1,9 @@ +extends: [namespace_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:oe7hvariv2adihdqlbwrzqfizkssa42g + url: https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b/backports.shutil_get_terminal_size-1.0.0.tar.gz diff --git a/pkgs/backports-ssl_match_hostname.yaml b/pkgs/backports-ssl_match_hostname.yaml index bfdb1b056..01f4699d5 100644 --- a/pkgs/backports-ssl_match_hostname.yaml +++ b/pkgs/backports-ssl_match_hostname.yaml @@ -1,4 +1,4 @@ -extends: [setuptools_package] +extends: [namespace_package] sources: - key: tar.gz:a5aq475qtkvxxwxv4ymn4zwd3lee4lr5 diff --git a/pkgs/backports.ssl-match-hostname.yaml b/pkgs/backports.ssl-match-hostname.yaml new file mode 100644 index 000000000..1eea209cd --- /dev/null +++ b/pkgs/backports.ssl-match-hostname.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:kavntbyhggpuuup2fsq4m555mwiarut5 + url: https://pypi.python.org/packages/76/21/2dc61178a2038a5cb35d14b61467c6ac632791ed05131dda72c20e7b9e23/backports.ssl_match_hostname-3.5.0.1.tar.gz diff --git a/pkgs/blaze.yaml b/pkgs/blaze.yaml new file mode 100644 index 000000000..b5536edc0 --- /dev/null +++ b/pkgs/blaze.yaml @@ -0,0 +1,29 @@ +extends: [base_package] + +sources: +- key: tar.gz:t2wrktp53n3wlpfplswcnzma3hqnembl + url: https://bitbucket.org/blaze-lib/blaze/get/v3.0.tar.gz + +defaults: + relocatable: false + +build_stages: +- name: make + handler: bash + after: prologue + bash: | + echo "blaze is headers only!" + +- name: install + handler: bash + after: make + bash: | + mkdir -p $ARTIFACT + cp -r blaze $ARTIFACT + +profile_links: +- name: everything + link: '*/**/*' + + + diff --git a/pkgs/bleach.yaml b/pkgs/bleach.yaml new file mode 100644 index 000000000..9ea07f5dc --- /dev/null +++ b/pkgs/bleach.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [html5lib] + +sources: + - key: tar.gz:s6hhlbmzwvgnhsvc4fqnoqicq6nsgdvi + url: https://pypi.python.org/packages/99/00/25a8fce4de102bf6e3cc76bc4ea60685b2fee33bde1b34830c70cacc26a7/bleach-1.5.0.tar.gz diff --git a/pkgs/boost/boost.yaml b/pkgs/boost/boost.yaml index 544a8d0c6..42ffa94ca 100644 --- a/pkgs/boost/boost.yaml +++ b/pkgs/boost/boost.yaml @@ -7,8 +7,8 @@ dependencies: build: [bzip2, mpi, zlib, {{build_with}}] sources: -- key: tar.bz2:oj5jgizc3fbipnrkxmn5fvaxepxminlk - url: http://downloads.sourceforge.net/boost/boost_1_59_0.tar.bz2 +- key: tar.bz2:nbvp774ytlberd3zvf5zi6ppxhzkxlqd + url: http://downloads.sourceforge.net/boost/boost_1_60_0.tar.bz2 build_stages: - name: bootstrap @@ -17,14 +17,6 @@ build_stages: bash: | ./bootstrap.sh --with-toolset={{toolset}} --prefix=${ARTIFACT} -- name: boost_1_55_fix_warnings - before: bjam - after: bootstrap - handler: bash - files: [boost_1_55_fix_warnings.patch] - bash: | - patch -p2 < _hashdist/boost_1_55_fix_warnings.patch - - name: set-address_model before: bjam handler: bash diff --git a/pkgs/buildbot-slave.yaml b/pkgs/buildbot-slave.yaml deleted file mode 100644 index ec18413e9..000000000 --- a/pkgs/buildbot-slave.yaml +++ /dev/null @@ -1,9 +0,0 @@ -extends: [distutils_package] - -dependencies: - build: [Twisted, zope-interface, setuptools] - run: [Twisted, zope-interface] - -sources: -- key: zip:kwq5k3st37bhcksx4m5ulmlvdrb2jvrj - url: https://pypi.python.org/packages/source/b/buildbot-slave/buildbot-slave-0.8.10.zip diff --git a/pkgs/buildbot-worker.yaml b/pkgs/buildbot-worker.yaml new file mode 100644 index 000000000..a864db4d8 --- /dev/null +++ b/pkgs/buildbot-worker.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [future, Twisted] + run: [future, Twisted] + +sources: + - key: tar.gz:hucxsgwayvlohzh6b33yseooi7vlj7f3 + url: https://pypi.python.org/packages/d2/29/84a4d8873d5fff2b9defde79f512bec0316305239a5871fc92549e04d781/buildbot-worker-0.9.2.tar.gz diff --git a/pkgs/certifi.yaml b/pkgs/certifi.yaml index 5a37b0326..4e48f1c26 100644 --- a/pkgs/certifi.yaml +++ b/pkgs/certifi.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:3q5cwlm5caz5x4tvqy3gvzq3tv6ejwgd - url: https://pypi.python.org/packages/source/c/certifi/certifi-2015.9.6.2.tar.gz + - key: tar.gz:qj2254n35lyfyu3rlp6f3bljxupajsq6 + url: https://pypi.python.org/packages/4f/75/e1bc6e363a2c76f8d7e754c27c437dbe4086414e1d6d2f6b2a3e7846f22b/certifi-2016.9.26.tar.gz diff --git a/pkgs/cffi.yaml b/pkgs/cffi.yaml index 554c50ed0..6bd4ea9e4 100644 --- a/pkgs/cffi.yaml +++ b/pkgs/cffi.yaml @@ -5,8 +5,5 @@ dependencies: run: [] sources: - #- url: https://pypi.python.org/packages/source/c/cffi/cffi-0.8.6.tar.gz - # key: tar.gz:euznty5pty6g2d3rb7eywauvwvr4p444 - - - url: https://pypi.python.org/packages/source/c/cffi/cffi-0.8.2.tar.gz - key: tar.gz:qgjdsnsa666dathiezu3gxvzawjfm2rq + - key: tar.gz:ky7axvj73ib4cukxgil3hje3hk5nraj5 + url: https://pypi.python.org/packages/a1/32/e3d6c3a8b5461b903651dd6ce958ed03c093d2e00128e3f33ea69f1d7965/cffi-1.9.1.tar.gz diff --git a/pkgs/cgal.yaml b/pkgs/cgal.yaml index 2707037b3..0e7cbc51f 100644 --- a/pkgs/cgal.yaml +++ b/pkgs/cgal.yaml @@ -3,8 +3,8 @@ dependencies: build: [zlib, boost, gmp, mpfr] sources: -- key: tar.gz:4tvxmvt432ec6grz63evantnmvx4rqfl - url: https://gforge.inria.fr/frs/download.php/file/34512/CGAL-4.5.2.tar.gz +- key: tar.xz:mowf35y7sextj4xq6lsuumbvpdpvd5hm + url: https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.9/CGAL-4.9.tar.xz defaults: # lib/CGAL/CGALConfig.cmake contains hard-coded path @@ -15,8 +15,6 @@ build_stages: extra: ['-D BUILD_SHARED_LIBS:BOOL=ON', '-D WITH_CGAL_Core:BOOL=ON', '-D WITH_CGAL_ImageIO:BOOL=ON', - '-D WITH_CGAL_Qt3:BOOL=OFF', - '-D WITH_CGAL_Qt4:BOOL=OFF', '-D ZLIB_ROOT:PATH=${ZLIB_DIR}', '-D Boost_USE_MULTITHREADED:BOOL=${BOOST_USE_MULTITHREADED}', '-D BOOST_ROOT:PATH=${BOOST_DIR}'] diff --git a/pkgs/characteristic.yaml b/pkgs/characteristic.yaml index 1050aca8d..132b6286b 100644 --- a/pkgs/characteristic.yaml +++ b/pkgs/characteristic.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/c/characteristic/characteristic-0.1.0.tar.gz - key: tar.gz:2rypvrekzs6kiebyumq2xugbu5bix3xv + - key: tar.gz:33li2tsciek62rhfza6cvea2bnqvpkkz + url: https://pypi.python.org/packages/dc/66/54b7a4758ea44fbc93895c7745060005272560fb2c356f2a6f7448ef9a80/characteristic-14.3.0.tar.gz diff --git a/pkgs/chrono/chrono.yaml b/pkgs/chrono/chrono.yaml new file mode 100644 index 000000000..a88fff4cb --- /dev/null +++ b/pkgs/chrono/chrono.yaml @@ -0,0 +1,53 @@ +extends: [cmake_package] + +sources: +- key: tar.gz:fewerd5wmhfc6evvlgnjineosbh6gyaz + url: https://github.com/projectchrono/chrono/archive/3.0.0.tar.gz + +defaults: + relocatable: false + +dependencies: + build: + - bzip2 + - python + - zlib + - openjpeg + - png + - swig + - blaze + - boost + - libjpeg + +build_stages: +- name: cmakelists-patch + before: configure + files: + - lib64.patch + handler: bash + bash: | + patch -up1 < _hashdist/lib64.patch + +- name: configure + extra: + - '-DENABLE_UNIT_CASCADE:BOOL=ON' + - '-DENABLE_MODULE_FEA:BOOL=ON' + - '-DENABLE_MODULE_IRRLICHT:BOOL=OFF' + - '-DENABLE_MODULE_POSTPROCESS:BOOL=ON' + - '-DENABLE_MODULE_VEHICLE:BOOL=ON' + - '-DENABLE_MODULE_FSI:BOOL=ON' + - '-DENABLE_OPENMP:BOOL=ON' + - '-DENABLE_MODULE_PYTHON:BOOL=OFF' + - '-DENABLE_MODULE_COSIMULATION:BOOL=OFF' + - '-DENABLE_MODULE_MATLAB:BOOL=OFF' + - '-DENABLE_MODULE_MKL:BOOL=OFF' + - '-DENABLE_MODULE_PARALLEL:BOOL=OFF' + - '-DENABLE_MODULE_OPENGL:BOOL=OFF' + - '-DENABLE_MODULE_OGRE:BOOL=OFF' + - '-DCMAKE_BUILD_TYPE:STRING=Debug' + - '-DBLAZE_DIR:PATH=${BLAZE_DIR}' + - '-DBOOST_DIR:PATH=${BOOST_DIR}/include' + - '-DPYTHON_EXECUTABLE:PATH=${PYTHON}' + - '-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_DIR}/include/python2.7' + - '-DPYTHON_LIBRARY:PATH=${PYTHON_DIR}/lib/libpython2.7.so' + - '-DUSE_PARALLEL_SIMD:BOOL=ON' diff --git a/pkgs/chrono/lib64.patch b/pkgs/chrono/lib64.patch new file mode 100644 index 000000000..75f6bef41 --- /dev/null +++ b/pkgs/chrono/lib64.patch @@ -0,0 +1,346 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2ec692b7..da95724c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,7 @@ endif() + #----------------------------------------------------------------------------- + + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib64) ++set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + + #----------------------------------------------------------------------------- + +diff --git a/cmake/ChronoConfig.cmake.in b/cmake/ChronoConfig.cmake.in +index a0115e67a..d39a73b11 100644 +--- a/cmake/ChronoConfig.cmake.in ++++ b/cmake/ChronoConfig.cmake.in +@@ -62,7 +62,7 @@ set(CHRONO_C_FLAGS "@CH_C_FLAGS@") + if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(CHRONO_LINKER_FLAGS "") + else() +- set(CHRONO_LINKER_FLAGS "-L@CH_BINARY_DIR@/lib64") ++ set(CHRONO_LINKER_FLAGS "-L@CH_BINARY_DIR@/lib") + endif() + + list(APPEND CHRONO_INCLUDE_DIRS "@CH_INCLUDE_DIRS@") +@@ -242,7 +242,7 @@ endforeach() + foreach(lib ${CHRONO_LIB_NAMES}) + set(onelib "${lib}-NOTFOUND") + find_library(onelib ${lib} +- PATHS "@CH_BINARY_DIR@/lib64" ++ PATHS "@CH_BINARY_DIR@/lib" + PATH_SUFFIXES "Release" + NO_DEFAULT_PATH + ) +@@ -347,8 +347,8 @@ function(add_DLL_copy_command DLL_LIST) + ) + endforeach() + +- message("Attention: the COPY_DLLS routine will first look for Chrono libraries under the /bin and /lib64 subfolders of @CH_BINARY_DIR@") +- message(" If not found, it will look under /bin/Release and /lib64/Release subfolder, so copying the Release version of Chrono.") ++ message("Attention: the COPY_DLLS routine will first look for Chrono libraries under the /bin and /lib subfolders of @CH_BINARY_DIR@") ++ message(" If not found, it will look under /bin/Release and /lib/Release subfolder, so copying the Release version of Chrono.") + message(" Check the few lines above to make sure which dlls are copied!") + message(" In both cases please mind that you SHOULD NOT mix libraries and/or executables compiled with different build configurations (e.g. Release and Debug)!") + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 192facc8e..722286546 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -452,7 +452,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/ChronoConfig.cmake.in" + if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(CH_CONFIG_INSTALL_PATH "cmake") + else() +- set(CH_CONFIG_INSTALL_PATH "lib64/cmake") ++ set(CH_CONFIG_INSTALL_PATH "lib/cmake") + endif() + + install(FILES "${PROJECT_BINARY_DIR}/cmake/ChronoConfig.cmake.install" +diff --git a/src/chrono/CMakeLists.txt b/src/chrono/CMakeLists.txt +index e9c527cc1..7a7e7adfe 100644 +--- a/src/chrono/CMakeLists.txt ++++ b/src/chrono/CMakeLists.txt +@@ -971,8 +971,8 @@ endif() + # Install the main ChronoEngine library + install(TARGETS ChronoEngine + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # Install all header files for the main ChronoEngine library + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ +diff --git a/src/chrono_cascade/CMakeLists.txt b/src/chrono_cascade/CMakeLists.txt +index 727e88844..1b115c6b6 100644 +--- a/src/chrono_cascade/CMakeLists.txt ++++ b/src/chrono_cascade/CMakeLists.txt +@@ -110,8 +110,8 @@ SET (CH_CASCADELIBS "${CH_CASCADELIBS}" PARENT_SCOPE ) + + INSTALL(TARGETS ChronoEngine_cascade + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_CASCADE_HEADERS} DESTINATION include/chrono_cascade) + +diff --git a/src/chrono_cosimulation/CMakeLists.txt b/src/chrono_cosimulation/CMakeLists.txt +index 81b604c9b..c002ec112 100644 +--- a/src/chrono_cosimulation/CMakeLists.txt ++++ b/src/chrono_cosimulation/CMakeLists.txt +@@ -84,8 +84,8 @@ ADD_DEPENDENCIES (ChronoEngine_cosimulation ChronoEngine) + + INSTALL(TARGETS ChronoEngine_cosimulation + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_COSIMULATION_HEADERS} + DESTINATION include/chrono_cosimulation) +diff --git a/src/chrono_fea/CMakeLists.txt b/src/chrono_fea/CMakeLists.txt +index a2b56369e..e6bfb06c0 100644 +--- a/src/chrono_fea/CMakeLists.txt ++++ b/src/chrono_fea/CMakeLists.txt +@@ -143,8 +143,8 @@ ADD_DEPENDENCIES(ChronoEngine_fea ChronoEngine) + + INSTALL(TARGETS ChronoEngine_fea + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_FEA_HEADERS} + DESTINATION include/chrono_fea) +diff --git a/src/chrono_fsi/CMakeLists.txt b/src/chrono_fsi/CMakeLists.txt +index 5a4f6c9b4..cb70e824a 100644 +--- a/src/chrono_fsi/CMakeLists.txt ++++ b/src/chrono_fsi/CMakeLists.txt +@@ -166,8 +166,8 @@ TARGET_LINK_LIBRARIES(ChronoEngine_fsi ${LIBRARIES}) + + INSTALL(TARGETS ChronoEngine_fsi + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_FSI_HEADERS} + DESTINATION include/chrono_fsi) +diff --git a/src/chrono_irrlicht/CMakeLists.txt b/src/chrono_irrlicht/CMakeLists.txt +index e699e16c1..e5cf7363e 100644 +--- a/src/chrono_irrlicht/CMakeLists.txt ++++ b/src/chrono_irrlicht/CMakeLists.txt +@@ -174,8 +174,8 @@ ENDIF() + + INSTALL(TARGETS ChronoEngine_irrlicht + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64 ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + + INSTALL(FILES ${ChronoEngine_IRRLICHT_HEADERS} DESTINATION include/chrono_irrlicht) +diff --git a/src/chrono_matlab/CMakeLists.txt b/src/chrono_matlab/CMakeLists.txt +index 4f23c1ee6..3e014748c 100644 +--- a/src/chrono_matlab/CMakeLists.txt ++++ b/src/chrono_matlab/CMakeLists.txt +@@ -81,8 +81,8 @@ ADD_DEPENDENCIES(ChronoEngine_matlab ChronoEngine) + + INSTALL(TARGETS ChronoEngine_matlab + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_MATLAB_HEADERS} +- DESTINATION include/chrono/unit_MATLAB) +\ No newline at end of file ++ DESTINATION include/chrono/unit_MATLAB) +diff --git a/src/chrono_mkl/CMakeLists.txt b/src/chrono_mkl/CMakeLists.txt +index 4e48ce157..1e964b1e3 100644 +--- a/src/chrono_mkl/CMakeLists.txt ++++ b/src/chrono_mkl/CMakeLists.txt +@@ -105,8 +105,8 @@ TARGET_LINK_LIBRARIES(ChronoEngine_mkl + + INSTALL(TARGETS ChronoEngine_mkl + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_MKL_HEADERS} + DESTINATION include/chrono_mkl) +diff --git a/src/chrono_models/vehicle/CMakeLists.txt b/src/chrono_models/vehicle/CMakeLists.txt +index 4c402121c..6e2ca67f2 100644 +--- a/src/chrono_models/vehicle/CMakeLists.txt ++++ b/src/chrono_models/vehicle/CMakeLists.txt +@@ -207,8 +207,8 @@ target_link_libraries(ChronoModels_vehicle ${LIBRARIES}) + + install(TARGETS ChronoModels_vehicle + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION include/chrono_models/vehicle +diff --git a/src/chrono_ogre/CMakeLists.txt b/src/chrono_ogre/CMakeLists.txt +index 0b41a2587..f04db48b6 100644 +--- a/src/chrono_ogre/CMakeLists.txt ++++ b/src/chrono_ogre/CMakeLists.txt +@@ -128,7 +128,7 @@ TARGET_LINK_LIBRARIES(ChronoEngine_ogre ${LIBRARIES}) + + INSTALL(TARGETS ChronoEngine_ogre + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64 ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib + ) + +diff --git a/src/chrono_opengl/CMakeLists.txt b/src/chrono_opengl/CMakeLists.txt +index 71f963fd1..b6b3d108a 100644 +--- a/src/chrono_opengl/CMakeLists.txt ++++ b/src/chrono_opengl/CMakeLists.txt +@@ -291,8 +291,8 @@ TARGET_LINK_LIBRARIES(ChronoEngine_opengl ${CE_OpenGL_LIBRARIES}) + + INSTALL(TARGETS ChronoEngine_opengl + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION include/chrono_opengl +diff --git a/src/chrono_parallel/CMakeLists.txt b/src/chrono_parallel/CMakeLists.txt +index 2bedcd952..8b1d5ab08 100644 +--- a/src/chrono_parallel/CMakeLists.txt ++++ b/src/chrono_parallel/CMakeLists.txt +@@ -482,8 +482,8 @@ TARGET_LINK_LIBRARIES(ChronoEngine_parallel ${CHRONO_PARALLEL_LINKED_LIBRARIES}) + + INSTALL(TARGETS ChronoEngine_parallel + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION include/chrono_parallel +diff --git a/src/chrono_postprocess/CMakeLists.txt b/src/chrono_postprocess/CMakeLists.txt +index 0af4cdf72..03608f70b 100644 +--- a/src/chrono_postprocess/CMakeLists.txt ++++ b/src/chrono_postprocess/CMakeLists.txt +@@ -56,8 +56,8 @@ ADD_DEPENDENCIES(ChronoEngine_postprocess ChronoEngine) + + INSTALL(TARGETS ChronoEngine_postprocess + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + INSTALL(FILES ${ChronoEngine_POSTPROCESS_HEADERS} + DESTINATION include/chrono_postprocess) +diff --git a/src/chrono_python/CMakeLists.txt b/src/chrono_python/CMakeLists.txt +index 2a9327e90..8b84ca392 100644 +--- a/src/chrono_python/CMakeLists.txt ++++ b/src/chrono_python/CMakeLists.txt +@@ -86,8 +86,8 @@ ADD_DEPENDENCIES(ChronoEngine_pyparser ChronoEngine) + + install(TARGETS ChronoEngine_pyparser + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + #----------------------------------------------------------------------------- + # Find SWIG +diff --git a/src/chrono_vehicle/CMakeLists.txt b/src/chrono_vehicle/CMakeLists.txt +index 230b412be..6ff8c0019 100644 +--- a/src/chrono_vehicle/CMakeLists.txt ++++ b/src/chrono_vehicle/CMakeLists.txt +@@ -639,8 +639,8 @@ target_link_libraries(ChronoEngine_vehicle ${LIBRARIES}) + + install(TARGETS ChronoEngine_vehicle + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib64 +- ARCHIVE DESTINATION lib64) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION include/chrono_vehicle +diff --git a/src/demos/CMakeLists.txt b/src/demos/CMakeLists.txt +index 057bb939d..a383510ba 100644 +--- a/src/demos/CMakeLists.txt ++++ b/src/demos/CMakeLists.txt +@@ -8,16 +8,16 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE) + # (but later on when installing) + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib64") ++set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + + # add the automatically determined parts of the RPATH + # which point to directories outside the build tree to the install RPATH + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + # the RPATH to be used when installing, but only if it's not a system directory +-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib64" isSystemDir) ++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) + if("${isSystemDir}" STREQUAL "-1") +- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib64") ++ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + endif("${isSystemDir}" STREQUAL "-1") + + #-------------------------------------------------------------- +diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt +index 68b972948..7fb95f8f1 100644 +--- a/src/unit_tests/CMakeLists.txt ++++ b/src/unit_tests/CMakeLists.txt +@@ -11,16 +11,16 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE) + # (but later on when installing) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib64") ++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + + # add the automatically determined parts of the RPATH + # which point to directories outside the build tree to the install RPATH + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + # the RPATH to be used when installing, but only if it's not a system directory +-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib64" isSystemDir) ++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) + IF("${isSystemDir}" STREQUAL "-1") +- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib64") ++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + ENDIF("${isSystemDir}" STREQUAL "-1") + + #-------------------------------------------------------------- +diff --git a/template_project/CMakeLists.txt b/template_project/CMakeLists.txt +index f581a8a11..c9ce7ce6a 100644 +--- a/template_project/CMakeLists.txt ++++ b/template_project/CMakeLists.txt +@@ -59,7 +59,7 @@ project(my_project) + # In this example, we only request the Irrlicht module (required) + #-------------------------------------------------------------- + +-LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}/../Chrono/lib64") ++LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}/../Chrono/lib") + find_package(Chrono + COMPONENTS Irrlicht + CONFIG) diff --git a/pkgs/clawpack.yaml b/pkgs/clawpack.yaml index 6e0b66a16..22aefe74e 100644 --- a/pkgs/clawpack.yaml +++ b/pkgs/clawpack.yaml @@ -1,8 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + dependencies: build: [numpy] run: [numpy, matplotlib] sources: -- key: tar.gz:ths6trvj5trqhvsgfjwnj5oopcml3oui - url: https://pypi.python.org/packages/source/c/clawpack/clawpack-5.2.2.tar.gz + - key: tar.gz:h6cllvqpmx7kxonmsi4wceygbeo5xm3n + url: https://pypi.python.org/packages/3e/c7/1674d94f276a401bdbb5e974f838d844f1888d53219db434b1a17adb0d0f/clawpack-5.3.1.tar.gz diff --git a/pkgs/cmake.yaml b/pkgs/cmake.yaml index a3d7d922c..40af41b73 100644 --- a/pkgs/cmake.yaml +++ b/pkgs/cmake.yaml @@ -4,8 +4,8 @@ dependencies: build: [zlib, bzip2, curl, openssl, libidn, expat, ncurses] sources: -- key: tar.gz:3j6mgtq44hmc4z5dfkyidqbmfbcvgtgy - url: https://cmake.org/files/v3.4/cmake-3.4.2.tar.gz +- key: tar.gz:zzozcyjznydfagya4uutg6brkcuhymyi + url: https://cmake.org/files/v3.8/cmake-3.8.1.tar.gz build_stages: - when: platform == 'Darwin' diff --git a/pkgs/configparser.yaml b/pkgs/configparser.yaml new file mode 100644 index 000000000..cf340891b --- /dev/null +++ b/pkgs/configparser.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:kmeli4bbxqrubfs4g4pq6bmmy2lrubcq + url: https://pypi.python.org/packages/7c/69/c2ce7e91c89dc073eb1aa74c0621c3eefbffe8216b3f9af9d3885265c01c/configparser-3.5.0.tar.gz diff --git a/pkgs/constantly.yaml b/pkgs/constantly.yaml new file mode 100644 index 000000000..b1345a145 --- /dev/null +++ b/pkgs/constantly.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:lbrxf24sawmhhyu6xjhz33edqfkbwtjy + url: https://pypi.python.org/packages/95/f1/207a0a478c4bb34b1b49d5915e2db574cadc415c9ac3a7ef17e29b2e8951/constantly-15.1.0.tar.gz diff --git a/pkgs/coverage.yaml b/pkgs/coverage.yaml index 50667b224..6326b0520 100644 --- a/pkgs/coverage.yaml +++ b/pkgs/coverage.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz - key: tar.gz:2gxkdrfkmg4dm3lkilotmudcf67zyy2o + - key: zip:uxo2gypzi7owpci7oorxh33dawophzkr + url: https://pypi.python.org/packages/f5/47/2e39972c41eb988d551bb2da25c4ee16ea78492ec1b6ffdf09f50cd09b92/coverage-4.2.zip diff --git a/pkgs/cryptography-vectors.yaml b/pkgs/cryptography-vectors.yaml index cc9fc6ae4..0f602127a 100644 --- a/pkgs/cryptography-vectors.yaml +++ b/pkgs/cryptography-vectors.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/c/cryptography-vectors/cryptography_vectors-0.5.2.tar.gz - key: tar.gz:eg5zt22n64eveviamrqefa3fmoxz6fci + - key: tar.gz:i7urw4f362cszolki6glofoksi2ol7ye + url: https://pypi.python.org/packages/f2/dc/4ca03da8950abcbd688b4cdef4b12d2c959c98d35fe173290f9f05d11e48/cryptography_vectors-1.7.1.tar.gz diff --git a/pkgs/cryptography.yaml b/pkgs/cryptography.yaml index aa505f015..5b19956dc 100644 --- a/pkgs/cryptography.yaml +++ b/pkgs/cryptography.yaml @@ -1,12 +1,12 @@ extends: [setuptools_package] dependencies: - build: [six, cffi, cryptography-vectors, openssl, pytest, pycparser] - run: [] + build: [six, cffi, cryptography-vectors, openssl, pytest, pycparser, libffi] + run: [libffi, enum34] sources: -- key: tar.gz:kz2zthzxitf4gktazmf3uzg6efafvphn - url: https://pypi.python.org/packages/source/c/cryptography/cryptography-0.5.4.tar.gz +- key: tar.gz:z6bn3lertnmh6xseer2xtnbtejgmfybt + url: https://pypi.python.org/packages/6c/c5/7fc1f8384443abd2d71631ead026eb59863a58cad0149b94b89f08c8002f/cryptography-1.5.3.tar.gz build_stages: - name: install @@ -14,4 +14,4 @@ build_stages: #when: platform == 'Darwin' handler: bash bash: | - env LDFLAGS="-L${OPENSSL_DIR}/lib -Wl,-rpath,${OPENSSL_DIR}/lib" CFLAGS="-I${OPENSSL_DIR}/include" ARCHFLAGS="-arch x86_64" $PYTHON setup.py install --prefix=${ARTIFACT} + env LDFLAGS="-L${LIBFFI_DIR}/lib -Wl,-rpath,${LIBFFI_DIR}/lib -L${OPENSSL_DIR}/lib -Wl,-rpath,${OPENSSL_DIR}/lib" CFLAGS="-I${OPENSSL_DIR}/include" ARCHFLAGS="-arch x86_64" $PYTHON setup.py install --prefix=${ARTIFACT} diff --git a/pkgs/cycler.yaml b/pkgs/cycler.yaml new file mode 100644 index 000000000..01063c8dc --- /dev/null +++ b/pkgs/cycler.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:zv5s2eayewgxer5hcqs6t4tempp3irgu + url: https://pypi.python.org/packages/c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488/cycler-0.10.0.tar.gz diff --git a/pkgs/cython.yaml b/pkgs/cython.yaml index a6f8b0ce3..a061c9843 100644 --- a/pkgs/cython.yaml +++ b/pkgs/cython.yaml @@ -1,9 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] -sources: -- key: tar.gz:qsai7wqakcdvpeuod7vnz5a4t54otknx - url: https://pypi.python.org/packages/c6/fe/97319581905de40f1be7015a0ea1bd336a756f6249914b148a17eefa75dc/Cython-0.24.1.tar.gz +dependencies: + build: [] + run: [] -when_build_dependency: - - prepend_path: PATH - value: '${ARTIFACT}/bin' +sources: + - key: tar.gz:6fa5d6ocpid3lkj7pxcthfdsaz7c24ka + url: https://pypi.python.org/packages/b7/67/7e2a817f9e9c773ee3995c1e15204f5d01c8da71882016cac10342ef031b/Cython-0.25.2.tar.gz diff --git a/pkgs/daetk/arch.darwin b/pkgs/daetk/arch.darwin index 9dfdc2739..4eaf67b03 100644 --- a/pkgs/daetk/arch.darwin +++ b/pkgs/daetk/arch.darwin @@ -7,7 +7,8 @@ ARCHIVE_SUFFIX = .dylib INCLUDES = -I${DAETK_DIR} -I${DAETK_DIR}/pete/pete-2.1.0/src -I${DAETK_DIR}/pdetk ${PETSC_INCLUDE} CXX = ${MPICXX} -CXXFLAGS = -DF77_POST_UNDERSCORE -DUSE_BLAS -DCMRVEC_BOUNDS_CHECK -DMV_VECTOR_BOUNDS_CHECK -DPETSCVEC_BOUNDS_CHECK ${PETSC_CCPPFLAGS} -DDAETK_DEF_CPLUSPLUS_FOR_PETSC_H -DMPICH_SKIP_MPICXX +CXXFLAGS = -DF77_POST_UNDERSCORE -DUSE_BLAS -DCMRVEC_BOUNDS_CHECK -DMV_VECTOR_BOUNDS_CHECK -DPETSCVEC_BOUNDS_CHECK ${PETSC_CCPPFLAGS} -DDAETK_DEF_CPLUSPLUS_FOR_PETSC_H -DMPICH_SKIP_MPICXX -DPETSC_SKIP_COMPLEX + CC = ${PCC} CCFLAGS = ${PETSC_CCPPFLAGS} diff --git a/pkgs/daetk/arch.linux b/pkgs/daetk/arch.linux index e3b7396e3..62d27b6fe 100644 --- a/pkgs/daetk/arch.linux +++ b/pkgs/daetk/arch.linux @@ -7,7 +7,7 @@ ARCHIVE_SUFFIX = .so INCLUDES = -I${DAETK_DIR} -I${DAETK_DIR}/pete/pete-2.1.0/src -I${DAETK_DIR}/pdetk ${PETSC_INCLUDE} CXX = ${MPICXX} -fPIC -CXXFLAGS = -DF77_POST_UNDERSCORE -DUSE_BLAS -DCMRVEC_BOUNDS_CHECK -DMV_VECTOR_BOUNDS_CHECK -DPETSCVEC_BOUNDS_CHECK ${PETSC_CCPPFLAGS} +CXXFLAGS = -DF77_POST_UNDERSCORE -DUSE_BLAS -DCMRVEC_BOUNDS_CHECK -DMV_VECTOR_BOUNDS_CHECK -DPETSCVEC_BOUNDS_CHECK -DDAETK_DEF_CPLUSPLUS_FOR_PETSC_H ${PETSC_CCPPFLAGS} CC = ${MPICC} -fPIC CCFLAGS = ${PETSC_CCPPFLAGS} diff --git a/pkgs/daetk/daetk.yaml b/pkgs/daetk/daetk.yaml index 3817d091c..16e3f0f7c 100644 --- a/pkgs/daetk/daetk.yaml +++ b/pkgs/daetk/daetk.yaml @@ -4,28 +4,41 @@ extends: [autotools_package] dependencies: build: [petsc, parmetis, mpi] -sources: -- url: https://github.com/erdc-cm/daetk.git - key: git:e05b9975a2d413148ce122a274be675b27f9450d +defaults: + petscversion: '3.7.5' + +when petscversion == '3.7.5': + sources: + - key: tar.gz:ggkr3upxu74syj5bq22fx4ha2ewzzyun + url: https://github.com/erdc-cm/daetk/archive/1.0.0.tar.gz +when petscversion == '3.6.1': + sources: + - url: https://github.com/erdc-cm/daetk.git + key: git:9c4107d441bc9a0e1d5a603f79874997062349e3 +when petscversion == '3.5.2': + sources: + - url: https://github.com/erdc-cm/daetk.git + key: git:e05b9975a2d413148ce122a274be675b27f9450d build_stages: - when: platform == 'Darwin' name: configure mode: replace - files: [arch.darwin, archive.darwin, sources.darwin] + files: [arch.darwin, archive.darwin, sources.darwin, remove_fortran_dependencies.patch] after: prologue handler: bash bash: | cp _hashdist/arch.darwin config/darwin cp _hashdist/archive.darwin config/darwin.archive cp _hashdist/sources.darwin config/darwin.sources + patch -p1 < _hashdist/remove_fortran_dependencies.patch export DAETK_DIR=`pwd` export DAETK_ARCH=darwin export PETSC_DIR=$PETSC_DIR export PETSC=$PETSC_DIR export MPI=$MPI_DIR touch dep.txt - + - when: machine == 'SGIICEX' name: configure mode: replace @@ -61,6 +74,24 @@ build_stages: export MPI=$MPI_DIR touch dep.txt +- when: machine == 'SGIICEX' + name: configure + mode: replace + files: [arch.linux, archive.linux, sources.linux] + after: prologue + handler: bash + bash: | + cp _hashdist/arch.linux config/linux + cp _hashdist/archive.linux config/linux.archive + cp _hashdist/sources.linux config/linux.sources + export DAETK_DIR=`pwd` + export DAETK_ARCH=linux + export PETSC_DIR=$PETSC_DIR + export PETSC=$PETSC_DIR + export MPI=$MPI_DIR + export MPIF77=mpif90 + touch dep.txt + - when: platform == 'Cygwin' name: configure mode: replace diff --git a/pkgs/daetk/remove_fortran_dependencies.patch b/pkgs/daetk/remove_fortran_dependencies.patch new file mode 100644 index 000000000..b0784d54a --- /dev/null +++ b/pkgs/daetk/remove_fortran_dependencies.patch @@ -0,0 +1,36 @@ +diff --git a/sources.h b/sources.h +index 7152d4c..765544e 100644 +--- a/sources.h ++++ b/sources.h +@@ -4,12 +4,12 @@ SRCS = AnalyticalJacobian.cpp CMRVecIndex.cpp Integrator.cpp Jacobian.cpp \ + VectorNorm.cpp DaeDefinition.cpp Chronograph.cpp DaspkPsol.cpp \ + FullDataFile.cpp LaFullCholeskySolver.cpp Vec.cpp BandColMat.cpp \ + DaspkRes.cpp FullDirectSolver.cpp LaFullDirectSolver.cpp \ +- mvm.cpp BiCGstab.cpp DASPK.cpp DataCollector.cpp \ +- GlobalDaeDef.cpp LiBandedDirectSolver.cpp PreCG.cpp \ ++ mvm.cpp BiCGstab.cpp DataCollector.cpp \ ++ GlobalDaeDef.cpp PreCG.cpp \ + WeightedRMSNorm.cpp mvv.cpp CMRVecBlasd.cpp DataFile.cpp \ + ParameterDatabase.cpp IntVec.cpp ModifiedNewton.cpp Newton.cpp \ + PTC.cpp PTCDAE.cpp CMRVecBlass.cpp DaspkJac.cpp FLCBDF.cpp \ +- LaBandedDirectSolver.cpp mvblas.cpp daux.f dlinpk.f ddaspk.f \ ++ LaBandedDirectSolver.cpp mvblas.cpp \ + VectorFunction.cpp DaetkPetscVec.cpp DaetkPetscSys.cpp \ + DaetkPetscVecBlas.cpp DaetkPetscMat.cpp \ + DaetkPetscLinearSolver.cpp DaetkPetscNumericalJacobian.cpp \ +@@ -22,12 +22,12 @@ OBJS = AnalyticalJacobian.o CMRVecIndex.o Integrator.o Jacobian.o \ + VectorNorm.o DaeDefinition.o Chronograph.o DaspkPsol.o \ + FullDataFile.o LaFullCholeskySolver.o Vec.o BandColMat.o \ + DaspkRes.o FullDirectSolver.o LaFullDirectSolver.o \ +- mvm.o BiCGstab.o DASPK.o DataCollector.o \ +- GlobalDaeDef.o LiBandedDirectSolver.o PreCG.o \ ++ mvm.o BiCGstab.o DataCollector.o \ ++ GlobalDaeDef.o PreCG.o \ + WeightedRMSNorm.o mvv.o CMRVecBlasd.o DataFile.o \ + ParameterDatabase.o IntVec.o ModifiedNewton.o Newton.o \ + PTC.o PTCDAE.o CMRVecBlass.o DaspkJac.o FLCBDF.o \ +- LaBandedDirectSolver.o mvblas.o daux.o dlinpk.o ddaspk.o \ ++ LaBandedDirectSolver.o mvblas.o \ + VectorFunction.o DaetkPetscVec.o DaetkPetscSys.o \ + DaetkPetscVecBlas.o DaetkPetscMat.o \ + DaetkPetscLinearSolver.o DaetkPetscNumericalJacobian.o \ diff --git a/pkgs/decorator.yaml b/pkgs/decorator.yaml index 1cfec2293..96284f4d3 100644 --- a/pkgs/decorator.yaml +++ b/pkgs/decorator.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:llimcd5ngfsiz75bl3qgidxoas53docd - url: https://pypi.python.org/packages/source/d/decorator/decorator-4.0.4.tar.gz + - key: tar.gz:trxjr3olgnezranyn3papwmwrsa2w7dw + url: https://pypi.python.org/packages/13/8a/4eed41e338e8dcc13ca41c94b142d4d20c0de684ee5065523fee406ce76f/decorator-4.0.10.tar.gz diff --git a/pkgs/docutils.yaml b/pkgs/docutils.yaml index daa6ff223..ff0072c5a 100644 --- a/pkgs/docutils.yaml +++ b/pkgs/docutils.yaml @@ -1,5 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + +dependencies: + build: [] + run: [] sources: - - url: https://pypi.python.org/packages/source/d/docutils/docutils-0.10.tar.gz - key: tar.gz:g4dcjzq3m5z5ulzpwf6mfjhk5jf3lfwd + - key: tar.gz:ogga6x5wo67a6nfxqhqeeqoeaz6l3ezh + url: https://pypi.python.org/packages/05/25/7b5484aca5d46915493f1fd4ecb63c38c333bd32aa9ad6e19da8d08895ae/docutils-0.13.1.tar.gz diff --git a/pkgs/doxygen/doxygen.yaml b/pkgs/doxygen/doxygen.yaml index d28b60ab4..ee058e5d3 100644 --- a/pkgs/doxygen/doxygen.yaml +++ b/pkgs/doxygen/doxygen.yaml @@ -4,14 +4,14 @@ dependencies: build: [bison, flex] sources: -- key: git:b00761b30a1d399f95adfe823937c05a64476155 - url: https://github.com/doxygen/doxygen +- key: tar.gz:chw522awd5akqmsoig2jnhncxz67neew + url: https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz -build_stages: - - when: platform == 'Darwin' - name: patch - before: configure - files: [libiconv_plug.patch] - handler: bash - bash: | - patch -up1 < _hashdist/libiconv_plug.patch +#build_stages: +# - when: platform == 'Darwin' +# name: patch +# before: configure +# files: [libiconv_plug.patch] +# handler: bash +# bash: | +# patch -up1 < _hashdist/libiconv_plug.patch diff --git a/pkgs/enum34.yaml b/pkgs/enum34.yaml new file mode 100644 index 000000000..14d4d0579 --- /dev/null +++ b/pkgs/enum34.yaml @@ -0,0 +1,9 @@ +extends: [namespace_package] + +dependencies: + build: [] + run: [] + +sources: + - key: zip:fwa4xpqoomisxx7g56cxn4rdr4v2e7oq + url: https://pypi.python.org/packages/e8/26/a6101edcf724453845c850281b96b89a10dac6bd98edebc82634fccce6a5/enum34-1.1.6.zip diff --git a/pkgs/execnet.yaml b/pkgs/execnet.yaml new file mode 100644 index 000000000..343c4da87 --- /dev/null +++ b/pkgs/execnet.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:6zw5jj2rs4s2dn7bjlm247j57dqjwlni + url: https://pypi.python.org/packages/eb/ee/43729e7dee8772e69b3b01715ab9742790be2eace2d18cf53d219b9c31f8/execnet-1.4.1.tar.gz diff --git a/pkgs/fastcache.yaml b/pkgs/fastcache.yaml index 32454d48a..361c4dfd1 100644 --- a/pkgs/fastcache.yaml +++ b/pkgs/fastcache.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: - key: tar.gz:qzyak52jc74ztbkp7uyd7prxspbqyloj - url: https://pypi.python.org/packages/source/f/fastcache/fastcache-1.0.2.tar.gz + url: https://pypi.python.org/packages/fb/98/93f2d36738868e8dd5a8dbfc918169b24658f63e5fa041fe000c22ae4f8b/fastcache-1.0.2.tar.gz diff --git a/pkgs/folium-drawpath.yaml b/pkgs/folium-drawpath.yaml new file mode 100644 index 000000000..3f23b3b1d --- /dev/null +++ b/pkgs/folium-drawpath.yaml @@ -0,0 +1,9 @@ +extends: [distutils_package] + +dependencies: + build: [] + run: [pandas, numpy] + +sources: + - url: https://github.com/ahmadia/folium.git + key: git:19972e838d1fac428e63d0645122a550d53a340a diff --git a/pkgs/folium.yaml b/pkgs/folium.yaml index 4f4811c89..a7f786f69 100644 --- a/pkgs/folium.yaml +++ b/pkgs/folium.yaml @@ -5,5 +5,5 @@ dependencies: run: [pandas, numpy] sources: - - url: https://pypi.python.org/packages/source/f/folium/folium-0.1.2.tar.gz - key: tar.gz:itakflkweus6v3dqrjztbjbu34dgkedh + - url: https://github.com/wrobstory/folium + key: git:cc4453fb2642aa62508e02114585efb701be9d2e diff --git a/pkgs/funcsigs.yaml b/pkgs/funcsigs.yaml new file mode 100644 index 000000000..23fbc798b --- /dev/null +++ b/pkgs/funcsigs.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:u65q6lhtup6rvmttfs2j5oscklbk6qsa + url: https://pypi.python.org/packages/94/4a/db842e7a0545de1cdb0439bb80e6e42dfe82aaeaadd4072f2263a4fbed23/funcsigs-1.0.2.tar.gz diff --git a/pkgs/functools32.yaml b/pkgs/functools32.yaml index 39aab5f9a..634aac894 100644 --- a/pkgs/functools32.yaml +++ b/pkgs/functools32.yaml @@ -6,4 +6,4 @@ dependencies: sources: - key: zip:rhmcjktmgwgeegrdjv7z5yf5owjtuz6c - url: https://pypi.python.org/packages/source/f/functools32/functools32-3.2.3-2.zip + url: https://pypi.python.org/packages/5e/1a/0aa2c8195a204a9f51284018562dea77e25511f02fe924fac202fc012172/functools32-3.2.3-2.zip diff --git a/pkgs/functools_lru_cache.yaml b/pkgs/functools_lru_cache.yaml new file mode 100644 index 000000000..bdad18e53 --- /dev/null +++ b/pkgs/functools_lru_cache.yaml @@ -0,0 +1,5 @@ +extends: [setuptools_package] + +sources: + - key: tar.gz:twmgs7yir2y3b6sfcoi7sgx3ly7l3yll + url: https://pypi.python.org/packages/57/d4/156eb5fbb08d2e85ab0a632e2bebdad355798dece07d4752f66a8d02d1ea/backports.functools_lru_cache-1.5.tar.gz diff --git a/pkgs/future.yaml b/pkgs/future.yaml new file mode 100644 index 000000000..61db31b0c --- /dev/null +++ b/pkgs/future.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:4ooo2gvxm62zgzsgz3n2rpgolarzqiz5 + url: https://pypi.python.org/packages/00/2b/8d082ddfed935f3608cc61140df6dcbf0edea1bc3ab52fb6c29ae3e81e85/future-0.16.0.tar.gz diff --git a/pkgs/futures.yaml b/pkgs/futures.yaml new file mode 100644 index 000000000..8e89f9d45 --- /dev/null +++ b/pkgs/futures.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:avbfeukf2wx4tbgir6iuudefy52sp5sz + url: https://pypi.python.org/packages/55/db/97c1ca37edab586a1ae03d6892b6633d8eaa23b23ac40c7e5bbc55423c78/futures-3.0.5.tar.gz diff --git a/pkgs/geojson.yaml b/pkgs/geojson.yaml index ef2e6e786..feceae1a3 100644 --- a/pkgs/geojson.yaml +++ b/pkgs/geojson.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: - - url: https://github.com/frewsxcv/python-geojson/archive/1.0.7.tar.gz - key: tar.gz:tatursbtdhyhyix6xnxsjfnx45gs7wrz + - key: tar.gz:s4uu56lz7rateadtar7d7xplnpayveae + url: https://pypi.python.org/packages/56/2d/44abe5d3fda94b524e93a8e0f8c83d1e890a9e97e3791f40483a28ccb971/geojson-1.3.3.tar.gz diff --git a/pkgs/geos.yaml b/pkgs/geos.yaml index e41b26ef6..c8cd42c56 100644 --- a/pkgs/geos.yaml +++ b/pkgs/geos.yaml @@ -1,9 +1,10 @@ extends: [autotools_package] sources: - - url: http://download.osgeo.org/geos/geos-3.4.2.tar.bz2 - key: tar.bz2:cxul7x36feehvfl3k2wfipvjvabscsa4 +- key: tar.bz2:d7twitzsideeekybiobq74kc4rhiwajt + url: http://download.osgeo.org/geos/geos-3.6.0.tar.bz2 when_build_dependency: - prepend_path: PATH value: '${ARTIFACT}/bin' + - {set: 'GEOS_CONFIG', value: '${ARTIFACT}/bin/geos-config'} \ No newline at end of file diff --git a/pkgs/gmsh.yaml b/pkgs/gmsh.yaml new file mode 100644 index 000000000..db073becd --- /dev/null +++ b/pkgs/gmsh.yaml @@ -0,0 +1,21 @@ +extends: [cmake_package] + +sources: +- key: tar.gz:ydm74ehv6znhwwrwjt43tqya6qxln4wc + url: http://gmsh.info/src/gmsh-3.0.2-source.tgz + +defaults: + relocatable: false + +dependencies: + build: [swig, python, numpy, mpi, petsc, petsc4py, tetgen, lapack, blas, parmetis, hdf5] + run: [swig, python, numpy, mpi, petsc, petsc4py, tetgen, lapack, blas, parmetis, hdf5] + +build_stages: +- name: configure + extra: + - '-DENABLE_PETSC:BOOL=ON' + - '-DENABLE_PETSC4PY:BOOL=ON' + - '-DENABLE_FLTK:BOOL=OFF' + - '-DENABLE_BUILD_SHARED:BOOL=ON' + - '-DENABLE_WRAP_PYTHON:BOOL=ON' diff --git a/pkgs/grib_api.yaml b/pkgs/grib_api.yaml index 3b5ec924c..8dc4a79c1 100644 --- a/pkgs/grib_api.yaml +++ b/pkgs/grib_api.yaml @@ -1,16 +1,17 @@ extends: [autotools_package] dependencies: - build: [jasper, openjpeg] + build: [jasper, netcdf4] defaults: relocatable: false sources: -- key: tar.gz:fvfqkqzmtao4yk2zmb6vb3vscsx63q4u - url: https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.12.3.tar.gz +- key: tar.gz:uqvzwc6wxurwjcl4cp7k7ue23otkklqf + url: https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-1.14.7-Source.tar.gz build_stages: - name: configure mode: override - extra: ['--with-jasper=${JASPER_DIR}'] + extra: ['--with-jasper=${JASPER_DIR}', + '--with-netcdf=${NETCDF4_DIR}'] diff --git a/pkgs/h5py.yaml b/pkgs/h5py.yaml index 56171e159..2a47420b6 100644 --- a/pkgs/h5py.yaml +++ b/pkgs/h5py.yaml @@ -1,16 +1,19 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: - build: [hdf5, mpi4py, mpi, numpy, cython] - run: [numpy] + build: [hdf5, mpi4py, mpi, numpy, cython, pkgconfig, six] + run: [numpy, mpi4py] sources: -- key: tar.gz:ir7flvmjhsriluiylkjyksfbf47x2sxu - url: https://pypi.python.org/packages/source/h/h5py/h5py-2.3.1.tar.gz +- key: tar.gz:dafgrayr5atp62xg2o62tnocsk4qwkdy + url: https://pypi.python.org/packages/41/7a/6048de44c62fc5e618178ef9888850c3773a9e4be249e5e673ebce0402ff/h5py-2.7.1.tar.gz build_stages: -- name: install - after: setup_dirs +- name: build_ext_options + mode: replace + before: install handler: bash bash: | - CC=${MPICC} ${PYTHON} setup.py install --mpi --prefix=${ARTIFACT} + export HDF5_VERSION='1.8.19' + export CC=${MPICC} + export SETUPTOOLS_PACKAGE_EXTRA_OPTIONS="configure --mpi" diff --git a/pkgs/hdf5/hdf5-1.8.11_broken_test_builds.patch b/pkgs/hdf5/hdf5-1.8.11_broken_test_builds.patch deleted file mode 100644 index 3d1a0ff6d..000000000 --- a/pkgs/hdf5/hdf5-1.8.11_broken_test_builds.patch +++ /dev/null @@ -1,351 +0,0 @@ -diff --unified -r hdf5-1.8.11/test/Makefile.in hdf5-1.8.11_fix_test_builds/test/Makefile.in ---- hdf5-1.8.11/test/Makefile.in 2013-05-08 02:35:29.000000000 -0400 -+++ hdf5-1.8.11_fix_test_builds/test/Makefile.in 2014-02-03 15:34:11.000000000 -0500 -@@ -177,254 +177,317 @@ - accum_SOURCES = accum.c - accum_OBJECTS = accum.$(OBJEXT) - accum_LDADD = $(LDADD) -+accum_LDFLAGS = -static - accum_DEPENDENCIES = libh5test.la $(LIBHDF5) - app_ref_SOURCES = app_ref.c - app_ref_OBJECTS = app_ref.$(OBJEXT) - app_ref_LDADD = $(LDADD) -+app_ref_LDFLAGS = -static - app_ref_DEPENDENCIES = libh5test.la $(LIBHDF5) - big_SOURCES = big.c - big_OBJECTS = big.$(OBJEXT) - big_LDADD = $(LDADD) -+big_LDFLAGS = -static - big_DEPENDENCIES = libh5test.la $(LIBHDF5) - bittests_SOURCES = bittests.c - bittests_OBJECTS = bittests.$(OBJEXT) - bittests_LDADD = $(LDADD) -+bittests_LDFLAGS = -static - bittests_DEPENDENCIES = libh5test.la $(LIBHDF5) - btree2_SOURCES = btree2.c - btree2_OBJECTS = btree2.$(OBJEXT) - btree2_LDADD = $(LDADD) -+btree2_LDFLAGS = -static - btree2_DEPENDENCIES = libh5test.la $(LIBHDF5) - cache_SOURCES = cache.c - cache_OBJECTS = cache.$(OBJEXT) - cache_LDADD = $(LDADD) -+cache_LDFLAGS = -static - cache_DEPENDENCIES = libh5test.la $(LIBHDF5) - cache_api_SOURCES = cache_api.c - cache_api_OBJECTS = cache_api.$(OBJEXT) - cache_api_LDADD = $(LDADD) -+cache_api_LDFLAGS = -static - cache_api_DEPENDENCIES = libh5test.la $(LIBHDF5) - cmpd_dset_SOURCES = cmpd_dset.c - cmpd_dset_OBJECTS = cmpd_dset.$(OBJEXT) - cmpd_dset_LDADD = $(LDADD) -+cmpd_dset_LDFLAGS = -static - cmpd_dset_DEPENDENCIES = libh5test.la $(LIBHDF5) - cross_read_SOURCES = cross_read.c - cross_read_OBJECTS = cross_read.$(OBJEXT) - cross_read_LDADD = $(LDADD) -+cross_read_LDFLAGS = -static - cross_read_DEPENDENCIES = libh5test.la $(LIBHDF5) - dangle_SOURCES = dangle.c - dangle_OBJECTS = dangle.$(OBJEXT) - dangle_LDADD = $(LDADD) -+dangle_LDFLAGS = -static - dangle_DEPENDENCIES = libh5test.la $(LIBHDF5) - dsets_SOURCES = dsets.c - dsets_OBJECTS = dsets.$(OBJEXT) - dsets_LDADD = $(LDADD) -+dsets_LDFLAGS = -static - dsets_DEPENDENCIES = libh5test.la $(LIBHDF5) - dt_arith_SOURCES = dt_arith.c - dt_arith_OBJECTS = dt_arith.$(OBJEXT) - dt_arith_LDADD = $(LDADD) -+dt_arith_LDFLAGS = -static - dt_arith_DEPENDENCIES = libh5test.la $(LIBHDF5) - dtransform_SOURCES = dtransform.c - dtransform_OBJECTS = dtransform.$(OBJEXT) - dtransform_LDADD = $(LDADD) -+dtransform_LDFLAGS = -static - dtransform_DEPENDENCIES = libh5test.la $(LIBHDF5) - dtypes_SOURCES = dtypes.c - dtypes_OBJECTS = dtypes.$(OBJEXT) - dtypes_LDADD = $(LDADD) -+dtypes_LDFLAGS = -static - dtypes_DEPENDENCIES = libh5test.la $(LIBHDF5) - efc_SOURCES = efc.c - efc_OBJECTS = efc.$(OBJEXT) - efc_LDADD = $(LDADD) -+efc_LDFLAGS = -static - efc_DEPENDENCIES = libh5test.la $(LIBHDF5) - enum_SOURCES = enum.c - enum_OBJECTS = enum.$(OBJEXT) - enum_LDADD = $(LDADD) -+enum_LDFLAGS = -static - enum_DEPENDENCIES = libh5test.la $(LIBHDF5) - err_compat_SOURCES = err_compat.c - err_compat_OBJECTS = err_compat.$(OBJEXT) - err_compat_LDADD = $(LDADD) -+err_compat_LDFLAGS = -static - err_compat_DEPENDENCIES = libh5test.la $(LIBHDF5) - error_test_SOURCES = error_test.c - error_test_OBJECTS = error_test.$(OBJEXT) - error_test_LDADD = $(LDADD) -+error_test_LDFLAGS = -static - error_test_DEPENDENCIES = libh5test.la $(LIBHDF5) - extend_SOURCES = extend.c - extend_OBJECTS = extend.$(OBJEXT) - extend_LDADD = $(LDADD) -+extend_LDFLAGS = -static - extend_DEPENDENCIES = libh5test.la $(LIBHDF5) - external_SOURCES = external.c - external_OBJECTS = external.$(OBJEXT) - external_LDADD = $(LDADD) -+external_LDFLAGS = -static - external_DEPENDENCIES = libh5test.la $(LIBHDF5) - fheap_SOURCES = fheap.c - fheap_OBJECTS = fheap.$(OBJEXT) - fheap_LDADD = $(LDADD) -+fheap_LDFLAGS = -static - fheap_DEPENDENCIES = libh5test.la $(LIBHDF5) - file_image_SOURCES = file_image.c - file_image_OBJECTS = file_image.$(OBJEXT) - file_image_LDADD = $(LDADD) -+file_image_LDFLAGS = -static - file_image_DEPENDENCIES = libh5test.la $(LIBHDF5) - fillval_SOURCES = fillval.c - fillval_OBJECTS = fillval.$(OBJEXT) - fillval_LDADD = $(LDADD) -+fillval_LDFLAGS = -static - fillval_DEPENDENCIES = libh5test.la $(LIBHDF5) - filter_fail_SOURCES = filter_fail.c - filter_fail_OBJECTS = filter_fail.$(OBJEXT) - filter_fail_LDADD = $(LDADD) -+filter_fail_LDFLAGS = -static - filter_fail_DEPENDENCIES = libh5test.la $(LIBHDF5) - flush1_SOURCES = flush1.c - flush1_OBJECTS = flush1.$(OBJEXT) - flush1_LDADD = $(LDADD) -+flush1_LDFLAGS = -static - flush1_DEPENDENCIES = libh5test.la $(LIBHDF5) - flush2_SOURCES = flush2.c - flush2_OBJECTS = flush2.$(OBJEXT) - flush2_LDADD = $(LDADD) -+flush2_LDFLAGS = -static - flush2_DEPENDENCIES = libh5test.la $(LIBHDF5) - freespace_SOURCES = freespace.c - freespace_OBJECTS = freespace.$(OBJEXT) - freespace_LDADD = $(LDADD) -+freespace_LDFLAGS = -static - freespace_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_bad_ohdr_SOURCES = gen_bad_ohdr.c - gen_bad_ohdr_OBJECTS = gen_bad_ohdr.$(OBJEXT) - gen_bad_ohdr_LDADD = $(LDADD) -+gen_bad_ohdr_LDFLAGS = -static - gen_bad_ohdr_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_bogus_SOURCES = gen_bogus.c - gen_bogus_OBJECTS = gen_bogus.$(OBJEXT) - gen_bogus_LDADD = $(LDADD) -+gen_bogus_LDFLAGS = -static - gen_bogus_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_cross_SOURCES = gen_cross.c - gen_cross_OBJECTS = gen_cross.$(OBJEXT) - gen_cross_LDADD = $(LDADD) -+gen_cross_LDFLAGS = -static - gen_cross_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_deflate_SOURCES = gen_deflate.c - gen_deflate_OBJECTS = gen_deflate.$(OBJEXT) - gen_deflate_LDADD = $(LDADD) -+gen_deflate_LDFLAGS = -static - gen_deflate_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_file_image_SOURCES = gen_file_image.c - gen_file_image_OBJECTS = gen_file_image.$(OBJEXT) - gen_file_image_LDADD = $(LDADD) -+gen_file_image_LDFLAGS = -static - gen_file_image_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_filters_SOURCES = gen_filters.c - gen_filters_OBJECTS = gen_filters.$(OBJEXT) - gen_filters_LDADD = $(LDADD) -+gen_filters_LDFLAGS = -static - gen_filters_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_idx_SOURCES = gen_idx.c - gen_idx_OBJECTS = gen_idx.$(OBJEXT) - gen_idx_LDADD = $(LDADD) -+gen_idx_LDFLAGS = -static - gen_idx_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_new_array_SOURCES = gen_new_array.c - gen_new_array_OBJECTS = gen_new_array.$(OBJEXT) - gen_new_array_LDADD = $(LDADD) -+gen_new_array_LDFLAGS = -static - gen_new_array_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_new_fill_SOURCES = gen_new_fill.c - gen_new_fill_OBJECTS = gen_new_fill.$(OBJEXT) - gen_new_fill_LDADD = $(LDADD) -+gen_new_fill_LDFLAGS = -static - gen_new_fill_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_new_group_SOURCES = gen_new_group.c - gen_new_group_OBJECTS = gen_new_group.$(OBJEXT) - gen_new_group_LDADD = $(LDADD) -+gen_new_group_LDFLAGS = -static - gen_new_group_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_new_mtime_SOURCES = gen_new_mtime.c - gen_new_mtime_OBJECTS = gen_new_mtime.$(OBJEXT) - gen_new_mtime_LDADD = $(LDADD) -+gen_new_mtime_LDFLAGS = -static - gen_new_mtime_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_new_super_SOURCES = gen_new_super.c - gen_new_super_OBJECTS = gen_new_super.$(OBJEXT) - gen_new_super_LDADD = $(LDADD) -+gen_new_super_LDFLAGS = -static - gen_new_super_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_noencoder_SOURCES = gen_noencoder.c - gen_noencoder_OBJECTS = gen_noencoder.$(OBJEXT) - gen_noencoder_LDADD = $(LDADD) -+gen_noencoder_LDFLAGS = -static - gen_noencoder_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_nullspace_SOURCES = gen_nullspace.c - gen_nullspace_OBJECTS = gen_nullspace.$(OBJEXT) - gen_nullspace_LDADD = $(LDADD) -+gen_nullspace_LDFLAGS = -static - gen_nullspace_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_sizes_lheap_SOURCES = gen_sizes_lheap.c - gen_sizes_lheap_OBJECTS = gen_sizes_lheap.$(OBJEXT) - gen_sizes_lheap_LDADD = $(LDADD) -+gen_sizes_lheap_LDFLAGS = -static - gen_sizes_lheap_DEPENDENCIES = libh5test.la $(LIBHDF5) - gen_udlinks_SOURCES = gen_udlinks.c - gen_udlinks_OBJECTS = gen_udlinks.$(OBJEXT) - gen_udlinks_LDADD = $(LDADD) -+gen_udlinks_LDFLAGS = -static - gen_udlinks_DEPENDENCIES = libh5test.la $(LIBHDF5) - getname_SOURCES = getname.c - getname_OBJECTS = getname.$(OBJEXT) - getname_LDADD = $(LDADD) -+getname_LDFLAGS = -static - getname_DEPENDENCIES = libh5test.la $(LIBHDF5) - gheap_SOURCES = gheap.c - gheap_OBJECTS = gheap.$(OBJEXT) - gheap_LDADD = $(LDADD) -+gheap_LDFLAGS = -static - gheap_DEPENDENCIES = libh5test.la $(LIBHDF5) - hyperslab_SOURCES = hyperslab.c - hyperslab_OBJECTS = hyperslab.$(OBJEXT) - hyperslab_LDADD = $(LDADD) -+hyperslab_LDFLAGS = -static - hyperslab_DEPENDENCIES = libh5test.la $(LIBHDF5) - istore_SOURCES = istore.c - istore_OBJECTS = istore.$(OBJEXT) - istore_LDADD = $(LDADD) -+istore_LDFLAGS = -static - istore_DEPENDENCIES = libh5test.la $(LIBHDF5) - lheap_SOURCES = lheap.c - lheap_OBJECTS = lheap.$(OBJEXT) - lheap_LDADD = $(LDADD) -+lheap_LDFLAGS = -static - lheap_DEPENDENCIES = libh5test.la $(LIBHDF5) - links_SOURCES = links.c - links_OBJECTS = links.$(OBJEXT) - links_LDADD = $(LDADD) -+links_LDFLAGS = -static - links_DEPENDENCIES = libh5test.la $(LIBHDF5) - links_env_SOURCES = links_env.c - links_env_OBJECTS = links_env.$(OBJEXT) - links_env_LDADD = $(LDADD) -+links_env_LDFLAGS = -static - links_env_DEPENDENCIES = libh5test.la $(LIBHDF5) - mf_SOURCES = mf.c - mf_OBJECTS = mf.$(OBJEXT) - mf_LDADD = $(LDADD) -+mf_LDFLAGS = -static - mf_DEPENDENCIES = libh5test.la $(LIBHDF5) - mount_SOURCES = mount.c - mount_OBJECTS = mount.$(OBJEXT) - mount_LDADD = $(LDADD) -+mount_LDFLAGS = -static - mount_DEPENDENCIES = libh5test.la $(LIBHDF5) - mtime_SOURCES = mtime.c - mtime_OBJECTS = mtime.$(OBJEXT) - mtime_LDADD = $(LDADD) -+mtime_LDFLAGS = -static - mtime_DEPENDENCIES = libh5test.la $(LIBHDF5) - ntypes_SOURCES = ntypes.c - ntypes_OBJECTS = ntypes.$(OBJEXT) - ntypes_LDADD = $(LDADD) -+ntypes_LDFLAGS = -static - ntypes_DEPENDENCIES = libh5test.la $(LIBHDF5) - objcopy_SOURCES = objcopy.c - objcopy_OBJECTS = objcopy.$(OBJEXT) - objcopy_LDADD = $(LDADD) -+objcopy_LDFLAGS = -static - objcopy_DEPENDENCIES = libh5test.la $(LIBHDF5) - ohdr_SOURCES = ohdr.c - ohdr_OBJECTS = ohdr.$(OBJEXT) - ohdr_LDADD = $(LDADD) -+ohdr_LDFLAGS = -static - ohdr_DEPENDENCIES = libh5test.la $(LIBHDF5) - plugin_SOURCES = plugin.c - plugin_OBJECTS = plugin.$(OBJEXT) - plugin_LDADD = $(LDADD) -+plugin_LDFLAGS = -static - plugin_DEPENDENCIES = libh5test.la $(LIBHDF5) - pool_SOURCES = pool.c - pool_OBJECTS = pool.$(OBJEXT) - pool_LDADD = $(LDADD) -+pool_LDFLAGS = -static - pool_DEPENDENCIES = libh5test.la $(LIBHDF5) - reserved_SOURCES = reserved.c - reserved_OBJECTS = reserved.$(OBJEXT) - reserved_LDADD = $(LDADD) -+reserved_LDFLAGS = -static - reserved_DEPENDENCIES = libh5test.la $(LIBHDF5) - set_extent_SOURCES = set_extent.c - set_extent_OBJECTS = set_extent.$(OBJEXT) - set_extent_LDADD = $(LDADD) -+set_extent_LDFLAGS = -static - set_extent_DEPENDENCIES = libh5test.la $(LIBHDF5) - space_overflow_SOURCES = space_overflow.c - space_overflow_OBJECTS = space_overflow.$(OBJEXT) - space_overflow_LDADD = $(LDADD) -+space_overflow_LDFLAGS = -static - space_overflow_DEPENDENCIES = libh5test.la $(LIBHDF5) - stab_SOURCES = stab.c - stab_OBJECTS = stab.$(OBJEXT) - stab_LDADD = $(LDADD) -+stab_LDFLAGS = -static - stab_DEPENDENCIES = libh5test.la $(LIBHDF5) - tcheck_version_SOURCES = tcheck_version.c - tcheck_version_OBJECTS = tcheck_version.$(OBJEXT) - tcheck_version_LDADD = $(LDADD) -+tcheck_version_LDFLAGS = -static - tcheck_version_DEPENDENCIES = libh5test.la $(LIBHDF5) - am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \ - tattr.$(OBJEXT) tchecksum.$(OBJEXT) tconfig.$(OBJEXT) \ -@@ -437,24 +500,29 @@ - tvltypes.$(OBJEXT) - testhdf5_OBJECTS = $(am_testhdf5_OBJECTS) - testhdf5_LDADD = $(LDADD) -+testhdf5_LDFLAGS = -static - testhdf5_DEPENDENCIES = libh5test.la $(LIBHDF5) - testmeta_SOURCES = testmeta.c - testmeta_OBJECTS = testmeta.$(OBJEXT) - testmeta_LDADD = $(LDADD) -+testmeta_LDFLAGS = -static - testmeta_DEPENDENCIES = libh5test.la $(LIBHDF5) - am_ttsafe_OBJECTS = ttsafe.$(OBJEXT) ttsafe_dcreate.$(OBJEXT) \ - ttsafe_error.$(OBJEXT) ttsafe_cancel.$(OBJEXT) \ - ttsafe_acreate.$(OBJEXT) - ttsafe_OBJECTS = $(am_ttsafe_OBJECTS) - ttsafe_LDADD = $(LDADD) -+ttsafe_LDFLAGS = -static - ttsafe_DEPENDENCIES = libh5test.la $(LIBHDF5) - unlink_SOURCES = unlink.c - unlink_OBJECTS = unlink.$(OBJEXT) - unlink_LDADD = $(LDADD) -+unlink_LDFLAGS = -static - unlink_DEPENDENCIES = libh5test.la $(LIBHDF5) - vfd_SOURCES = vfd.c - vfd_OBJECTS = vfd.$(OBJEXT) - vfd_LDADD = $(LDADD) -+vfd_LDFLAGS = -static - vfd_DEPENDENCIES = libh5test.la $(LIBHDF5) - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) diff --git a/pkgs/hdf5/hdf5.yaml b/pkgs/hdf5/hdf5.yaml index a9d97475f..77a9d8d35 100644 --- a/pkgs/hdf5/hdf5.yaml +++ b/pkgs/hdf5/hdf5.yaml @@ -3,8 +3,8 @@ dependencies: build: [mpi, zlib, szip] sources: -- key: tar.bz2:yl22ieqqpk5g7gp5pjfj3nwol5p4qfy6 - url: http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.13/src/hdf5-1.8.13.tar.bz2 +- key: tar.gz:uqzvqsprt6xirqte7ug7arv4ginhrrjw + url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.19/src/hdf5-1.8.19.tar.gz defaults: # /bin/h5pcc contains hard-coded path @@ -24,8 +24,8 @@ build_stages: after: configure before: make bash: | - for f in {test,testpar,tools/*,perform,hl/*,hl/*/*}/Makefile - do + for f in {test,testpar,tools/*,perform,hl/*,hl/*/*}/Makefile + do sed -i 's/CCLD = $(CC)/CCLD = $(CC) -static/g' $f done diff --git a/pkgs/host-functools.yaml b/pkgs/host-functools.yaml new file mode 100644 index 000000000..7393088d6 --- /dev/null +++ b/pkgs/host-functools.yaml @@ -0,0 +1 @@ +extends: [host_package] diff --git a/pkgs/host-jasper.yaml b/pkgs/host-jasper.yaml new file mode 100755 index 000000000..a11cf1733 --- /dev/null +++ b/pkgs/host-jasper.yaml @@ -0,0 +1,2 @@ +when_build_dependency: + - {set: 'JASPER_DIR', value: '{{HOST_JASPER_DIR}}'} \ No newline at end of file diff --git a/pkgs/host-mkl-blas.yaml b/pkgs/host-mkl-blas.yaml new file mode 100644 index 000000000..8ba0c30ae --- /dev/null +++ b/pkgs/host-mkl-blas.yaml @@ -0,0 +1,2 @@ +when_build_dependency: + - {set: 'BLAS_LDFLAGS', value: '-lmkl_rt'} diff --git a/pkgs/host-mkl-lapack.yaml b/pkgs/host-mkl-lapack.yaml new file mode 100644 index 000000000..73e16a09f --- /dev/null +++ b/pkgs/host-mkl-lapack.yaml @@ -0,0 +1,2 @@ +when_build_dependency: + - {set: 'LAPACK_LDFLAGS', value: '-lmkl_rt'} \ No newline at end of file diff --git a/pkgs/host-mpi.yaml b/pkgs/host-mpi.yaml index 1f983eb55..cc678c707 100644 --- a/pkgs/host-mpi.yaml +++ b/pkgs/host-mpi.yaml @@ -1,6 +1,9 @@ when_build_dependency: + - {set: 'MPI_ROOT', value: '{{HOST_MPI_DIR}}'} - {set: 'MPICC', value: '{{HOST_MPICC}}'} - {set: 'MPICXX', value: '{{HOST_MPICXX}}'} - {set: 'MPIF77', value: '{{HOST_MPIF77}}'} - {set: 'MPIF90', value: '{{HOST_MPIF90}}'} - {set: 'MPIEXEC', value: '{{HOST_MPIEXEC}}'} + - prepend_path: LD_LIBRARY_PATH + value: ${MPI_ROOT}/lib diff --git a/pkgs/host-openblas-blas.yaml b/pkgs/host-openblas-blas.yaml new file mode 100644 index 000000000..3a845f318 --- /dev/null +++ b/pkgs/host-openblas-blas.yaml @@ -0,0 +1,2 @@ +when_build_dependency: + - {set: 'BLAS_LDFLAGS', value: '-lopenblas'} \ No newline at end of file diff --git a/pkgs/host-openblas-lapack.yaml b/pkgs/host-openblas-lapack.yaml new file mode 100644 index 000000000..f7c50dc43 --- /dev/null +++ b/pkgs/host-openblas-lapack.yaml @@ -0,0 +1,2 @@ +when_build_dependency: + - {set: 'LAPACK_LDFLAGS', value: '-lopenblas'} \ No newline at end of file diff --git a/pkgs/html5lib.yaml b/pkgs/html5lib.yaml new file mode 100644 index 000000000..fd011db5d --- /dev/null +++ b/pkgs/html5lib.yaml @@ -0,0 +1,15 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: +- key: tar.gz:eyjkdeni2wccx6qfpza3uuf3xholoisb + url: https://pypi.python.org/packages/ae/ae/bcb60402c60932b32dfaf19bb53870b29eda2cd17551ba5639219fb5ebf9/html5lib-0.9999999.tar.gz +#sources: +#- key: tar.gz:5z2hyd75gaune4ramgjwwxdf5zh6cpeo +# url: https://pypi.python.org/packages/17/ee/99e69cdcefc354e0c18ff2cc60aeeb5bfcc2e33f051bf0cc5526d790c445/html5lib-0.999999999.tar.gz +#sources: +# - key: tar.gz:bvp5ktk3fn43q5qapjymam5eai2xo5un +# url: https://pypi.python.org/packages/97/16/982214624095c1420c75f3bd295d9e658794aafb95fc075823de107e0ae4/html5lib-1.0b10.tar.gz diff --git a/pkgs/httplib2.yaml b/pkgs/httplib2.yaml index 2eba81faf..85b28819f 100644 --- a/pkgs/httplib2.yaml +++ b/pkgs/httplib2.yaml @@ -1,5 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + +dependencies: + build: [] + run: [] sources: -- key: git:0197ec868a4fc638c08358b94200ffd6ddb1bf50 - url: https://github.com/jcgregorio/httplib2 + - key: zip:7ymh6mktg3b5vjtbnue7gj5g4zlawcbp + url: https://pypi.python.org/packages/b1/e8/a49f534214a5c850faaad1678bea812991559d53bea49ecc7321f38a5757/httplib2-0.9.2.zip diff --git a/pkgs/imagesize.yaml b/pkgs/imagesize.yaml new file mode 100644 index 000000000..2d3f315e9 --- /dev/null +++ b/pkgs/imagesize.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:bkzmmk4htb7deuxytuylptw35qjkagxz + url: https://pypi.python.org/packages/53/72/6c6f1e787d9cab2cc733cf042f125abec07209a58308831c9f292504e826/imagesize-0.7.1.tar.gz diff --git a/pkgs/incremental.yaml b/pkgs/incremental.yaml new file mode 100644 index 000000000..b9d57370c --- /dev/null +++ b/pkgs/incremental.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:cswww4qoyr5k23e4vkb6i7nrqq7cxg4y + url: https://pypi.python.org/packages/da/b0/32233c9e84b0d44b39015fba8fec03e88053723c1b455925081dc6ccd9e7/incremental-16.10.1.tar.gz diff --git a/pkgs/ipdb.yaml b/pkgs/ipdb.yaml index 8ba3834e8..bb0771806 100644 --- a/pkgs/ipdb.yaml +++ b/pkgs/ipdb.yaml @@ -5,5 +5,5 @@ dependencies: run: [ipython] sources: - - url: https://pypi.python.org/packages/source/i/ipdb/ipdb-0.8.zip - key: zip:bvfdh44omz5azahmdjna4rup4whfzxdb + - key: tar.gz:xmuurzzg3p5snb7uuwbarcz7c4fskvv2 + url: https://pypi.python.org/packages/eb/0a/0a37dc19572580336ad3813792c0d18c8d7117c2d66fc63c501f13a7a8f8/ipdb-0.10.1.tar.gz diff --git a/pkgs/ipykernel.yaml b/pkgs/ipykernel.yaml index 9f3782b05..e9d2d2ae0 100644 --- a/pkgs/ipykernel.yaml +++ b/pkgs/ipykernel.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:jel6deigqeydi7lfpbwr2mpg7sfoedsz - url: https://pypi.python.org/packages/source/i/ipykernel/ipykernel-4.3.1.zip + - key: tar.gz:ljkpexyonshootbwfqr7tkk6cdtuy237 + url: https://pypi.python.org/packages/2d/1b/eee47b5cd8b2fcdde587cad1e8d3f7eae7bdfa1d36a94ad316fc5fbee833/ipykernel-4.5.2.tar.gz diff --git a/pkgs/ipyleaflet.yaml b/pkgs/ipyleaflet.yaml new file mode 100644 index 000000000..155f3353d --- /dev/null +++ b/pkgs/ipyleaflet.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:btobtcu2iscpwp5wwpss3vn6d7ff736a + url: https://pypi.python.org/packages/a2/3d/161e7e5ae5be07d16be7aefd675ab4ac238603240ac880e4341a0adb015c/ipyleaflet-0.2.1.tar.gz diff --git a/pkgs/ipyparallel.yaml b/pkgs/ipyparallel.yaml new file mode 100644 index 000000000..81f32b378 --- /dev/null +++ b/pkgs/ipyparallel.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [ipython, futures, jupyter, tornado, ipykernel, jupyter-client, pyzmq, decorator, ipython-genutils, certifi, backports-ssl_match_hostname, traitlets, jupyter-core, pexpect, pickleshare, path_py, simplegeneric] + run: [ipython, futures, jupyter, tornado, ipykernel, jupyter-client, pyzmq, decorator, ipython-genutils, certifi, backports-ssl_match_hostname, traitlets, jupyter-core, pexpect, pickleshare, path_py, simplegeneric] + +sources: +- key: tar.gz:i2g5hst44xp7v3rbuf7o74kzpa7l3mm5 + url: https://github.com/ipython/ipyparallel/archive/4e9d1930fd58b7a2722d9a296b77ab9a00d81635.tar.gz diff --git a/pkgs/ipython-d3plot.yaml b/pkgs/ipython-d3plot.yaml new file mode 100644 index 000000000..e81a88f0e --- /dev/null +++ b/pkgs/ipython-d3plot.yaml @@ -0,0 +1,25 @@ +extends: [setuptools_package] + +dependencies: + build: + - ipython + - when airgap: + - requests + run: + - ipython + +sources: + - url: https://github.com/ahmadia/ipython-d3plot + key: git:0c856e217307619885928e6768dde5a47cc65937 + + +# WARNING: This installs into user's .ipython directory +# This is not properly isolated yet. + +build_stages: + - when: airgap + name: airgap + after: install + handler: bash + bash: | + unset IPYTHON_DIR && ${PYTHON} install-nbextension.py \ No newline at end of file diff --git a/pkgs/ipython-genutils.yaml b/pkgs/ipython-genutils.yaml index 691f04a19..fe2ed860f 100644 --- a/pkgs/ipython-genutils.yaml +++ b/pkgs/ipython-genutils.yaml @@ -6,4 +6,4 @@ dependencies: sources: - key: zip:brb7vbhjhliojw7mv76gmvvmdsxrusbv - url: https://pypi.python.org/packages/source/i/ipython_genutils/ipython_genutils-0.1.0.zip + url: https://pypi.python.org/packages/79/4a/6895b4b4e9a72fb281dc0a014d59d269171a5cc0abf4cacfb6bfff814b29/ipython_genutils-0.1.0.zip diff --git a/pkgs/ipython-gridwidget.yaml b/pkgs/ipython-gridwidget.yaml new file mode 100644 index 000000000..03393e937 --- /dev/null +++ b/pkgs/ipython-gridwidget.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [ipython] + run: [ipython] + +sources: + - url: https://github.com/jdfreder/ipython-gridwidget + key: git:95540147f59d98b90744e4be847c463587a1bec0 diff --git a/pkgs/ipython-widgetmode.yaml b/pkgs/ipython-widgetmode.yaml new file mode 100644 index 000000000..e6632db33 --- /dev/null +++ b/pkgs/ipython-widgetmode.yaml @@ -0,0 +1,10 @@ +extends: [setuptools_package] + +dependencies: + build: [ipython] + run: [ipython] + +sources: + - url: https://github.com/erdc-cm/ipython-widgetmode + key: git:496b99eb35b9f6e322be41212be107f5a88c1de1 + diff --git a/pkgs/ipython.yaml b/pkgs/ipython.yaml index 961ed9f12..eee3eaf9d 100644 --- a/pkgs/ipython.yaml +++ b/pkgs/ipython.yaml @@ -1,10 +1,10 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: run: [pyzmq, tornado, jinja2, jsonschema, pygments, sphinx, pexpect, traitlets, simplegeneric, pickleshare, decorator, ipython-genutils, - path_py] + path_py,pathlib2,backports-shutil-get-terminal-size,prompt-toolkit,html5lib] sources: - - key: zip:ktkceh6azaacpi2ezizs632e4t6crenz - url: https://pypi.python.org/packages/source/i/ipython/ipython-4.1.1.zip + - key: zip:fw4jh35cpqrx6mkkj4ucsqtz6xnlv77r + url: https://pypi.python.org/packages/d4/0b/70c913ed4c99eb84c589e5e25b28985ba93ca2a57e08959bb14372f7f5f8/ipython-5.1.0.zip diff --git a/pkgs/ipythonipep23.yaml b/pkgs/ipythonipep23.yaml new file mode 100644 index 000000000..adaf827a1 --- /dev/null +++ b/pkgs/ipythonipep23.yaml @@ -0,0 +1,18 @@ +extends: [distutils_package] +dependencies: + build: [python,pyzmq, tornado, jinja2, pygments, sphinx] + run: [python, pyzmq, tornado, jinja2, pygments, sphinx] + +sources: + - url: https://github.com/ipython/ipython.git + key: git:cb06785549962f1fcdd852a7eb488d4a8db8b319 + +build_stages: +- name: get submodule + before: install + handler: bash + bash: | + git clone https://github.com/ipython/ipython-components.git IPython/html/static/components + cd IPython/html/static/components + git checkout --detach d153657b19789ceeb3108f11e871e153d8f6c2d9 + cd ${BUILD} \ No newline at end of file diff --git a/pkgs/ipywidgets.yaml b/pkgs/ipywidgets.yaml index 9d6c5ed58..b0e4e2758 100644 --- a/pkgs/ipywidgets.yaml +++ b/pkgs/ipywidgets.yaml @@ -1,9 +1,20 @@ extends: [setuptools_package] dependencies: - build: [] - run: [] + build: [jupyter] + run: [jupyter] sources: - - key: tar.gz:z3vtexsfvxuvg7bncfp63hksfzog5ef3 - url: https://pypi.python.org/packages/source/i/ipywidgets/ipywidgets-4.1.1.tar.gz +- key: tar.gz:xl3atdyfjxk6vtbjgs4ouo7pscfydsug + url: https://pypi.python.org/packages/51/b1/81b0f4ad11922a8180ce20496af28d67ecd1232fb5ad472088542bea0fae/ipywidgets-5.2.2.tar.gz + +#sources: +# - key: tar.gz:aq2rmbcqeswklt7usvzz6lk5qfbr54h5 +# url: https://pypi.python.org/packages/0d/be/d6277db5dd835784a1c47bf3d67e388013c1c9aa0a984e05459fa5de45dc/ipywidgets-6.0.0.beta5.tar.gz + +build_stages: + - name: enable + after: install + handler: bash + bash: | + ${JUPYTER_DIR}/bin/jupyter nbextension enable --py --sys-prefix widgetsnbextension diff --git a/pkgs/irrlicht/Makefile.hashdist b/pkgs/irrlicht/Makefile.hashdist new file mode 100644 index 000000000..3058d46a5 --- /dev/null +++ b/pkgs/irrlicht/Makefile.hashdist @@ -0,0 +1,197 @@ +VERSION_MAJOR = 1 +VERSION_MINOR = 8 +VERSION_RELEASE = 3 +# Irrlicht Engine 1.8.3 +# Makefile for Linux +# +# To use, just run: +# +# make +# +# This will compile Irrlicht, create a static lib (libIrrlicht.a), and copy it +# into the subdirectory lib/Linux. That's all. +# +# If you want Irrlicht to be compiled as shared lib (libIrrlicht.so.versionnumber), then run: +# +# make sharedlib +# make install +# +# If you want to compile in release mode run: +# +# make NDEBUG=1 +# +# For cross-compilation for Win32 under Linux, just use the win32 targets. You have to set +# at least CXX, CC, and AR to the proper binaries. +# +# For compiling on MinGW you can run it with: +# +# make win32 +# + +#List of object files, separated based on engine architecture +IRRMESHLOADER = CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMY3DMeshFileLoader.o COCTLoader.o CXMeshFileLoader.o CIrrMeshFileLoader.o CSTLMeshFileLoader.o CLWOMeshFileLoader.o CPLYMeshFileLoader.o CSMFMeshFileLoader.o +IRRMESHWRITER = CColladaMeshWriter.o CIrrMeshWriter.o CSTLMeshWriter.o COBJMeshWriter.o CPLYMeshWriter.o +IRRMESHOBJ = $(IRRMESHLOADER) $(IRRMESHWRITER) \ + CSkinnedMesh.o CBoneSceneNode.o CMeshSceneNode.o \ + CAnimatedMeshSceneNode.o CAnimatedMeshMD2.o CAnimatedMeshMD3.o \ + CQ3LevelMesh.o CQuake3ShaderSceneNode.o CAnimatedMeshHalfLife.o +IRROBJ = CBillboardSceneNode.o CCameraSceneNode.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CMeshManipulator.o CMetaTriangleSelector.o COctreeSceneNode.o COctreeTriangleSelector.o CSceneCollisionManager.o CSceneManager.o CShadowVolumeSceneNode.o CSkyBoxSceneNode.o CSkyDomeSceneNode.o CTerrainSceneNode.o CTerrainTriangleSelector.o CVolumeLightSceneNode.o CCubeSceneNode.o CSphereSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CMeshCache.o CDefaultSceneNodeAnimatorFactory.o CDefaultSceneNodeFactory.o CSceneLoaderIrr.o +IRRPARTICLEOBJ = CParticleAnimatedMeshSceneNodeEmitter.o CParticleBoxEmitter.o CParticleCylinderEmitter.o CParticleMeshEmitter.o CParticlePointEmitter.o CParticleRingEmitter.o CParticleSphereEmitter.o CParticleAttractionAffector.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticleRotationAffector.o CParticleSystemSceneNode.o CParticleScaleAffector.o +IRRANIMOBJ = CSceneNodeAnimatorCameraFPS.o CSceneNodeAnimatorCameraMaya.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation.o CSceneNodeAnimatorTexture.o +IRRDRVROBJ = CNullDriver.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o COpenGLSLMaterialRenderer.o COpenGLExtensionHandler.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CD3D9Driver.o CD3D9HLSLMaterialRenderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o +IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderDDS.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CImageLoaderPPM.o CImageLoaderWAL.o CImageLoaderRGB.o \ + CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o +IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ) +IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o +IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o +IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o +IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o +ZLIBOBJ = +JPEGLIBOBJ = +LIBPNGOBJ = +LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o +BZIP2OBJ = + +# Next variable is for additional scene nodes etc. of customized Irrlicht versions +EXTRAOBJ = +LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ + $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ + $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ + $(BZIP2OBJ) $(EXTRAOBJ) + +############### +#Compiler flags +CXXINCS = -I../../include -I${ZLIB_DIR}/include -I${OPENJPEG_DIR}/include -I${BZIP2_DIR}/include -I${PNG_DIR}/include -I${LIBJPEG_DIR}/include +CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 +CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing +ifndef NDEBUG +CXXFLAGS += -g -D_DEBUG +else +CXXFLAGS += -fexpensive-optimizations -O3 +endif +ifdef PROFILE +CXXFLAGS += -pg +endif +CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES + +sharedlib sharedlib_osx: CXXFLAGS += -fPIC +sharedlib sharedlib_osx: CFLAGS += -fPIC + +#multilib handling +ifeq ($(HOSTTYPE), x86_64) +LIBSELECT=64 +endif + +#Linux specific options +staticlib sharedlib install: SYSTEM = Linux +STATIC_LIB = libIrrlicht.a +LIB_PATH = ../../lib/$(SYSTEM) +INSTALL_DIR = ${ARTIFACT} +sharedlib install: SHARED_LIB = libIrrlicht.so +sharedlib: LDFLAGS += -L${OPENJPEG_DIR}/lib -Wl,-rpath=${OPENJPEG_DIR}/lib -lopenjp2 -L${PNG_DIR}/lib -Wl,-rpath=${PNG_DIR}/lib -lpng -L${BZIP2_DIR}/lib -Wl,-rpath=${BZIP2_DIR}/lib -lbz2 -L${ZLIB_DIR}/lib -Wl,-rpath=${ZLIB_DIR}/lib -lz -L${LIBJPEG_DIR}/lib -Wl,-rpath=${LIBJPEG_DIR}/lib -ljpeg -L/usr/lib/x86_64-linux-gnu -Wl,-rpath=/usr/lib/x86_64-linux-gnu -lGL -lXxf86vm +staticlib sharedlib: CXXINCS += -I/usr/lib/x86_64-linux-gnu -I${OPENJPEG_DIR}/include -I${PNG_DIR}/include -I${BZIP2_DIR}/include -I${ZLIB_DIR}/include -I ${LIBJPEG_DIR}/include + +#OSX specific options +staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX +staticlib_osx sharedlib_osx: IRROTHEROBJ += MacOSX/CIrrDeviceMacOSX.o MacOSX/OSXClipboard.o MacOSX/AppDelegate.o +staticlib_osx sharedlib_osx: CXXINCS += -IMacOSX -I/usr/include/X11 +sharedlib_osx install_osx: SHARED_LIB = libIrrlicht.dylib +staticlib_osx sharedlib_osx: LDFLAGS += --no-export-all-symbols --add-stdcall-alias +sharedlib_osx: LDFLAGS += -L/usr/lib/x86_64-linux-gnu -lGL -lXxf86vm +# for non-X11 app +#sharedlib_osx: LDFLAGS += -framework cocoa -framework carbon -framework opengl -framework IOKit + +#Windows specific options +IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll +sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc +sharedlib_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -Wl,--add-stdcall-alias +#choose either -DIRR_COMPILE_WITH_DX9_DEV_PACK or -DNO_IRR_COMPILE_WITH_DIRECT3D_9_ depending if you need dx9 +#sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK +sharedlib_win32 staticlib_win32: CPPFLAGS += -DNO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_ -DNO_IRR_COMPILE_WITH_DIRECT3D_9_ +sharedlib_win32 staticlib_win32: CPPFLAGS += -DIRR_COMPILE_WITH_DX9_DEV_PACK -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL +staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ + +VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) +SHARED_FULLNAME = $(SHARED_LIB).$(VERSION) +SONAME = $(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) + +#################### +# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux +all linux: staticlib + +# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux +sharedlib: $(LINKOBJ) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS) + mkdir -p $(LIB_PATH) + cp $(SHARED_FULLNAME) $(LIB_PATH) + +# Builds Irrlicht as static lib (libIrrlicht.a) +$(STATIC_LIB): $(LINKOBJ) + $(AR) rs $@ $^ + +# Copies static lib into lib/Linux +staticlib staticlib_osx: $(STATIC_LIB) + mkdir -p $(LIB_PATH) + cp $^ $(LIB_PATH) + +# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc +all_win32 win32: sharedlib_win32 +sharedlib_win32: $(IRRLICHT_DLL) +../../bin/Win32-gcc/Irrlicht.dll: $(LINKOBJ) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS) -Wl,--out-implib,../../lib/Win32-gcc/$(STATIC_LIB) +# Copies static lib into /lib/Win32-gcc +staticlib_win32: $(STATIC_LIB) + cp $^ $(LIB_PATH) + +# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/MacOSX +sharedlib_osx: $(LINKOBJ) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS) + cp $(SHARED_FULLNAME) $(LIB_PATH) + +# Installs Irrlicht if it was created as shared lib +install install_osx: + $(RM) -r $(INSTALL_DIR)/include + mkdir -p $(INSTALL_DIR)/include + cp ../../include/*.h $(INSTALL_DIR)/include + mkdir -p $(INSTALL_DIR)/lib + cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)/lib + cd $(INSTALL_DIR)/lib && ln -s -f $(SHARED_FULLNAME) $(SONAME) + cd $(INSTALL_DIR)/lib && ln -s -f $(SONAME) $(SHARED_LIB) +# ldconfig -n $(INSTALL_DIR) + +TAGS: + ctags *.cpp ../../include/*.h *.h + +# Create dependency files for automatic recompilation +%.d:%.cpp + $(CXX) $(CPPFLAGS) -MM -MF $@ $< + +# Create dependency files for automatic recompilation +%.d:%.c + $(CC) $(CPPFLAGS) -MM -MF $@ $< + +# Create object files from objective-c code +%.o:%.mm + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +ifneq ($(MAKECMDGOALS),clean) +-include $(LINKOBJ:.o=.d) +endif + +help: + @echo "Available targets for Irrlicht" + @echo " sharedlib: Build shared library Irrlicht.so for Linux" + @echo " staticlib: Build static library Irrlicht.a for Linux" + @echo " install: Copy shared library to /usr/local/lib" + @echo "" + @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows" + @echo " staticlib_win32: Build static library Irrlicht.a for Windows" + @echo "" + @echo " clean: Clean up directory" + +# Cleans all temporary files and compilation results. +clean: + $(RM) $(LINKOBJ) $(SHARED_FULLNAME) $(STATIC_LIB) $(LINKOBJ:.o=.d) + +.PHONY: all sharedlib staticlib sharedlib_win32 staticlib_win32 help install clean + diff --git a/pkgs/irrlicht/irrlicht.yaml b/pkgs/irrlicht/irrlicht.yaml new file mode 100644 index 000000000..ce94f6380 --- /dev/null +++ b/pkgs/irrlicht/irrlicht.yaml @@ -0,0 +1,43 @@ +extends: [autotools_package] + +sources: + - url: http://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip + key: zip:6qvsqc6gbdsulobaebx6fkmzyvpssdpf + +dependencies: + build: + - zlib + - openjpeg + - png + - bzip2 + - libjpeg + +build_stages: +- name: configure + mode: replace + after: prologue + handler: bash + files: [Makefile.hashdist] + bash: | + cp -f _hashdist/Makefile.hashdist source/Irrlicht/Makefile + rm -rf source/Irrlicht/jpeglib source/Irrlicht/libpng source/Irrlicht/bzip2 source/Irrlicht/jpeglib source/Irrlicht/zlib + ln -s ${PNG_DIR}/include source/Irrlicht/libpng + ln -s ${ZLIB_DIR}/include source/Irrlicht/zlib + ln -s ${BZIP2_DIR}/include source/Irrlicht/bzip2 + ln -s ${LIBJPEG_DIR}/include source/Irrlicht/jpeglib + +- name: make + mode: replace + after: configure + handler: bash + bash: | + cd source/Irrlicht + make -j ${HASHDIST_CPU_COUNT} sharedlib + +- name: install + mode: replace + after: make + handler: bash + bash: | + make install + diff --git a/pkgs/jinja2.yaml b/pkgs/jinja2.yaml index 3649126d9..1137214e0 100644 --- a/pkgs/jinja2.yaml +++ b/pkgs/jinja2.yaml @@ -1,9 +1,9 @@ extends: [setuptools_package] dependencies: - build: [] + build: [MarkupSafe] run: [MarkupSafe] sources: - key: tar.gz:xqp7f74i3p5m57pe3xpeohiuc7j3gbhi - url: https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.8.tar.gz + url: https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/Jinja2-2.8.tar.gz diff --git a/pkgs/jsonschema.yaml b/pkgs/jsonschema.yaml index fb67dc50b..b51717bce 100644 --- a/pkgs/jsonschema.yaml +++ b/pkgs/jsonschema.yaml @@ -6,4 +6,4 @@ dependencies: sources: - key: zip:sceestney5cjpj5cpbbk4tfjym2vwx3x - url: https://pypi.python.org/packages/source/j/jsonschema/jsonschema-2.5.1.zip + url: https://pypi.python.org/packages/f1/85/974bd633b8fc23b0ad4169dfff7f6ebd503ca1b1d8ec5ef6bae3cd78dbe2/jsonschema-2.5.1.zip diff --git a/pkgs/julia.yaml b/pkgs/julia.yaml index 932499698..39602e370 100644 --- a/pkgs/julia.yaml +++ b/pkgs/julia.yaml @@ -1,11 +1,11 @@ extends: [base_package, libflags] dependencies: - build: [openblas, llvm, fftw, gmp, mpfr, pcre] + build: [openblas, llvm, fftw, gmp, mpfr, pcre, zlib, m4, cmake] sources: -- url: https://github.com/JuliaLang/julia - key: git:95c9f9bfa1c2d385f3d8ade99c572500a6294bd6 +- key: tar.gz:omshqu3lnxgozp2w4va654fo2bg6bzww + url: https://github.com/JuliaLang/julia/releases/download/v0.5.0/julia-0.5.0-full.tar.gz defaults: # share/julia/base/build_h.jl contains hard-coded path @@ -27,16 +27,14 @@ build_stages: USE_SYSTEM_LAPACK=1 \ LIBLAPACK=-L$OPENBLAS_DIR/lib -lopenblas \ LIBLAPACKNAME=$OPENBLAS_DIR/lib/libopenblas.so \ - USE_SYSTEM_LLVM=1 \ - LLVM_CONFIG=$LLVM_DIR/bin/llvm-config \ + USE_SYSTEM_LLVM=0 \ USE_SYSTEM_ZLIB=0 \ USE_SYSTEM_SUITESPARSE=0 \ USE_SYSTEM_ARPACK=0 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_PCRE=1 \ - PCRE_CONFIG=$PCRE_DIR/bin/pcre-config \ + USE_SYSTEM_FFTW=0 \ + USE_SYSTEM_GMP=0 \ + USE_SYSTEM_MPFR=0 \ + USE_SYSTEM_PCRE=0 \ USE_SYSTEM_LIBUNWIND=0 \ USE_SYSTEM_READLINE=0 \ USE_SYSTEM_GRISU=0 \ diff --git a/pkgs/jupyter-client.yaml b/pkgs/jupyter-client.yaml index 5d0d7d3ee..1d841d0d1 100644 --- a/pkgs/jupyter-client.yaml +++ b/pkgs/jupyter-client.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:awsxibni7ukjgvqupt5f4vc333xnqw7v - url: https://pypi.python.org/packages/source/j/jupyter_client/jupyter_client-4.1.1.zip + - key: tar.gz:zgnff6wc4w32hnyu5ess5p3szp4xknwv + url: https://pypi.python.org/packages/88/03/d8e218721af0b084d4fda5e3bb89dc201505780f96ae060bf5e3e67c7707/jupyter_client-4.4.0.tar.gz diff --git a/pkgs/jupyter-console.yaml b/pkgs/jupyter-console.yaml index 43a99f392..7a7fed6b6 100644 --- a/pkgs/jupyter-console.yaml +++ b/pkgs/jupyter-console.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:iupip7dpkr7tdxuynwr3w2kb5ypppaxl - url: https://pypi.python.org/packages/source/j/jupyter_console/jupyter_console-4.1.1.zip + - key: zip:inpj7av5fhjtigofdmoutqvwhmrbisxw + url: https://pypi.python.org/packages/79/db/9a6afc84d77b41ef82397f0efc05c830efa5bb485fa933604bd90ccd75db/jupyter_console-5.0.0.zip diff --git a/pkgs/jupyter-core.yaml b/pkgs/jupyter-core.yaml index f16b297a2..81cb8d2c6 100644 --- a/pkgs/jupyter-core.yaml +++ b/pkgs/jupyter-core.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:jzu3pjn2eej5krt6em4zivsdkysqpur7 - url: https://pypi.python.org/packages/source/j/jupyter_core/jupyter_core-4.0.6.zip + - key: tar.gz:rhcvhgoiin7xo4mxylecyh7vmooh64ou + url: https://pypi.python.org/packages/bc/d0/8f57f733913fbd4ce1a01991b008bace8dcf05158080821c6de76b4c5d01/jupyter_core-4.2.1.tar.gz diff --git a/pkgs/jupyter-pip.yaml b/pkgs/jupyter-pip.yaml index de0d9c37e..ec747c8ff 100644 --- a/pkgs/jupyter-pip.yaml +++ b/pkgs/jupyter-pip.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:wxla2vqnbs3zhqn3l6kafwyhobj6ppak - url: https://pypi.python.org/packages/source/j/jupyter-pip/jupyter-pip-0.1.tar.gz + - key: git:9fe7ab80870b2c7de8380ab8013fbb33df7ee847 + url: https://github.com/jdfreder/jupyter-pip.git diff --git a/pkgs/jupyter.yaml b/pkgs/jupyter.yaml index 2b0f02c15..d0186317a 100644 --- a/pkgs/jupyter.yaml +++ b/pkgs/jupyter.yaml @@ -1,8 +1,8 @@ extends: [distutils_package] dependencies: - build: [MarkupSafe, backports-ssl_match_hostname, certifi, decorator, functools, ipykernel, ipython, ipython-genutils, ipywidgets, jinja2, jsonschema, jupyter-client, jupyter-console, jupyter-core, mistune, nbconvert, nbformat, notebook, path_py, pickleshare, ptyprocess, pygments, pyzmq, qtconsole, simplegeneric, terminado, tornado, traitlets] - run: [MarkupSafe, backports-ssl_match_hostname, certifi, decorator, functools, ipykernel, ipython, ipython-genutils, ipywidgets, jinja2, jsonschema, jupyter-client, jupyter-console, jupyter-core, mistune, nbconvert, nbformat, notebook, path_py, pickleshare, ptyprocess, pygments, pyzmq, qtconsole, simplegeneric, terminado, tornado, traitlets] + build: [MarkupSafe, certifi, decorator, functools, ipykernel, ipython, ipython-genutils, jinja2, jsonschema, jupyter-client, jupyter-console, jupyter-core, mistune, nbconvert, nbformat, notebook, path_py, pickleshare, ptyprocess, pygments, pyzmq, qtconsole, simplegeneric, terminado, tornado, traitlets] + run: [MarkupSafe, certifi, decorator, functools, ipykernel, ipython, ipython-genutils, jinja2, jsonschema, jupyter-client, jupyter-console, jupyter-core, mistune, nbconvert, nbformat, notebook, path_py, pickleshare, ptyprocess, pygments, pyzmq, qtconsole, simplegeneric, terminado, tornado, traitlets] sources: - key: zip:hypymb3lxn6iyidyfe4qgbncwh7ig3kh diff --git a/pkgs/jupyterlab.yaml b/pkgs/jupyterlab.yaml new file mode 100644 index 000000000..f484931bb --- /dev/null +++ b/pkgs/jupyterlab.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:7hxy7nctm5hl3dpdimacfr7awqbof7ur + url: https://pypi.python.org/packages/c4/64/fbf683c6b3c3130956aba16d617c5347309dd465ab94d3b50f8a7fb3a2b1/jupyterlab-0.11.3.tar.gz diff --git a/pkgs/kiwisolver.yaml b/pkgs/kiwisolver.yaml new file mode 100644 index 000000000..3822ee77d --- /dev/null +++ b/pkgs/kiwisolver.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:zy56lvjawtjmhzpowtgs55rltonlrldl + url: https://pypi.python.org/packages/31/60/494fcce70d60a598c32ee00e71542e52e27c978e5f8219fae0d4ac6e2864/kiwisolver-1.0.1.tar.gz diff --git a/pkgs/launcher.yaml b/pkgs/launcher.yaml index 87cb0e9b5..ab4e20fe4 100644 --- a/pkgs/launcher.yaml +++ b/pkgs/launcher.yaml @@ -2,8 +2,8 @@ # Symlinking the launcher interferes with its operation sources: - - url: https://github.com/hashdist/hdist-launcher.git - key: git:8119797b5d21df5cc9609771029d29a51c44c882 + - key: zip:o43b655jkwfuule3aakccf4tof2hopxx + url: https://github.com/hashdist/hdist-launcher/archive/master.zip build_stages: diff --git a/pkgs/leafletwidget.yaml b/pkgs/leafletwidget.yaml index 5e4d76ef3..7b5d596cd 100644 --- a/pkgs/leafletwidget.yaml +++ b/pkgs/leafletwidget.yaml @@ -9,8 +9,8 @@ dependencies: - ipython sources: - - url: https://github.com/ellisonbg/leaftletwidget - key: git:b03ddea2842b6939810b82ee93aa13e28d458456 + - url: https://github.com/erdc-cm/leafletwidget + key: git:f9147c5b13a69b80bc28d3574f7ba6b2c576aed2 # WARNING: This installs into user's .ipython directory @@ -22,4 +22,4 @@ build_stages: after: install handler: bash bash: | - unset IPYTHON_DIR && ${PYTHON} install-nbextension.py \ No newline at end of file + unset IPYTHON_DIR && ${PYTHON} install-nbextension.py diff --git a/pkgs/libjpeg.yaml b/pkgs/libjpeg.yaml new file mode 100644 index 000000000..8a26b1b63 --- /dev/null +++ b/pkgs/libjpeg.yaml @@ -0,0 +1,23 @@ +extends: [autotools_package] + +dependencies: + build: [libtool] + +sources: +- key: tar.gz:oxb6yja6tglfat7afkpnjujpc23uvxtr + url: http://downloads.sourceforge.net/project/libjpeg/libjpeg/6b/jpegsrc.v6b.tar.gz + +build_stages: +- name: setlibtools + before: configure + handler: bash + bash: | + ln -s ${LIBTOOL_DIR}/bin/libtool . + mkdir ${ARTIFACT}/include + mkdir ${ARTIFACT}/lib + mkdir ${ARTIFACT}/bin + mkdir -p ${ARTIFACT}/man/man1 + +- name: configure + extra: ['--enable-shared', + '--enable-static'] diff --git a/pkgs/llvm.yaml b/pkgs/llvm.yaml index 21148c1d7..44108dd37 100644 --- a/pkgs/llvm.yaml +++ b/pkgs/llvm.yaml @@ -1,7 +1,7 @@ extends: [cmake_package] dependencies: - build: [python] + build: [python, pyliblzma] sources: - key: tar.xz:xz3zj3im5rbnnruczkhdkf2tlnkfkwr5 diff --git a/pkgs/matplotlib/matplotlib.yaml b/pkgs/matplotlib/matplotlib.yaml index b1c6df44d..e4662c765 100644 --- a/pkgs/matplotlib/matplotlib.yaml +++ b/pkgs/matplotlib/matplotlib.yaml @@ -1,11 +1,12 @@ -extends: [namespace_package, libflags] +extends: [namespace_package,libflags] + dependencies: - build: [bzip2, freetype, numpy, png, pkg-config, zlib] - run: [freetype, numpy, png, python-dateutil, pyparsing, six] + build: [bzip2, freetype, numpy, png, pkg-config, zlib, functools32] + run: [freetype, numpy, png, python-dateutil, pyparsing, six, cycler, functools32, functools_lru_cache, kiwisolver] sources: -- key: git:21f46ff14ea65eeb725a4fd6c36642dddf3fea79 - url: https://github.com/matplotlib/matplotlib.git +- key: tar.gz:jxd66uukvuq7ek7il2kxeuruyulyyd4t + url: https://files.pythonhosted.org/packages/ec/ed/46b835da53b7ed05bd4c6cae293f13ec26e877d2e490a53a709915a9dcb7/matplotlib-2.2.2.tar.gz build_stages: diff --git a/pkgs/mayavi.yaml b/pkgs/mayavi.yaml new file mode 100644 index 000000000..b663aed46 --- /dev/null +++ b/pkgs/mayavi.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [vtk, numpy] + run: [vtk, numpy] + +sources: + - key: zip:am4fd27fb3noafpzn3zbehpcz7iwvopj + url: https://pypi.python.org/packages/8a/7d/3c3a7b60b5d87e69d194cc71de716178a7af165342f85083620c68d88260/mayavi-4.5.0.zip diff --git a/pkgs/memory_profiler.yaml b/pkgs/memory_profiler.yaml index 3788f366f..6afb5daac 100644 --- a/pkgs/memory_profiler.yaml +++ b/pkgs/memory_profiler.yaml @@ -1,4 +1,4 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: run: @@ -6,5 +6,5 @@ dependencies: - psutil sources: - - url: https://github.com/fabianp/memory_profiler.git - key: git:3fa7aafb0ac9c05c83fd9726ba1ffd6a7c27ec82 +- key: tar.gz:isymgmavllf4uhqqtruwjvg2zpqlkhen + url: https://github.com/fabianp/memory_profiler/archive/0.42.tar.gz diff --git a/pkgs/mistune.yaml b/pkgs/mistune.yaml index 48ec7716c..b58564b25 100644 --- a/pkgs/mistune.yaml +++ b/pkgs/mistune.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:mb3n5x3wqneje7mzd5bxdznhthdkafml - url: https://pypi.python.org/packages/source/m/mistune/mistune-0.7.1.tar.gz + - key: tar.gz:ehioq2o7hoiyt4si4arpdslwht4qnhq2 + url: https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607/mistune-0.7.3.tar.gz diff --git a/pkgs/mock.yaml b/pkgs/mock.yaml index 4310bfff5..71604687e 100644 --- a/pkgs/mock.yaml +++ b/pkgs/mock.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/m/mock/mock-1.0.1.zip - key: zip:r6bqqdnkesoqg3f4z64k4xgg74ahxcgw + - key: tar.gz:wfmlnx3w5xjdtobarveb3rdlnl6ulkcg + url: https://pypi.python.org/packages/0c/53/014354fc93c591ccc4abff12c473ad565a2eb24dcd82490fae33dbf2539f/mock-2.0.0.tar.gz diff --git a/pkgs/mpi4py.yaml b/pkgs/mpi4py.yaml index b65bb9cd0..3650c6338 100644 --- a/pkgs/mpi4py.yaml +++ b/pkgs/mpi4py.yaml @@ -1,8 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + dependencies: build: [mpi, numpy, cython] run: [mpi, numpy] sources: - - url: https://bitbucket.org/mpi4py/mpi4py.git - key: git:d5da39a2e334e585b97e83928995cca917610129 + - key: tar.gz:mvb2awcru6vb43iwlztt2qrlujhelra6 + url: https://pypi.python.org/packages/ee/b8/f443e1de0b6495479fc73c5863b7b5272a4ece5122e3589db6cd3bb57eeb/mpi4py-2.0.0.tar.gz diff --git a/pkgs/mpich.yaml b/pkgs/mpich.yaml index 43a40295f..7ffbb4d98 100644 --- a/pkgs/mpich.yaml +++ b/pkgs/mpich.yaml @@ -10,11 +10,11 @@ build_stages: - when: not fortran name: configure mode: update - extra: ['--disable-f77', '--disable-fc'] + extra: ['--disable-f77', '--disable-fc', '--disable-fortran'] sources: - - url: http://www.mpich.org/static/tarballs/3.0.3/mpich-3.0.3.tar.gz - key: tar.gz:jj5yo7oe3e45wwngkuqqn35bud5kdfkr +- key: tar.gz:lw2tx4xn7krchdvwucs3ypjmftf7xmn2 + url: http://www.mpich.org/static/downloads/3.2.1/mpich-3.2.1.tar.gz defaults: # bin/mpicc contains hard-coded path diff --git a/pkgs/mpmath.yaml b/pkgs/mpmath.yaml index 48901201e..b6d244f5f 100644 --- a/pkgs/mpmath.yaml +++ b/pkgs/mpmath.yaml @@ -1,5 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + +dependencies: + build: [] + run: [] sources: -- key: tar.gz:ndo7mqtnzwsekmrum7mjrewsz7532gxa - url: http://mpmath.org/files/mpmath-0.19.tar.gz + - key: tar.gz:egucjwyxm6m7ikcd4riq3jf4nwzw56jl + url: https://pypi.python.org/packages/b0/30/b7b20f07babf64cd3897b226f2bd4c2af65a899f1796f7723bccb4c59fa0/mpmath-all-0.19.tar.gz diff --git a/pkgs/nbconvert.yaml b/pkgs/nbconvert.yaml index 7bd253042..c25b3cc7d 100644 --- a/pkgs/nbconvert.yaml +++ b/pkgs/nbconvert.yaml @@ -2,8 +2,8 @@ extends: [setuptools_package] dependencies: build: [] - run: [] + run: [bleach,configparser] sources: - - key: zip:spzyh4dhfa3yjpwsd4g6cufmb64557t7 - url: https://pypi.python.org/packages/source/n/nbconvert/nbconvert-4.0.0.zip + - key: tar.gz:66252wawiezikhlnx5tpexmajxtaelcp + url: https://pypi.python.org/packages/48/ea/1fe38e9616c6b35e4f7c535c2fb62bed01b96df89fd07ec128518a0a46b1/nbconvert-5.0.0b1.tar.gz diff --git a/pkgs/nbformat.yaml b/pkgs/nbformat.yaml index e6c7751fa..a885cfe38 100644 --- a/pkgs/nbformat.yaml +++ b/pkgs/nbformat.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:3sdv5ahsufylg2iza7qequchaj65c7lw - url: https://pypi.python.org/packages/source/n/nbformat/nbformat-4.0.1.zip + - key: tar.gz:hcnfwyykgbjza5hshcsi7omgiwjpmplb + url: https://pypi.python.org/packages/81/63/5cb425bfa9cff370a740c8d6fd26f17c7db152c1877aca3e7671ecfa8ce3/nbformat-4.2.0.tar.gz diff --git a/pkgs/ncurses/ncurses.yaml b/pkgs/ncurses/ncurses.yaml index 8ab8292a1..b21e0aff6 100644 --- a/pkgs/ncurses/ncurses.yaml +++ b/pkgs/ncurses/ncurses.yaml @@ -1,8 +1,8 @@ extends: [autotools_package] sources: - - key: git:2031c7bde2dfb2189b9c724946f19c089596eac4 - url: https://github.com/hashdist/pkg-ncurses +- key: tar.gz:aypl4sgsa3ku3slsagxhpf7deeh6z5mz + url: https://github.com/hashdist/pkg-ncurses/archive/2031c7bde2dfb2189b9c724946f19c089596eac4.tar.gz defaults: relocatable: false diff --git a/pkgs/netcdf4/netcdf4.yaml b/pkgs/netcdf4/netcdf4.yaml index e20098478..13aff3fac 100644 --- a/pkgs/netcdf4/netcdf4.yaml +++ b/pkgs/netcdf4/netcdf4.yaml @@ -1,6 +1,6 @@ extends: [autotools_package] dependencies: - build: [mpi, hdf5, curl, m4, zlib] + build: [mpi, hdf5, curl, m4, zlib, szip] sources: - key: tar.gz:6lxhr2zray34ab7qaht4ddrno46sh42f diff --git a/pkgs/nose.yaml b/pkgs/nose.yaml index 835452b7c..13a41db88 100644 --- a/pkgs/nose.yaml +++ b/pkgs/nose.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: -- key: tar.gz:o26ghjhc2xs2bx3xzj6rr4hvnywent5w - url: https://pypi.python.org/packages/source/n/nose/nose-1.3.4.tar.gz + - key: tar.gz:6g7756olzatcr5xh262a27rfllx2ugw3 + url: https://pypi.python.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-1.3.7.tar.gz diff --git a/pkgs/notebook.yaml b/pkgs/notebook.yaml index 045e4a520..14ace5ad6 100644 --- a/pkgs/notebook.yaml +++ b/pkgs/notebook.yaml @@ -5,5 +5,5 @@ dependencies: run: [functools, functools32, ipython-genutils] sources: - - key: tar.gz:wwlug65dgu4ceeai4ip6u4onahw2twqv - url: https://pypi.python.org/packages/source/n/notebook/notebook-4.1.0.tar.gz + - key: tar.gz:ydm35oknpxcjldwgzr3jm3e3mp4jbeva + url: https://pypi.python.org/packages/c4/f5/229d65cedb3da4ccf7bfaf5ad31241764174f3ac5ce1d2a646c397a91773/notebook-4.3.0.tar.gz diff --git a/pkgs/numexpr.yaml b/pkgs/numexpr.yaml index 8caa56787..f82209e7c 100644 --- a/pkgs/numexpr.yaml +++ b/pkgs/numexpr.yaml @@ -1,8 +1,10 @@ -extends: [distutils_package] +extends: [setuptools_package] + dependencies: build: [numpy] run: [numpy] sources: - - key: tar.gz:wpk7tggr4se4ny7gollvyltljkdr2z76 - url: https://github.com/pydata/numexpr/archive/v2.4.tar.gz \ No newline at end of file + - key: tar.gz:3mxoolzhpmr4qljaigessdvew6jptpk3 + url: https://pypi.python.org/packages/c6/f0/11628fa4d332d8fe9ab0ba8e9bfe0e065fb6b5324859171ee72d84e079c0/numexpr-2.6.1.tar.gz + diff --git a/pkgs/numpy/numpy.yaml b/pkgs/numpy/numpy.yaml index c11a9541a..1e4855153 100644 --- a/pkgs/numpy/numpy.yaml +++ b/pkgs/numpy/numpy.yaml @@ -1,12 +1,12 @@ extends: [setuptools_package] + dependencies: build: [blas, cython] run: [blas, cython] sources: - - key: tar.gz:5cmod4vyscjlsu2sucsygfjkdbacbjes - url: https://github.com/numpy/numpy/archive/v1.11.0.tar.gz - +- key: tar.gz:3w6nugkpjhqm6btd7katds45pi5yo3iu + url: https://github.com/numpy/numpy/releases/download/v1.14.2/numpy-1.14.2.tar.gz build_stages: - when: platform == 'linux' @@ -15,10 +15,13 @@ build_stages: handler: bash bash: | cat > site.cfg << EOF - [atlas] - atlas_libs = openblas + [ALL] + extra_link_args = -shared + [openblas] + libraries = openblas library_dirs = ${OPENBLAS_DIR}/lib include_dirs = ${OPENBLAS_DIR}/include + runtime_library_dirs = ${OPENBLAS_DIR}/include EOF - when: platform == 'linux' @@ -39,7 +42,7 @@ build_stages: bash: | cat > site.cfg << EOF [mkl] - library_dirs = /app/intel/compilers/14/mkl/lib/intel64 + library_dirs = /p/home/apps/intel/parallel_studio_2016/compilers_and_libraries_2016.0.109/linux/mkl/lib/intel64_lin mkl_libs = mkl_rt,pthread,m EOF @@ -62,8 +65,8 @@ build_stages: bash: | cat > site.cfg << EOF [DEFAULT] - library_dirs = ${ACML_DIR}/gfortran64/lib - libraries = acml, gfortran + library_dirs = ${CRAY_LIBSCI_PREFIX_DIR}/lib + libraries = sci_gnu EOF - when: machine == 'CrayXE6' @@ -72,9 +75,9 @@ build_stages: before: install handler: bash bash: | - export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${ACML_DIR}/gfortran64/lib $(${PYTHON_DIR}/bin/python-config --ldflags -lgfortran)" - export LAPACK=acml - export BLAS=acml + export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${CRAY_LIBSCI_PREFIX_DIR}/lib $(${PYTHON_DIR}/bin/python-config --ldflags)" + export LAPACK=sci_gnu + export BLAS=sci_gnu export ATLAS=None - when: platform == 'Cygwin' diff --git a/pkgs/oauthlib.yaml b/pkgs/oauthlib.yaml index 3515b9d07..f7d8df6f3 100644 --- a/pkgs/oauthlib.yaml +++ b/pkgs/oauthlib.yaml @@ -1,5 +1,5 @@ extends: [setuptools_package] sources: - - key: tar.gz:ubi7atxi5qzqkbk2wngypm3mtjcjg5pa - url: https://pypi.python.org/packages/source/o/oauthlib/oauthlib-0.7.2.tar.gz + - key: tar.gz:cmvni3pslzj2qszt6h6uh6aos46nulfq + url: https://pypi.python.org/packages/d2/4c/5ac894a469e25ebd02f6b3c2adb9f55253e6d1ca1f16a7d247ae6d48b4c8/oauthlib-2.0.1.tar.gz diff --git a/pkgs/openblas-lapack.yaml b/pkgs/openblas-lapack.yaml new file mode 100644 index 000000000..5a6a8ca91 --- /dev/null +++ b/pkgs/openblas-lapack.yaml @@ -0,0 +1,8 @@ +dependencies: + build: [blas] + run: [blas] + +when_build_dependency: +- {set: 'BLAS_LDFLAGS', value: '-Wl,-rpath,${BLAS_DIR}/lib -L${BLAS_DIR}/lib -lopenblas'} +- {set: 'LAPACK_LDFLAGS', value: '-Wl,-rpath,${BLAS_DIR}/lib -L${BLAS_DIR}/lib -lopenblas'} +- {set: 'OPENBLAS_DIR', value: '${BLAS_DIR}'} diff --git a/pkgs/openblas.yaml b/pkgs/openblas.yaml index 7b71bd3a5..09619e8a5 100644 --- a/pkgs/openblas.yaml +++ b/pkgs/openblas.yaml @@ -1,8 +1,8 @@ extends: [base_package] sources: -- key: tar.gz:l4pzq2qzackjawfvpddbyk3fwtpdetyz - url: https://github.com/xianyi/OpenBLAS/archive/v0.2.13.tar.gz +- key: tar.gz:l3zywfozyzjjqv3uq2pp2velry7jolq6 + url: https://github.com/xianyi/OpenBLAS/archive/v0.2.20.tar.gz defaults: # cmake/OpenBLASConfig.cmake contains hard-coded path @@ -31,7 +31,7 @@ build_stages: after: prologue handler: bash bash: | - make USE_THREAD=${USE_THREAD} {{extra_flags}} -j${HASHDIST_CPU_COUNT} + make DYNAMIC_ARCH=1 USE_THREAD=${USE_THREAD} {{extra_flags}} -j${HASHDIST_CPU_COUNT} make {{extra_flags}} PREFIX=${ARTIFACT} install when_build_dependency: diff --git a/pkgs/openjpeg.yaml b/pkgs/openjpeg.yaml index aa9e64596..4fd9ef38a 100644 --- a/pkgs/openjpeg.yaml +++ b/pkgs/openjpeg.yaml @@ -1,22 +1,25 @@ extends: [cmake_package] -# version 1.5 of openjpeg -# later versions should go in openjpeg2 - dependencies: build: [] defaults: + version: 1.5 relocatable: false -sources: -- key: tar.gz:cizlxakp3cgy5uyuzfhqx7v3appikwky - url: http://sourceforge.net/projects/openjpeg.mirror/files/2.1.0/openjpeg-2.1.0.tar.gz - -build_stages: +when version == '1.5': + sources: + - key: tar.gz:zgii7k2eimvc5usvbrcxzn7hg3ng27bs + url: http://sourceforge.net/projects/openjpeg.mirror/files/openjpeg-1.5.0.tar.gz +when version == '2.1': + sources: + - key: tar.gz:cizlxakp3cgy5uyuzfhqx7v3appikwky + url: http://sourceforge.net/projects/openjpeg.mirror/files/2.1.0/openjpeg-2.1.0.tar.gz # grib_api, at least, expects not to find this namespaced -- name: fix_include +build_stages: +- when: version == '1.5' + name: fix_include after: install handler: bash bash: | diff --git a/pkgs/openmpi.yaml b/pkgs/openmpi.yaml index 423c88b02..d0f2f8610 100644 --- a/pkgs/openmpi.yaml +++ b/pkgs/openmpi.yaml @@ -1,8 +1,8 @@ extends: [autotools_package] sources: -- url: http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 - key: tar.bz2:7y33voe3l3zdjyfmqlohtaucykvqreal +- url: https://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.6.tar.bz2 + key: tar.bz2:mvqgdbfaqsqo3jqqfma6li3kr4bnggk5 defaults: # lib/openmpi/mca_carto_auto_detect.la contains hard-coded path diff --git a/pkgs/parmetis/fix_clang_730_error.patch b/pkgs/parmetis/fix_clang_730_error.patch new file mode 100644 index 000000000..820ec8577 --- /dev/null +++ b/pkgs/parmetis/fix_clang_730_error.patch @@ -0,0 +1,12 @@ +diff -Nru parmetis-4.0.3/metis/GKlib/error.c-orig parmetis-4.0.3/metis/GKlib/error.c +--- parmetis-4.0.3/metis/GKlib/error.c-orig 2016-04-25 22:49:02.000000000 -0500 ++++ parmetis-4.0.3/metis/GKlib/error.c 2016-04-25 22:49:11.000000000 -0500 +@@ -18,7 +18,7 @@ + + /* These are the jmp_buf for the graceful exit in case of severe errors. + Multiple buffers are defined to allow for recursive invokation. */ +-#define MAX_JBUFS 128 ++#define MAX_JBUFS 24 + __thread int gk_cur_jbufs=-1; + __thread jmp_buf gk_jbufs[MAX_JBUFS]; + __thread jmp_buf gk_jbuf; diff --git a/pkgs/parmetis/parmetis.yaml b/pkgs/parmetis/parmetis.yaml index 950712349..15d74a959 100644 --- a/pkgs/parmetis/parmetis.yaml +++ b/pkgs/parmetis/parmetis.yaml @@ -11,7 +11,7 @@ defaults: # lib/libmetis.so contains hard-coded path relocatable: false # Skip build-time tests (not recommended) - without_check: false + without_check: platform != "Darwin" build_stages: - name: setup_builddir @@ -48,13 +48,13 @@ build_stages: -DCMAKE_VERBOSE_MAKEFILE=1 -DGKLIB_PATH=${BUILD}/metis/GKlib -DCMAKE_INSTALL_PREFIX=${ARTIFACT} - -DSHARED=1 -DOPENMP=0 -DCMAKE_C_COMPILER=${MPICC} -DCMAKE_CXX_COMPILER=${MPICXX} -DCMAKE_EXE_LINKER_FLAGS={{DYNAMIC_EXE_LINKER_FLAGS}} -DCMAKE_INSTALL_RPATH:STRING=${ARTIFACT}/lib - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON + -DSHARED=1" - when: platform == "Darwin" name: cmake-flags-Darwin diff --git a/pkgs/path_py.yaml b/pkgs/path_py.yaml index 91c6e3826..27a80491d 100644 --- a/pkgs/path_py.yaml +++ b/pkgs/path_py.yaml @@ -5,5 +5,5 @@ dependencies: run: [setuptools-scm] sources: - - key: tar.gz:fyij7ebk5vfhtgoumxsozbcwyeis4zly - url: https://pypi.python.org/packages/source/p/path.py/path.py-8.1.1.tar.gz + - key: tar.gz:z57v4oyhn6dgsjblv6n5zuc54gwmioyu + url: https://pypi.python.org/packages/42/4c/3dcdf4f3f1e9d9b14f43e1dde88fe8ae30ebfe8c4d08bf58ed1a4d5a1f5a/path.py-9.0.tar.gz diff --git a/pkgs/pathlib2.yaml b/pkgs/pathlib2.yaml new file mode 100644 index 000000000..93479fab0 --- /dev/null +++ b/pkgs/pathlib2.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:32z2sygb2vmgrx54vsmegi2yxev2rhmv + url: https://pypi.python.org/packages/c9/27/8448b10d8440c08efeff0794adf7d0ed27adb98372c70c7b38f3947d4749/pathlib2-2.1.0.tar.gz diff --git a/pkgs/paver.yaml b/pkgs/paver.yaml index 5d0685229..b5f059d6b 100644 --- a/pkgs/paver.yaml +++ b/pkgs/paver.yaml @@ -1,5 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + +dependencies: + build: [] + run: [] sources: -- key: tar.gz:dzvyiiupdv3zc33kmb5gaofyxuxapefe - url: https://pypi.python.org/packages/source/P/Paver/Paver-1.2.2.tar.gz + - key: tar.gz:nykvnbxnuvb7hkdd54ouhcn44oe2s44e + url: https://pypi.python.org/packages/1c/07/55ed066a8c4eabe2ccd340fa08a5440c189c0eff51cfb56bc4582e2435ba/Paver-1.2.4.tar.gz diff --git a/pkgs/pbr.yaml b/pkgs/pbr.yaml index 6f060051f..3ef771bd7 100644 --- a/pkgs/pbr.yaml +++ b/pkgs/pbr.yaml @@ -2,7 +2,8 @@ extends: [setuptools_package] dependencies: build: [pip] + run: [] sources: - - key: tar.gz:u5awkddjpk7j3u62aabzuv5elik2n3wq - url: https://pypi.python.org/packages/source/p/pbr/pbr-0.10.8.tar.gz + - key: tar.gz:dbscrqtqgcpg7x7c2wvqssnlegxf67pk + url: https://pypi.python.org/packages/c3/2c/63275fab26a0fd8cadafca71a3623e4d0f0ee8ed7124a5bb128853d178a7/pbr-1.10.0.tar.gz diff --git a/pkgs/pcre.yaml b/pkgs/pcre.yaml index 023ea325d..e6a3b8f4d 100644 --- a/pkgs/pcre.yaml +++ b/pkgs/pcre.yaml @@ -6,14 +6,19 @@ sources: build_stages: - name: configure - extra: [ - "--disable-dependency-tracking", - "--enable-utf8", - "--enable-pcre8", - "--enable-pcre16", - "--enable-pcre32", - "--enable-unicode-properties", - # We need to figure out how to pass our own libz and bzip2: - #"--enable-pcregrep-libz", - #"--enable-pcregrep-libbz2", - "--enable-jit"] + handler: bash + mode: replace + bash: | + ./configure --prefix=${ARTIFACT} --enable-shared + +- when: platform == 'Cygwin' + name: configure + handler: bash + mode: replace + bash: | + cp /usr/share/automake-1.9/config.guess acaux + bash configure --prefix=${ARTIFACT} --enable-shared + +when_build_dependency: + - prepend_path: PATH + value: '${ARTIFACT}/bin' diff --git a/pkgs/pcs_api.yaml b/pkgs/pcs_api.yaml index 3f891686a..58d90feb1 100644 --- a/pkgs/pcs_api.yaml +++ b/pkgs/pcs_api.yaml @@ -2,7 +2,8 @@ extends: [setuptools_package] dependencies: build: [requests, oauthlib, requests_oauthlib] + run: [] sources: - key: zip:3wtk6la7p2coqy4ps6t2rzh46ob6k5ja - url: https://pypi.python.org/packages/source/p/pcs-api/pcs-api-1.0.2.zip + url: https://pypi.python.org/packages/b2/36/bcff55800e0f0c8eee1c7ef1fad277919eb3835366d304147c922358a15e/pcs-api-1.0.2.zip diff --git a/pkgs/perl.yaml b/pkgs/perl.yaml index 1ea9da9db..2af771590 100644 --- a/pkgs/perl.yaml +++ b/pkgs/perl.yaml @@ -8,7 +8,7 @@ dependencies: sources: - key: tar.gz:j2gcrllozsezal44wltw6kavxmnifb66 - url: http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz + url: http://www.cpan.org/src/5.0/perl-5.24.0.tar.gz build_stages: - name: configure diff --git a/pkgs/petsc/petsc.py b/pkgs/petsc/petsc.py index ba0d5bdae..dc4d8bd94 100644 --- a/pkgs/petsc/petsc.py +++ b/pkgs/petsc/petsc.py @@ -1,7 +1,7 @@ from hashdist import build_stage def preConfigureCrayXE6(ctx, conf_lines): - conf_lines += ['LDFLAGS=' + ctx.parameters['DYNAMIC_EXE_LINKER_FLAGS'], + conf_lines += ['LDFLAGS=-dynamic /usr/lib64/libcpuset.so.1 /usr/lib64/libbitmask.so.1', '--known-mpi-shared-libraries=1', '--with-batch', '--known-level1-dcache-size=16384', @@ -30,6 +30,8 @@ def preConfigureSGIICEX(ctx, conf_lines): '--known-mpi-shared-libraries=1', '--with-pic', '--with-batch', + '--known-sdot-returns-double=0', + '--known-snrm2-returns-double=0', '--known-level1-dcache-size=16384', '--known-level1-dcache-linesize=64', '--known-level1-dcache-assoc=4', @@ -50,7 +52,7 @@ def preConfigureSGIICEX(ctx, conf_lines): '--known-mpi-c-double-complex=1', '--known-mpi-int64_t=1', '--with-pthread=1', - '--with-blas-lapack-lib=[mkl_rt]'] + '--with-blas-lapack-lib="-L/app/unsupported/COST/lapack/3.5.0/gnu/lib -llapack -L/app/unsupported/COST/gotoblas2/1.13/gnu/lib -lgoto2 -llapacke -lrefblas -ltmglib -lgfortran"'] @build_stage() def configure(ctx, stage_args): @@ -107,7 +109,7 @@ def configure(ctx, stage_args): conf_lines.append('--with-ssl=0') # Special case, --with-blas-dir does not work with OpenBLAS - if 'OPENBLAS' in ctx.dependency_dir_vars: + if 'OPENBLAS' in ctx.dependency_dir_vars or ('BLAS' in ctx.dependency_dir_vars and ctx.parameters.get('openblas') == True): if ctx.parameters['platform'] == 'Darwin': libopenblas = '${OPENBLAS_DIR}/lib/libopenblas.dylib' else: @@ -160,12 +162,12 @@ def configure(ctx, stage_args): continue if dep_var == 'MPI': conf_lines.append('--with-mpi-compilers') - conf_lines.append('CC=$MPICC') - conf_lines.append('CXX=$MPICXX') + conf_lines.append('CC=mpicc') + conf_lines.append('CXX=mpicxx') if ctx.parameters['fortran']: - conf_lines.append('F77=$MPIF77') - conf_lines.append('F90=$MPIF90') - conf_lines.append('FC=$MPIF90') + conf_lines.append('F77=mpif90') + conf_lines.append('F90=mpif90') + conf_lines.append('FC=mpif90') else: conf_lines.append('--with-fc=0') continue diff --git a/pkgs/petsc/petsc.yaml b/pkgs/petsc/petsc.yaml index 45fe482ad..c8dba9c90 100644 --- a/pkgs/petsc/petsc.yaml +++ b/pkgs/petsc/petsc.yaml @@ -1,7 +1,23 @@ extends: [autotools_package] dependencies: - build: [blas, mpi, python, {{build_with}}] + build: [blas, mpi, python, cmake, {{build_with}}] +when version == 'master': + sources: + - key: git:8c405a35e3463db34467c44b5b94e7b81d895f6d + url: https://bitbucket.org/petsc/petsc +when version == '3.7.6': + sources: + - key: tar.gz:wb7xwtsx25pzqj4hxwawt55y326vv3re + url: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.7.6.tar.gz +when version == '3.7.5': + sources: + - key: tar.gz:2z3yd2x4qctstavsoeghejihe3ehth6b + url: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.7.5.tar.gz +when version == '3.7.4': + sources: + - key: tar.gz:skvlms373heeshxp77kmz27fzcqlvefe + url: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-lite-3.7.4.tar.gz when version == '3.6.1': sources: - key: tar.gz:v2wbaflfus5gbhb7h4j23jdvoif42mve diff --git a/pkgs/petsc4py/petsc4py.yaml b/pkgs/petsc4py/petsc4py.yaml index 9383054bd..8e2eb40e9 100644 --- a/pkgs/petsc4py/petsc4py.yaml +++ b/pkgs/petsc4py/petsc4py.yaml @@ -49,6 +49,13 @@ build_stages: # PATH=$PATH:$PETSC_DIR/bin \ # $PYTHON runtests.py) +when version == 'master': #note, update commits on petsc and petsc4py to use master + - key: git:8c9fc3a08c95098a208468fe9546fa5952638d12 + url: https://bitbucket.org/petsc/petsc4py +when version == '3.7.0': + sources: + - key: tar.gz:4h62pjucmtb6ziqbj4st57spgbx2shln + url: https://pypi.python.org/packages/b3/d5/84a71e3ccc13bf90b5055d264e5b256d161ae513392d0f28e8a7ac80d15c/petsc4py-3.7.0.tar.gz when version == '3.6.0': sources: - key: tar.gz:oisw2tnx6vupm6eiqsnav3xrnzikgmkr diff --git a/pkgs/petsc4py/petsc4py_install_conf_3.7.0.patch b/pkgs/petsc4py/petsc4py_install_conf_3.7.0.patch new file mode 100644 index 000000000..372dd3656 --- /dev/null +++ b/pkgs/petsc4py/petsc4py_install_conf_3.7.0.patch @@ -0,0 +1,34 @@ +diff --git a/conf/petscconf.py b/conf/petscconf.py +index 8cd322c..65337b3 100644 +--- a/conf/petscconf.py ++++ b/conf/petscconf.py +@@ -14,8 +14,8 @@ __all__ = ['setup', + + # -------------------------------------------------------------------- + +-from conf.baseconf import setup, Extension +-from conf.baseconf import config, build, build_src, build_ext, install +-from conf.baseconf import clean, test, sdist ++from .baseconf import setup, Extension ++from .baseconf import config, build, build_src, build_ext, install ++from .baseconf import clean, test, sdist + + # -------------------------------------------------------------------- +diff --git a/setup.py b/setup.py +index 381d006..369e9b1 100755 +--- a/setup.py ++++ b/setup.py +@@ -114,9 +114,11 @@ def run_setup(): + setup_args['setup_requires'] = ['Cython>='+CYTHON] + # + setup(packages = ['petsc4py', +- 'petsc4py.lib',], ++ 'petsc4py.lib', ++ 'petsc4py.conf'], + package_dir = {'petsc4py' : 'src', +- 'petsc4py.lib' : 'src/lib'}, ++ 'petsc4py.lib' : 'src/lib', ++ 'petsc4py.conf': 'conf'}, + package_data = {'petsc4py' : ['include/petsc4py/*.h', + 'include/petsc4py/*.i', + 'include/petsc4py/*.pxd', diff --git a/pkgs/pexpect.yaml b/pkgs/pexpect.yaml index c5522b81e..9a941f3e0 100644 --- a/pkgs/pexpect.yaml +++ b/pkgs/pexpect.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: -- key: zip:4bpxtrpj4y6k7gr7yunxvgtlpdbrnxqc - url: https://github.com/pexpect/pexpect/archive/3.3.zip + - key: tar.gz:hujsiznhlnl2vamdihdfee4subwmmyh6 + url: https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98/pexpect-4.2.1.tar.gz diff --git a/pkgs/pi.yaml b/pkgs/pi.yaml new file mode 100644 index 000000000..941a2145e --- /dev/null +++ b/pkgs/pi.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:rvidu6idc737xttunhcbmdsewhdwjesx + url: https://pypi.python.org/packages/c5/49/b6bf523a86a63dd364ae0fb6df85645961af166855cf038b361a31d5d504/pi-0.1.2.tar.gz diff --git a/pkgs/pickleshare.yaml b/pkgs/pickleshare.yaml index d13b016aa..7f1167dcd 100644 --- a/pkgs/pickleshare.yaml +++ b/pkgs/pickleshare.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:yc7foridlvbx3p2vvfxwbn3renc3cjbd - url: https://pypi.python.org/packages/source/p/pickleshare/pickleshare-0.5.tar.gz + - key: tar.gz:qsusk4rh37ow7ynuxyjrsclmedvyl7y6 + url: https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525/pickleshare-0.7.4.tar.gz diff --git a/pkgs/pip.yaml b/pkgs/pip.yaml index 6f82388b3..7c91afc7d 100644 --- a/pkgs/pip.yaml +++ b/pkgs/pip.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: -- key: tar.gz:zichtbxqkkgpvf22ct5z67yqmjy5jygd - url: https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz + - key: tar.gz:bhzehynhwrq7mvgcnjzf7i3teen3p7yx + url: https://pypi.python.org/packages/11/b6/abcb525026a4be042b486df43905d6893fb04f05aac21c32c638e939e447/pip-9.0.1.tar.gz diff --git a/pkgs/pkgconfig.yaml b/pkgs/pkgconfig.yaml new file mode 100644 index 000000000..9d06b6ea9 --- /dev/null +++ b/pkgs/pkgconfig.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package,libflags] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:g2c3uavjw4tfjj3ew4ulkwpte7q5xv64 + url: https://pypi.python.org/packages/9d/ba/80910bbed2b4e646a6adab4474d2e506744c260c7002a0e6b41ef8750d8d/pkgconfig-1.2.2.tar.gz diff --git a/pkgs/pluggy.yaml b/pkgs/pluggy.yaml new file mode 100644 index 000000000..f0f6b594a --- /dev/null +++ b/pkgs/pluggy.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:p6fop5n565lhdjyy2lnpbjslpcc7oriq + url: https://pypi.python.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz diff --git a/pkgs/ply.yaml b/pkgs/ply.yaml index 2a14784b2..792b4cecf 100644 --- a/pkgs/ply.yaml +++ b/pkgs/ply.yaml @@ -1,6 +1,9 @@ extends: [setuptools_package] -sources: - - url: http://www.dabeaz.com/ply/ply-3.4.tar.gz - key: tar.gz:v5bv6enxxxlj3jp7xq76zogxbjyhh3ev +dependencies: + build: [] + run: [] +sources: + - key: tar.gz:bv7csqfzyvyvcojpz2vgfmeglrc6a3hb + url: https://pypi.python.org/packages/a8/4d/487e12d0478ee0cbb15d6fe9b8916e98fe4e2fce4cc65e4de309209c0b24/ply-3.9.tar.gz diff --git a/pkgs/povray.yaml b/pkgs/povray.yaml new file mode 100644 index 000000000..5a868b983 --- /dev/null +++ b/pkgs/povray.yaml @@ -0,0 +1,26 @@ +extends: [autotools_package] + +dependencies: + build: [boost,zlib,png] + +sources: + - url: https://github.com/POV-Ray/povray + key: git:39ce8a24e50651904010dda15872d63be15d7c37 + +build_stages: +- name: prebuild + after: prologue + before: configure + handler: bash + bash: | + cd unix + ./prebuild.sh + cp Makefile.in .. + cd .. + +- name: configure + after: prologue + mode: replace + handler: bash + bash: | + ./configure --prefix=${ARTIFACT} COMPILED_BY="hashdist " --with-boost=${BOOST_DIR} --with-zlib=${ZLIB_DIR} --without-libtiff --with-libpng=${PNG_DIR} --without-libjpeg NON_REDISTRIBUTABLE_BUILD=yes BOOST_MULTITHREADED="ON" LDFLAGS="-Wl,-rpath=${BOOST_DIR}/lib -L${BOOST_DIR}/lib" LIBS="-lboost_thread -lboost_system -Wl,-rpath=${ZLIB_DIR}/lib -L${ZLIB_DIR} -Wl,-rpath=${PNG_DIR}/lib -L${PNG_DIR}/lib" diff --git a/pkgs/prompt-toolkit.yaml b/pkgs/prompt-toolkit.yaml index 3c0f5d4b5..d64174cf2 100644 --- a/pkgs/prompt-toolkit.yaml +++ b/pkgs/prompt-toolkit.yaml @@ -1,8 +1,9 @@ extends: [setuptools_package] dependencies: + build: [wcwidth] run: [wcwidth] sources: - - key: tar.gz:keeo3htoidjizmo4sc5fmomhqwjdckex - url: https://pypi.python.org/packages/0b/2c/ab26db81e5b9c2f179a2e9d797f2ce0d11f7cc3308830831de0daad8629e/prompt_toolkit-1.0.0.tar.gz + - key: tar.gz:zvsshm3k3qluzqinksyrspvwe22cnbqj + url: https://pypi.python.org/packages/83/14/5ac258da6c530eca02852ee25c7a9ff3ca78287bb4c198d0d0055845d856/prompt_toolkit-1.0.9.tar.gz diff --git a/pkgs/proteus.yaml b/pkgs/proteus.yaml index a5b3e4064..a3be62380 100644 --- a/pkgs/proteus.yaml +++ b/pkgs/proteus.yaml @@ -1,11 +1,14 @@ extends: [namespace_package] + dependencies: - build: [daetk, numpy, mpi, python, cmake, cython, petsc, petsc4py, superlu, triangle] - run: [daetk, ipython, matplotlib, nose, mpi4py, petsc4py, pytables, sphinx, superlu, sympy, tetgen, triangle] + build: [daetk, matplotlib, numpy, mpi, python, cmake, cython, petsc, petsc4py, triangle, hdf5, blas, scorec, zoltan, parmetis, chrono] + run: [daetk, matplotlib, numpy, mpi, python, cmake, cython, petsc, petsc4py, triangle, hdf5, blas, scorec, zoltan, parmetis, chrono, nose, pytest] -sources: - - key: git:1806eeddee64277b48cfbc79155752b2617e53f8 - url: https://github.com/erdc-cm/proteus +build_stages: + - before: install + handler: bash + bash: | + export PROTEUS_ARCH=$(python -c "import sys; print sys.platform") # Proteus is a namespace package, do *not* link the Proteus directory itself in. profile_links: @@ -13,3 +16,7 @@ profile_links: mode: replace link: 'lib/python{{pyver}}/site-packages/proteus/**/*' dirs: true + +sources: +- key: zip:j3m6pwimnphvfdyd7sxttuze4niexmvz + url: https://github.com/erdc/proteus/archive/93e6969356e1cf392cf7e642fda4611d93a790aa.zip diff --git a/pkgs/psutil.yaml b/pkgs/psutil.yaml index 0789a589f..c5c745e45 100644 --- a/pkgs/psutil.yaml +++ b/pkgs/psutil.yaml @@ -1,5 +1,10 @@ -extends: [distutils_package] +extends: [distutils_package, libflags] + +dependencies: + build: [] + run: [] sources: -- url: https://pypi.python.org/packages/source/p/psutil/psutil-2.1.1.tar.gz - key: tar.gz:x6asusvguqiupuhjnzr5qjxlowbp3jvv +- key: zip:kqi6elddc2bcb5fyzrbp2bpks323lzs6 + url: https://pypi.python.org/packages/93/7f/347309562d30c688299727e65f4d76ef34180c406dfb6f2c7b6c8d746e13/psutil-5.0.0.zip + diff --git a/pkgs/ptyprocess.yaml b/pkgs/ptyprocess.yaml index f0aff072d..204b762ff 100644 --- a/pkgs/ptyprocess.yaml +++ b/pkgs/ptyprocess.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:3s3y7mqzpne4ug33f433ar54rhanu6uq - url: https://pypi.python.org/packages/source/p/ptyprocess/ptyprocess-0.5.tar.gz + - key: tar.gz:auym4y5jffn7vz55a3w4ak3kve2wdh2i + url: https://pypi.python.org/packages/db/d7/b465161910f3d1cef593c5e002bff67e0384898f597f1a7fdc8db4c02bf6/ptyprocess-0.5.1.tar.gz diff --git a/pkgs/py.yaml b/pkgs/py.yaml index a309ecc60..1983721bd 100644 --- a/pkgs/py.yaml +++ b/pkgs/py.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: - - url: https://pypi.python.org/packages/source/p/py/py-1.4.29.tar.gz - key: tar.gz:e6pbc4rt6ic54hsg5q3ow772lgm7dpct +- key: tar.gz:zimjiprienkbo5ldc2723jwns2zdzzqn + url: https://pypi.python.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz diff --git a/pkgs/py2gmsh.yaml b/pkgs/py2gmsh.yaml new file mode 100644 index 000000000..27b625eb8 --- /dev/null +++ b/pkgs/py2gmsh.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:mzpxltoey5uxj6tgmy5twntg3x4vgl77 + url: https://pypi.python.org/packages/bf/ef/5f51254c3c80a30a9b6c38abedfb1e66e94bd854625f928d02598533a3e8/py2gmsh-0.1.2.tar.gz diff --git a/pkgs/pyOpenSSL.yaml b/pkgs/pyOpenSSL.yaml index 8030e3243..2c7b5e0d2 100644 --- a/pkgs/pyOpenSSL.yaml +++ b/pkgs/pyOpenSSL.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz - key: tar.gz:vgo3rzm4ciatrlmkolxm5xgcjncrbuxo + - key: tar.gz:o542ho5xjz45wi2k62qio5kwrrtwtnmc + url: https://pypi.python.org/packages/0c/d6/b1fe519846a21614fa4f8233361574eddb223e0bc36b182140d916acfb3b/pyOpenSSL-16.2.0.tar.gz diff --git a/pkgs/pyasn1-modules.yaml b/pkgs/pyasn1-modules.yaml index c161cb9c3..35fb591c8 100644 --- a/pkgs/pyasn1-modules.yaml +++ b/pkgs/pyasn1-modules.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/p/pyasn1-modules/pyasn1-modules-0.0.5.tar.gz - key: tar.gz:xzs7adwsryyhk3y66ojxpszyesakenug + - key: tar.gz:cblbsnhrqkn4yrk4p3g43lg3jps77u3j + url: https://pypi.python.org/packages/60/32/7703bccdba05998e4ff04db5038a6695a93bedc45dcf491724b85b5db76a/pyasn1-modules-0.0.8.tar.gz diff --git a/pkgs/pyasn1.yaml b/pkgs/pyasn1.yaml index 90bc6b5c0..b4bbd654b 100644 --- a/pkgs/pyasn1.yaml +++ b/pkgs/pyasn1.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/p/pyasn1/pyasn1-0.1.7.tar.gz - key: tar.gz:4t4b2u6fgp3l3fjgwbd7ar7xwea4esvr + - key: tar.gz:qu6kzwlnd5yb3xlhvib6zqc7kgeqcnnx + url: https://pypi.python.org/packages/f7/83/377e3dd2e95f9020dbd0dfd3c47aaa7deebe3c68d3857a4e51917146ae8b/pyasn1-0.1.9.tar.gz diff --git a/pkgs/pybind11.yaml b/pkgs/pybind11.yaml new file mode 100644 index 000000000..56502ce02 --- /dev/null +++ b/pkgs/pybind11.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:vfvjet5onytsd357et2hkyjij7i6uc3f + url: https://pypi.python.org/packages/c9/f7/fc9c44bf088d942c71b04646891034036a63e5bd00daff1c9a377e0f5a9f/pybind11-2.2.1.tar.gz diff --git a/pkgs/pycgal.yaml b/pkgs/pycgal.yaml index 38c37b8f3..801720274 100644 --- a/pkgs/pycgal.yaml +++ b/pkgs/pycgal.yaml @@ -1,10 +1,13 @@ extends: [cmake_package] dependencies: - build: [cgal,python,swig] + build: [cgal,python,swig,zlib] + +defaults: + relocatable: false sources: -- key: git:28817d133f4a7d64c7048fefde6ba7fd2bda1ad4 +- key: git:97d63c81781c9c09a9ed1f6e63212393c9b5d40e url: https://github.com/CGAL/cgal-swig-bindings.git build_stages: @@ -15,18 +18,16 @@ build_stages: export PYTHONPATH=${ARTIFACT}/{{python_site_packages_rel}}:$PYTHONPATH mkdir -p ${ARTIFACT}/{{python_site_packages_rel}} - name: configure - extra: ['-DBUILD_PYTHON:BOOL=ON', + extra: ['-DPYTHON_EXECUTABLE:PATH=${PYTHON}', + '-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_DIR}/include/python2.7', + '-DPYTHON_LIBRARY:PATH=${PYTHON_DIR}/lib/libpython2.7.so', + '-DBUILD_PYTHON:BOOL=ON', '-DBUILD_JAVA:BOOL=OFF', + '-DSWIG_DIR:PATH=${SWIG_DIR}', + '-DSWIG_DIR:PATH=${SWIG_DIR}', '-DCGAL_DIR:PATH=${CGAL_DIR}/lib/CGAL', - '-DPYTHON_OUTDIR_PREFIX:PATH=${ARTIFACT}/{{python_site_packages_rel}}'] -- name: install - mode: replace - handler: bash - after: make - bash: | - cp lib/* ${ARTIFACT}/lib - - # Remove easy_install pth files + '-DZLIB_INCLUDE_DIR:PATH=${ZLIB_DIR}/include', + '-DZLIB_LIBRARY_RELEASE:PATH=${ZLIB_DIR}/lib/libz.so'] - name: cleanup after: install handler: bash diff --git a/pkgs/pycparser.yaml b/pkgs/pycparser.yaml index ab43ff3b4..56ea45420 100644 --- a/pkgs/pycparser.yaml +++ b/pkgs/pycparser.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/p/pycparser/pycparser-2.10.tar.gz - key: tar.gz:sv6zrntbyc3ewwakw34uwes6bg3hcqku + - key: tar.gz:bkwdd2ixyjglgnl7ljgvkzxszsi2dhfe + url: https://pypi.python.org/packages/be/64/1bb257ffb17d01f4a38d7ce686809a736837ad4371bcc5c42ba7a715c3ac/pycparser-2.17.tar.gz diff --git a/pkgs/pydap.yaml b/pkgs/pydap.yaml index 703c530f4..9b066581f 100644 --- a/pkgs/pydap.yaml +++ b/pkgs/pydap.yaml @@ -1,9 +1,9 @@ -extends: [namespace_package] +extends: [setuptools_package] dependencies: build: [paver] run: [httplib2] sources: -- key: tar.gz:ggxvshjej45j2n42b4bbousdqlkhh7je - url: https://pypi.python.org/packages/source/P/Pydap/Pydap-3.1.1.tar.gz + - key: tar.gz:q3okm2pyj3wlu37wpl37umzsv4skafr2 + url: https://pypi.python.org/packages/c1/1d/727262a03998c7ea406d15301513d67f0815c95dac4cfbd5418d92911667/Pydap-3.2.0.tar.gz diff --git a/pkgs/pygments.yaml b/pkgs/pygments.yaml index 1ca4a6acd..1a27c4b40 100644 --- a/pkgs/pygments.yaml +++ b/pkgs/pygments.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: - - key: tar.gz:omqjdeee43nmr5cuay4kizchuo6xgd6k - url: https://pypi.python.org/packages/source/P/Pygments/Pygments-2.0.2.tar.gz + - key: tar.gz:rdsmrki3fl2zmk72l2rei7wg3u2xaghi + url: https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/Pygments-2.1.3.tar.gz diff --git a/pkgs/pygrib.yaml b/pkgs/pygrib.yaml index bb8eb91f7..1f2b8ffad 100644 --- a/pkgs/pygrib.yaml +++ b/pkgs/pygrib.yaml @@ -1,12 +1,12 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: - build: [python, jasper, grib_api, pyproj, numpy] + build: [python, jasper, grib_api, pyproj, numpy, png, zlib] run: [python, pyproj] sources: -- key: git:db179ce3dccee59bb41ca812c4b02750be74239f - url: https://github.com/jswhit/pygrib.git + - key: tar.gz:qlvv4ybxef7x54qakip7zegftqo3maem + url: https://pypi.python.org/packages/3c/16/d128a64f2f5e9f776d6e080ba62551b5d103a4c0acb283204135bd23f14e/pygrib-2.0.2.tar.gz build_stages: - name: create-setup.cfg @@ -17,5 +17,6 @@ build_stages: [directories] grib_api_dir=${GRIB_API_DIR} jasper_dir=${JASPER_DIR} + png_dir=${PNG_DIR} + zlib_dir=${ZLIB_DIR} EOF - diff --git a/pkgs/pyjulia.yaml b/pkgs/pyjulia.yaml new file mode 100644 index 000000000..7418374bd --- /dev/null +++ b/pkgs/pyjulia.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: +- key: zip:psxwe4bf2duqmcfx6bldagqxnh3ihlyz + url: https://github.com/JuliaPy/pyjulia/archive/acef65c34f22bc99ad8d54fe6e828525e917d7c4.zip diff --git a/pkgs/pyparsing.yaml b/pkgs/pyparsing.yaml index 5ef699957..dcc69cb7c 100644 --- a/pkgs/pyparsing.yaml +++ b/pkgs/pyparsing.yaml @@ -5,7 +5,7 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/p/pyparsing/pyparsing-2.0.1.zip - key: zip:pylwn3tuptfht7qxfntq7vj66wh4kxjl + - key: zip:bktorwgd7hcepkk2go5qjmid5lldaeq4 + url: https://pypi.python.org/packages/30/c5/a4f214f66fbdb868d20d5811635d08e386f63a9591c5756ef717b3115796/pyparsing-2.1.10.zip licenses: [MIT] diff --git a/pkgs/pyproj.yaml b/pkgs/pyproj.yaml index cb49c3cbf..dd952998f 100644 --- a/pkgs/pyproj.yaml +++ b/pkgs/pyproj.yaml @@ -1,8 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + dependencies: build: [python] run: [python] sources: -- key: git:bb005aca2d933d77b78c0018f8b5d04c471b4608 - url: https://github.com/jswhit/pyproj.git + - key: tar.gz:kp5fjsh2rio7zvvpjpyjzynk4xknsso2 + url: https://pypi.python.org/packages/29/72/5c1888c4948a0c7b736d10e0f0f69966e7c0874a660222ed0a2c2c6daa9f/pyproj-1.9.5.1.tar.gz diff --git a/pkgs/pytables/pytables.yaml b/pkgs/pytables/pytables.yaml index 0e2e579d3..4e2a36907 100644 --- a/pkgs/pytables/pytables.yaml +++ b/pkgs/pytables/pytables.yaml @@ -1,23 +1,23 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: build: [mpi, hdf5, numpy, numexpr, cython, zlib, szip] run: [mpi, hdf5, numpy, numexpr, cython, zlib, szip] sources: - - url: https://pypi.python.org/packages/source/t/tables/tables-2.4.0.tar.gz - key: tar.gz:fpndwh734ihogxktg7mxa4p7if32o5bl +- key: tar.gz:7w56utw3nowqvqhfh7d3y2lq46hbf3xu + url: https://pypi.python.org/packages/a2/e5/697f7ec96c4808983711635ef2e4c6b217493343938410125bcece1642cf/tables-3.4.2.tar.gz build_stages: -- name: fix_setup_paths - files: [pytables_fix_setup_paths.patch] - before: install - handler: bash - bash: | - patch -p1 < _hashdist/pytables_fix_setup_paths.patch - - name: install mode: replace after: setup_dirs handler: bash bash: | - CC=${MPICC} CXX=${MPICXX} ${PYTHON} setup.py install --prefix=${ARTIFACT} --lflags="-Wl,-rpath,${HDF5_DIR}/lib -L${HDF5_DIR}/lib -lhdf5 -Wl,-rpath,${ZLIB_DIR}/lib -L${ZLIB_DIR} -lz -Wl,-rpath,${SZIP_DIR}/lib -L${SZIP_DIR}/lib -lszip" \ No newline at end of file + CC=${MPICC} CXX=${MPICXX} ${PYTHON} -c 'import setuptools; __file__="setup.py"; exec(open(__file__).read())' \ + ${SETUPTOOLS_PACKAGE_EXTRA_OPTIONS} \ + install \ + --prefix=. --root=${ARTIFACT} \ + --single-version-externally-managed \ + --lflags="-Wl,-rpath,${HDF5_DIR}/lib -L${HDF5_DIR}/lib -lhdf5 \ + -Wl,-rpath,${ZLIB_DIR}/lib -L${ZLIB_DIR} -lz \ + -Wl,-rpath,${SZIP_DIR}/lib -L${SZIP_DIR}/lib -lszip" diff --git a/pkgs/pytables/pytables_fix_compare_version.patch b/pkgs/pytables/pytables_fix_compare_version.patch new file mode 100644 index 000000000..de4436d4d --- /dev/null +++ b/pkgs/pytables/pytables_fix_compare_version.patch @@ -0,0 +1,29 @@ +diff --unified -r pytables/setup.py pytables-fix-compare-version/setup.py +--- pytables/setup.py 2016-05-13 09:22:20.000000000 -0500 ++++ pytables-fix-compare-version/setup.py 2016-05-13 09:38:24.000000000 -0500 +@@ -22,6 +22,7 @@ + from distutils.dep_util import newer + from distutils.util import convert_path + from distutils.ccompiler import new_compiler ++from distutils.version import LooseVersion + + # The minimum required versions + # (keep these in sync with tables.req_versions and user's guide and README) +@@ -60,7 +61,7 @@ + "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" + % {'pkgname': pkgname, 'pkgver': pkgver} ) + else: +- if mod.__version__ < pkgver: ++ if LooseVersion(mod.__version__) < LooseVersion(pkgver): + exit_with_error( + "You need %(pkgname)s %(pkgver)s or greater to run PyTables!" + % {'pkgname': pkgname, 'pkgver': pkgver} ) +@@ -84,7 +85,7 @@ + "You need %(pkgname)s %(pkgver)s or greater to compile PyTables!" + % {'pkgname': 'Cython', 'pkgver': min_cython_version} ) + +-if Version.version < min_cython_version: ++if LooseVersion(Version.version) < LooseVersion(min_cython_version): + exit_with_error( + "At least Cython %s is needed so as to generate extensions!" + % (min_cython_version) ) diff --git a/pkgs/pytest-cov.yaml b/pkgs/pytest-cov.yaml index 9d7111b68..f5ff46848 100644 --- a/pkgs/pytest-cov.yaml +++ b/pkgs/pytest-cov.yaml @@ -1,9 +1,9 @@ extends: [setuptools_package] dependencies: - build: [coverage, pytest] - run: [coverage, pytest] + build: [coverage, pytest, py] + run: [coverage, pytest, py] sources: -- key: tar.gz:vczc4u7h6o4xcrkmgxpztx76eh2hjh2t - url: https://pypi.python.org/packages/source/p/pytest-cov/pytest-cov-2.2.1.tar.gz +- key: tar.gz:aovhklhrdw2b2ka6uhmapwkuytw2gxh2 + url: https://pypi.python.org/packages/24/b4/7290d65b2f3633db51393bdf8ae66309b37620bc3ec116c5e357e3e37238/pytest-cov-2.5.1.tar.gz diff --git a/pkgs/pytest-forked.yaml b/pkgs/pytest-forked.yaml new file mode 100644 index 000000000..d199adf05 --- /dev/null +++ b/pkgs/pytest-forked.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:4riazucqt3ckezjv67kbckumydyx2osb + url: https://pypi.python.org/packages/b3/b2/1ec910b0f798cc86f2531631d7a2da030b16c165e07545537332fd4eb505/pytest-forked-0.2.tar.gz diff --git a/pkgs/pytest-xdist.yaml b/pkgs/pytest-xdist.yaml new file mode 100644 index 000000000..da5834b3c --- /dev/null +++ b/pkgs/pytest-xdist.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [pytest,py,apipkg,execnet] + run: [pytest-forked] + +sources: +- key: tar.gz:5d2xiswme4ft47mrlpnu2x2hczypasnw + url: https://pypi.python.org/packages/5d/be/f3c5a5edf6161d17d90fe458281249bebb7aba1af076621a19b007d632fa/pytest-xdist-1.22.2.tar.gz diff --git a/pkgs/pytest.yaml b/pkgs/pytest.yaml index a475b652a..2615b9d43 100644 --- a/pkgs/pytest.yaml +++ b/pkgs/pytest.yaml @@ -1,8 +1,9 @@ extends: [setuptools_package] dependencies: - run: [py] + build: [py,funcsigs,pluggy,attrs] + run: [py,funcsigs,pluggy,attrs] sources: -- key: tar.gz:5u4kg4s3rzchqvk57w2utjbbtsr3uv4v - url: https://pypi.python.org/packages/source/p/pytest/pytest-2.8.6.tar.gz +- key: tar.gz:txolq6oizscz2jkaebfvhgibd6cc4xui + url: https://pypi.python.org/packages/84/11/a6fe751118861b4d6587e07633f2e055733fc3678f7e5d7ae30303d90b7e/pytest-3.4.1.tar.gz diff --git a/pkgs/python-dateutil.yaml b/pkgs/python-dateutil.yaml index d7138ba6b..9c18eee99 100644 --- a/pkgs/python-dateutil.yaml +++ b/pkgs/python-dateutil.yaml @@ -1,12 +1,9 @@ extends: [setuptools_package] -when pyver == '2.7': - # dateutil 2.0 doesn't work in Python 2.7, so we need to keep using - # dateutil 1.5 for Python 2.7: - sources: - - key: tar.gz:ycfmu7mf7d4o5vq6qozueo4csjrmlfvj - url: http://labix.org/download/python-dateutil/python-dateutil-1.5.tar.gz -when pyver != '2.7': - sources: - - key: tar.gz:rkvrfuhjisztwxrupphrsy4btwfnsjoa - url: https://labix.org/download/python-dateutil/python-dateutil-2.0.tar.gz +dependencies: + build: [] + run: [] + +sources: +- key: tar.gz:reodrmvaf5n3dpr6i6jym3en6soh2gn2 + url: https://pypi.python.org/packages/54/bb/f1db86504f7a49e1d9b9301531181b00a1c7325dc85a29160ee3eaa73a54/python-dateutil-2.6.1.tar.gz diff --git a/pkgs/python-netcdf4.yaml b/pkgs/python-netcdf4.yaml index 3b1ea64b2..cc8215ed5 100644 --- a/pkgs/python-netcdf4.yaml +++ b/pkgs/python-netcdf4.yaml @@ -4,8 +4,8 @@ dependencies: run: [netcdf4, numpy] sources: - - url: http://netcdf4-python.googlecode.com/files/netCDF4-1.0.4.tar.gz - key: tar.gz:th26v25of6xje5m5co3zbxpeejvsxded + - key: tar.gz:n77ygruzpivjttl2yrfz3gezyz6bewub + url: https://pypi.python.org/packages/18/a8/4d17df34d66023108c04ce1fe0d7b990e74d4df455630760b9a81a8968cb/netCDF4-1.2.6.tar.gz build_stages: - name: set_mpi_wrapper diff --git a/pkgs/python/python.yaml b/pkgs/python/python.yaml index a00c32e5d..eb7e4cd05 100644 --- a/pkgs/python/python.yaml +++ b/pkgs/python/python.yaml @@ -20,7 +20,10 @@ when pyver == '3.5': sources: - key: tar.gz:nb7am7m7heo2mrkchr7nvaqfxlu5gxw4 url: https://www.python.org/ftp/python/3.5.1/Python-3.5.1.tgz - +when pyver == '3.6': + sources: + - key: tar.gz:pemureyquxyx66wlvnsnompenxfaoauh + url: https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tgz dependencies: @@ -175,6 +178,11 @@ build_stages: $ARTIFACT/bin/python -c "import _sqlite3" echo " ok" + # Test ctypes + echo "import _ctypes" + $ARTIFACT/bin/python -c "import _ctypes" + echo " ok" + when_build_dependency: - set: PYTHON diff --git a/pkgs/pythreejs.yaml b/pkgs/pythreejs.yaml index 9af226188..f071f3b39 100644 --- a/pkgs/pythreejs.yaml +++ b/pkgs/pythreejs.yaml @@ -2,8 +2,8 @@ extends: [setuptools_package] dependencies: build: [ipython, pip, jupyter-pip] + run: [] sources: - - key: git:ac189124bb54fe5a5e65ad6299a21becfbab94c7 - url: https://github.com/jasongrout/pythreejs - + - key: tar.gz:x3h3l2fpcz3gimt23cijkcjxhszw7knn + url: https://pypi.python.org/packages/4f/7d/3144e69d5ad91cedc4f36986972260ab23dbc12b290a3fb1fc83b1f01b99/pythreejs-0.2.3.tar.gz diff --git a/pkgs/pytz.yaml b/pkgs/pytz.yaml index ec2e336e5..b6622ad81 100644 --- a/pkgs/pytz.yaml +++ b/pkgs/pytz.yaml @@ -1,5 +1,9 @@ -extends: [distutils_package] +extends: [setuptools_package] + +dependencies: + build: [] + run: [] sources: - - url: https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2 - key: tar.bz2:mxvuttafw6ix7xogdyp6nwfekewcsxfv + - key: zip:vl57azuxl7rbp3kj27izpmtjapj3ipu4 + url: https://pypi.python.org/packages/c3/8d/d924693a99c592b2ede575b7bffa5dbf95c9fe41e74e084d4d5a751564d0/pytz-2016.10.zip diff --git a/pkgs/pyyaml.yaml b/pkgs/pyyaml.yaml new file mode 100644 index 000000000..39411ff6d --- /dev/null +++ b/pkgs/pyyaml.yaml @@ -0,0 +1,5 @@ +extends: [setuptools_package] + +sources: + - key: zip:llec4qiqit5rfg5olt56wo5ge2wlflzr + url: https://pypi.python.org/packages/6b/f0/a0250248ea260d55748fff586d89a32afbb22656f4498b08d2636a48d4ec/PyYAML-3.12.zip diff --git a/pkgs/pyzmq/pyzmq.yaml b/pkgs/pyzmq/pyzmq.yaml index fbf04a60b..09ccf50af 100644 --- a/pkgs/pyzmq/pyzmq.yaml +++ b/pkgs/pyzmq/pyzmq.yaml @@ -6,16 +6,16 @@ dependencies: - zmq sources: -- key: zip:qofsjfbfwfurfauaojvq5kf4nyawkwlb - url: https://pypi.python.org/packages/source/p/pyzmq/pyzmq-14.7.0.zip + - key: tar.gz:amrfip77lk3pq7irvcqjtrgapxmkc4mq + url: https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55/pyzmq-16.0.2.tar.gz build_stages: -- name: fix_distutils_rpath_flag - files: [fix_distutils_rpath_flag.patch] - before: configure - handler: bash - bash: | - patch -p1 < _hashdist/fix_distutils_rpath_flag.patch +#- name: fix_distutils_rpath_flag +# files: [fix_distutils_rpath_flag.patch] +# before: configure +# handler: bash +# bash: | +# patch -p1 < _hashdist/fix_distutils_rpath_flag.patch - name: configure after: setup_dirs diff --git a/pkgs/qtconsole.yaml b/pkgs/qtconsole.yaml index 8b460ea12..ddcaf4d9c 100644 --- a/pkgs/qtconsole.yaml +++ b/pkgs/qtconsole.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:snzrj5htlppj5yuos6yzske7rla3doqu - url: https://pypi.python.org/packages/source/q/qtconsole/qtconsole-4.2.0.tar.gz + - key: zip:c6ujtgnall5bsvridr6gtahazwfi4c3a + url: https://pypi.python.org/packages/88/fb/222f6c00f0239e9d6fa236f8ccfefa08eeff80972417d9e1e57a4089c885/qtconsole-4.2.1.zip diff --git a/pkgs/rdp.yaml b/pkgs/rdp.yaml index 2e3daabda..555db8713 100644 --- a/pkgs/rdp.yaml +++ b/pkgs/rdp.yaml @@ -1,9 +1,9 @@ extends: [setuptools_package] + dependencies: + build: [] run: [numpy] sources: -- key: tar.gz:36tbip4bzxitlhsoaj5d2m4r4gb2lq5k - url: https://pypi.python.org/packages/source/r/rdp/rdp-0.5.tar.gz - - + - key: tar.gz:comt3os6ul3m3jzqdhzal4woswcm2s5t + url: https://pypi.python.org/packages/8e/94/714899460a64e9f3c9b3bc567a2fc5292814ace1036ba2b9897d90e33b0e/rdp-0.7.tar.gz diff --git a/pkgs/readline.yaml b/pkgs/readline.yaml index 65d828c85..a8ef2b735 100644 --- a/pkgs/readline.yaml +++ b/pkgs/readline.yaml @@ -3,16 +3,24 @@ dependencies: build: [ncurses] sources: - - url: http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz - key: tar.gz:pgtjmbykawgcgpds3vvmnfycdtdevpk6 +- key: tar.gz:ougug4mffbxubi3j4hspi5so3kjsxfcz + url: http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz build_stages: - name: configure mode: override extra: ['--enable-shared', '--with-curses'] - - name: make + - when: platform != 'Darwin' + name: make mode: replace handler: bash bash: | make SHOBJ_CFLAGS="-fPIC -D_REENTRANT" SHOBJ_LDFLAGS="-shared -Wl,-rpath=$NCURSES_DIR/lib" SHLIB_LIBS="-ltinfo" + + - when: platform == 'Darwin' + name: make + mode: replace + handler: bash + bash: | + make SHOBJ_CFLAGS="-fPIC -D_REENTRANT" SHOBJ_LDFLAGS="-shared -Wl,-rpath,$NCURSES_DIR/lib" SHLIB_LIBS="-ltinfo" diff --git a/pkgs/recordtype.yaml b/pkgs/recordtype.yaml new file mode 100644 index 000000000..951129453 --- /dev/null +++ b/pkgs/recordtype.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:xobntqt4tzepybxvl2sgcebeidt2nmc4 + url: https://pypi.python.org/packages/cc/1c/7ff90f4379110d6ef92a7f44ce487f235dbb3243f17c5294a73e0156b6f4/recordtype-1.1.tar.gz diff --git a/pkgs/remus.yaml b/pkgs/remus.yaml new file mode 100644 index 000000000..4d7c801a9 --- /dev/null +++ b/pkgs/remus.yaml @@ -0,0 +1,14 @@ +extends: [cmake_package] +dependencies: + build: [boost, zmq] + +sources: +- url: https://gitlab.kitware.com/cmb/remus.git + key: git:1148df5bb86a2dc9bd61d19edbe6f77c582a5641 + +defaults: + relocatable: true + +build_stages: +- name: configure + extra: ['-D BUILD_SHARED_LIBS:BOOL=ON'] diff --git a/pkgs/requests.yaml b/pkgs/requests.yaml index 7405a47f5..5799e978f 100644 --- a/pkgs/requests.yaml +++ b/pkgs/requests.yaml @@ -1,5 +1,5 @@ -extends: [distutils_package] +extends: [setuptools_package] sources: -- key: tar.gz:pn3tl36twhrdepoj7txqmczybuc7l4ml - url: https://pypi.python.org/packages/source/r/requests/requests-2.5.1.tar.gz + - key: tar.gz:5wmeggqgghrqto2lmpeb2vq4czkielfr + url: https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz diff --git a/pkgs/requests_oauthlib.yaml b/pkgs/requests_oauthlib.yaml index 7ba6de5c7..8676ed97b 100644 --- a/pkgs/requests_oauthlib.yaml +++ b/pkgs/requests_oauthlib.yaml @@ -2,7 +2,8 @@ extends: [setuptools_package] dependencies: build: [requests, oauthlib] + run: [] sources: - - key: tar.gz:mwgzvoufgof6rqorkmwj7nmapm4b3ryw - url: https://pypi.python.org/packages/source/r/requests-oauthlib/requests-oauthlib-0.5.0.tar.gz + - key: tar.gz:dgeaprmsw5kdqsc4rehqia5rvdrwhsdl + url: https://pypi.python.org/packages/46/9b/c28061cc63298bc29ff7d668e18c5293bb522e946aaeb98e4c552d2c0f7b/requests-oauthlib-0.7.0.tar.gz diff --git a/pkgs/rtree.yaml b/pkgs/rtree.yaml index 38260b47f..26fe17c79 100644 --- a/pkgs/rtree.yaml +++ b/pkgs/rtree.yaml @@ -1,4 +1,5 @@ extends: [setuptools_package] + dependencies: build: [libspatialindex] run: [libspatialindex] @@ -13,5 +14,5 @@ build_stages: sed -i -e "s|CDLL(lib_name)|CDLL('${LIBSPATIALINDEX_DIR}/lib/'+lib_name)|g" rtree/core.py sources: -- key: tar.gz:z6kqsl4g4znjefsflhsu6cbegpon6g6t - url: https://pypi.python.org/packages/source/R/Rtree/Rtree-0.7.0.tar.gz +- key: tar.gz:ns446maasy7kni63o55fs65o4k6flrh4 + url: https://pypi.python.org/packages/b0/6c/6cc8d738f14d5efa0c38ec29403bbd9c75e64b3fe84b53290178dda0dbd9/Rtree-0.8.3.tar.gz diff --git a/pkgs/sanitizer.yaml b/pkgs/sanitizer.yaml new file mode 100644 index 000000000..3e4fb3b38 --- /dev/null +++ b/pkgs/sanitizer.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: zip:d7ge4i7t5h7dqelwccrr5icmq2tivzy7 + url: https://pypi.python.org/packages/15/32/a30896c1669a49a027899bfbead902685ae6130276aa7a834b36dbc00a2a/sanitizer-1.0.0.zip diff --git a/pkgs/scandir.yaml b/pkgs/scandir.yaml new file mode 100644 index 000000000..b27b08550 --- /dev/null +++ b/pkgs/scandir.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:yjqs2gsipwapwrybwsurziny7ctjlmno + url: https://pypi.python.org/packages/bd/f4/3143e0289faf0883228017dbc6387a66d0b468df646645e29e1eb89ea10e/scandir-1.5.tar.gz diff --git a/pkgs/scipy/scipy-crayxe6.yaml b/pkgs/scipy/scipy-crayxe6.yaml index c39039c4e..fe307d043 100644 --- a/pkgs/scipy/scipy-crayxe6.yaml +++ b/pkgs/scipy/scipy-crayxe6.yaml @@ -17,8 +17,8 @@ build_stages: bash: | cat > site.cfg << EOF [DEFAULT] - library_dirs = ${ACML_DIR}/gfortran64/lib - libraries = acml + library_dirs = ${CRAY_LIBSCI_PREFIX_DIR}/lib + libraries = sci_gnu EOF - name: set-LDFLAGS @@ -26,8 +26,8 @@ build_stages: before: install handler: bash bash: | - export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${ACML_DIR}/gfortran64/lib $(${PYTHON_DIR}/bin/python-config --ldflags)" + export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib -Wl,-rpath=${CRAY_LIBSCI_PREFIX_DIR}/lib $(${PYTHON_DIR}/bin/python-config --ldflags)" export ATLAS=None - export LAPACK=acml - export BLAS=acml + export LAPACK=sci_gnu + export BLAS=sci_gnu diff --git a/pkgs/scipy/scipy-sgiicex.yaml b/pkgs/scipy/scipy-sgiicex.yaml new file mode 100644 index 000000000..f02a8ee9e --- /dev/null +++ b/pkgs/scipy/scipy-sgiicex.yaml @@ -0,0 +1,34 @@ +when: machine == 'SGIICEX' + +extends: [distutils_package] +dependencies: + build: [blas, lapack, numpy] + run: [blas, lapack, numpy] + +sources: + - url: http://downloads.sourceforge.net/scipy/scipy-0.13.3.tar.gz + key: tar.gz:vhrty7xamdbvzvog5y5mtzpjxo4zegox + +build_stages: + - name: create-site.cfg + after: prologue + before: install + handler: bash + bash: | + cat > site.cfg << EOF + [mkl] + library_dirs = /p/home/apps/intel/parallel_studio_2016/compilers_and_libraries_2016.0.109/linux/mkl/lib/intel64_lin + mkl_libs = mkl_rt + lapack_libs = + EOF + + - name: set-LDFLAGS + after: prologue + before: install + handler: bash + bash: | + export LDFLAGS="-shared -Wl,-rpath=${PYTHON_DIR}/lib" + export ATLAS=None + export LAPACK=None + export BLAS=None + diff --git a/pkgs/scipy/scipy.yaml b/pkgs/scipy/scipy.yaml index 341976e60..725abb9ee 100644 --- a/pkgs/scipy/scipy.yaml +++ b/pkgs/scipy/scipy.yaml @@ -1,14 +1,14 @@ when platform != 'linux': extends: [distutils_package] when platform == 'linux': - extends: [distutils_package, libflags] + extends: [setuptools_package, libflags] dependencies: - build: [lapack, numpy] - run: [lapack, numpy] + build: [blas, lapack, numpy] + run: [blas, lapack, numpy] sources: -- key: tar.gz:trgnf6abhtcaqqrqudufrv3effr5xlp5 - url: https://github.com/scipy/scipy/releases/download/v0.17.1/scipy-0.17.1.tar.gz +- key: tar.gz:q7vb6ena5hwarqte3rsfkhkqd6rqokeu + url: https://github.com/scipy/scipy/releases/download/v1.0.0/scipy-1.0.0.tar.gz build_stages: - when: platform == 'linux' @@ -17,7 +17,8 @@ build_stages: before: install handler: bash bash: | - export LDFLAGS="$LDFLAGS -shared" - #export ATLAS=$LAPACK_DIR - #export BLAS=$LAPACK_DIR - export LAPACK=$LAPACK_DIR + export LDFLAGS="$LDFLAGS -shared $LAPACK_LDFLAGS $BLAS_LDFLAGS" + export ATLAS=None + export OPENBLAS=$OPENBLAS_DIR + export LAPACK=$LAPACK_LDFLAGS + export BLAS=$BLAS_LDFLAGS diff --git a/pkgs/scorec.yaml b/pkgs/scorec.yaml index ab97db06c..0f6e64854 100644 --- a/pkgs/scorec.yaml +++ b/pkgs/scorec.yaml @@ -1,13 +1,17 @@ extends: [cmake_package] dependencies: - build: [mpi, parmetis, zoltan] + build: [mpi, parmetis, zoltan, bzip2] +#changing git->zip b/c of ssl issues on hpcmp platforms +#sources: +# - url: https://github.com/scorec/core.git +# key: git:fc94c3d4b013d7535e43549577b2c5f619d43d4b sources: -- key: git:1d2f5438d3dff3f1120649577bb2a05f9ac8c556 - url: https://github.com/SCOREC/core.git +- key: zip:ttofytsvsn7wiy5mw3utbdbmobbw7zr7 + url: https://github.com/SCOREC/core/archive/fc94c3d4b013d7535e43549577b2c5f619d43d4b.zip defaults: - relocatable: false + relocatable: true build_stages: @@ -19,16 +23,19 @@ build_stages: cd _build - name: configure + debug: true extra: [ - '-DCMAKE_C_COMPILER=${MPICC}', - '-DCMAKE_CXX_COMPILER=${MPICXX}', - '-DENABLE_ZOLTAN=ON', - '-DMETIS_LIBRARY=${PARMETIS_DIR}/lib/libmetis.so', - '-DPARMETIS_LIBRARY=${PARMETIS_DIR}/lib/libparmetis.so', - '-DPARMETIS_INCLUDE_DIR=${PARMETIS_DIR}/include', - '-DZOLTAN_LIBRARY=${ZOLTAN_DIR}/lib/libzoltan.a', - '-DZOLTAN_INCLUDE_DIR=${ZOLTAN_DIR}/include', - '-DBUILD_SHARED_LIBS=True', - '-DSIM_MPI=mpich2', + '-DBUILD_SHARED_LIBS:BOOL=ON', + '-DCMAKE_C_COMPILER:STRING=${MPICC}', + '-DCMAKE_CXX_COMPILER:STRING=${MPICXX}', + '-DENABLE_ZOLTAN:BOOL=ON', + '-DSCOREC_CXX_OPTIMIZE=ON', + '-DMDS_ID_TYPE="int"', + '-DPCU_COMPRESS=ON', + '-DENABLE_FPP=ON', + '-DENABLE_SIMMETRIX:BOOL=OFF', + '-DZOLTAN_PREFIX:PATH=${ZOLTAN_DIR}', + '-DPARMETIS_PREFIX:PATH=${PARMETIS_DIR}', + '-DCMAKE_BUILD_TYPE=Release', + '-DSCOREC_CXX_WARNINGS=OFF' ] - diff --git a/pkgs/service_identity.yaml b/pkgs/service_identity.yaml index 5fd5234f1..7f6df7361 100644 --- a/pkgs/service_identity.yaml +++ b/pkgs/service_identity.yaml @@ -5,8 +5,8 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/s/service_identity/service_identity-1.0.0.tar.gz - key: tar.gz:m6pdt7bvxqmjw5be3hgvkrpxkwzocj6e +- key: tar.gz:ayyoeixvt6i7hw2jrpsgwhmht7zcbfk5 + url: https://pypi.python.org/packages/f3/2a/7c04e7ab74f9f2be026745a9ffa81fd9d56139fa6f5f4b4c8a8c07b2bfba/service_identity-16.0.0.tar.gz when_build_dependency: - prepend_path: PYTHONPATH diff --git a/pkgs/setuptools-scm.yaml b/pkgs/setuptools-scm.yaml index 2dd3d6f27..ae49e3116 100644 --- a/pkgs/setuptools-scm.yaml +++ b/pkgs/setuptools-scm.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: zip:kegdkoasc6njrntukm2yp5vmw4mt66yt - url: https://pypi.python.org/packages/source/s/setuptools_scm/setuptools_scm-1.10.1.zip + - key: tar.gz:3lys2bnkefk2i2vdk5ctov773rd5q74d + url: https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc/setuptools_scm-1.15.0.tar.gz diff --git a/pkgs/setuptools.yaml b/pkgs/setuptools.yaml index 265d6c3a4..b3064a041 100644 --- a/pkgs/setuptools.yaml +++ b/pkgs/setuptools.yaml @@ -2,6 +2,11 @@ extends: [distutils_package] dependencies: build: [python] + run: [python] + +sources: + - key: zip:twskbn2vxrg7qgqjtfsxkdlagwm77grx + url: https://pypi.python.org/packages/4a/27/cf254815e1c31b4ccd37acce8d9ed9fb923c820c589b0cb3149b3f0e3ea3/setuptools-31.0.1.zip build_stages: - name: install @@ -17,10 +22,6 @@ build_stages: bash: | ${PYTHON} setup.py install --prefix=. --root=${ARTIFACT}/Python.framework/Versions/{{pyver}} --single-version-externally-managed -sources: -- key: tar.gz:et6pyfjwjkp6bgrcb435fxhnzbexsxr5 - url: https://pypi.python.org/packages/source/s/setuptools/setuptools-20.2.2.tar.gz - when_build_dependency: - when: not python_framework prepend_path: PYTHONPATH diff --git a/pkgs/shapely.yaml b/pkgs/shapely.yaml index a28479bc3..a02db95b8 100644 --- a/pkgs/shapely.yaml +++ b/pkgs/shapely.yaml @@ -1,16 +1,16 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: build: [geos] run: [geos] sources: -- key: git:76f5832e8df80ed86493fb4eb7a0cd7a17976822 - url: git@github.com:Toblerity/Shapely.git +- key: tar.gz:5zn4wajbopy7agekgdvugivu34fbvb5l + url: https://pypi.python.org/packages/45/35/8997278c9bf25514a781580b39e96f3c0c728d56a0003699caccd1960ab0/Shapely-1.6b2.tar.gz build_stages: - name: check after: install handler: bash bash: | - ${PYTHON} -c "from shapely import geos" + LD_LIBRARY_PATH=${GEOS_DIR}/lib:${LD_LIBRARY_PATH} ${PYTHON} -c "from shapely import geos" diff --git a/pkgs/simmetrix.yaml b/pkgs/simmetrix.yaml new file mode 100644 index 000000000..75bc93dc9 --- /dev/null +++ b/pkgs/simmetrix.yaml @@ -0,0 +1,3 @@ +when_build_dependency: + - {set: 'SIMMETRIX_LIB', value: '{{HOST_SIMMETRIX_LIB}}'} + - {set: 'SIMMETRIX_INCLUDE', value: '{{HOST_SIMMETRIX_INCLUDE}}'} diff --git a/pkgs/simplegeneric.yaml b/pkgs/simplegeneric.yaml index f2b2e3cf3..c3a89504e 100644 --- a/pkgs/simplegeneric.yaml +++ b/pkgs/simplegeneric.yaml @@ -6,4 +6,4 @@ dependencies: sources: - key: zip:3sls4bqjjonplocvwppuuzddsxsd2he5 - url: https://pypi.python.org/packages/source/s/simplegeneric/simplegeneric-0.8.1.zip + url: https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip diff --git a/pkgs/singledispatch.yaml b/pkgs/singledispatch.yaml new file mode 100644 index 000000000..a17c40821 --- /dev/null +++ b/pkgs/singledispatch.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:lmdk7b67coay2fhqribi4qxvmzsav34a + url: https://pypi.python.org/packages/d9/e9/513ad8dc17210db12cb14f2d4d190d618fb87dd38814203ea71c87ba5b68/singledispatch-3.4.0.3.tar.gz diff --git a/pkgs/six.yaml b/pkgs/six.yaml index 69c28fbcc..0682360d3 100644 --- a/pkgs/six.yaml +++ b/pkgs/six.yaml @@ -5,7 +5,7 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz - key: tar.gz:2q4su7ensgyalqack2fil6xwc7dheqoi + - key: tar.gz:cbpy22dbn6berysl6dutolxqju6mcaie + url: https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz licenses: [mit] diff --git a/pkgs/smtk.yaml b/pkgs/smtk.yaml new file mode 100644 index 000000000..8b53bc060 --- /dev/null +++ b/pkgs/smtk.yaml @@ -0,0 +1,31 @@ +extends: [cmake_package] +dependencies: + build: [boost, gdal, hdf5, netcdf4, mpi, python, remus, vtk, zmq] + +sources: +- url: https://gitlab.kitware.com/tjcorona/smtk.git + key: git:9c18b1d7207d17995ce260e095e7a5e9ae5f63cb + +defaults: + relocatable: true + +build_stages: +- name: configure + extra: ['-D SMTK_ENABLE_VTK_SUPPORT:BOOL=ON', + '-D SMTK_ENABLE_DISCRETE_SESSION:BOOL=ON', + '-D SMTK_ENABLE_EXODUS_SESSION:BOOL=ON', + '-D SMTK_ENABLE_MESH_SESSION:BOOL=ON', + '-D SMTK_ENABLE_POLYGON_SESSION:BOOL=ON', + '-D SMTK_ENABLE_REMOTE_SESSION:BOOL=ON', + '-D SMTK_ENABLE_REMUS_SUPPORT:BOOL=ON', + '-D SMTK_ENABLE_PYTHON_WRAPPING:BOOL=ON', + '-D SMTK_USE_PYBIND11:BOOL=ON', + '-D SMTK_USE_SYSTEM_MOAB:BOOL=OFF', + '-D ENABLE_HDF5:BOOL=ON', + '-D ENABLE_NETCDF:BOOL=ON', + '-D NETCDF_ROOT:STRING=${NETCDF4_DIR}', + '-D VTK_DIR:STRING=${VTK_DIR}', + '-D PYTHON_LIBRARY:FILEPATH=${PYTHON_DIR}/lib/libpython2.7.dylib', + '-D PYTHON_EXECUTABLE:FILEPATH=${PYTHON_DIR}/bin/python2.7', + '-D PYTHON_INCLUDE_DIR:PATH=${PYTHON_DIR}/include/python2.7', + '-D NETCDF_C_LIBRARY=${NETCDF4_DIR}/lib/libnetcdf.dylib'] diff --git a/pkgs/snowballstemmer.yaml b/pkgs/snowballstemmer.yaml new file mode 100644 index 000000000..b4437256b --- /dev/null +++ b/pkgs/snowballstemmer.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:sgpsnjulfql2oy2nvgj5sezz4kejmt4t + url: https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/snowballstemmer-1.2.1.tar.gz diff --git a/pkgs/sphinx-bootstrap-theme.yaml b/pkgs/sphinx-bootstrap-theme.yaml index 4bb0167a1..561153ccf 100644 --- a/pkgs/sphinx-bootstrap-theme.yaml +++ b/pkgs/sphinx-bootstrap-theme.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:6nwtflxljuekdmub45c5wqriwxsa3wwp - url: https://pypi.python.org/packages/source/s/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.4.5.tar.gz + - key: tar.gz:i73xdhswgbacn4ufivn3wekvexjcpjxc + url: https://pypi.python.org/packages/8e/28/0c0c52292a8abf56687776f902fff3ab6fa8bc6a0c3f2d235f1e2304aaea/sphinx-bootstrap-theme-0.4.13.tar.gz diff --git a/pkgs/sphinx.yaml b/pkgs/sphinx.yaml index 265af83a7..85f63f976 100644 --- a/pkgs/sphinx.yaml +++ b/pkgs/sphinx.yaml @@ -1,8 +1,8 @@ extends: [setuptools_package] dependencies: build: [docutils, jinja2, pygments] - run: [jinja2, pygments] + run: [jinja2, pygments, alabaster, sphinx_rtd_theme, babel, snowballstemmer, docutils, pytz, imagesize] sources: - - url: https://pypi.python.org/packages/source/S/Sphinx/Sphinx-1.2b3.tar.gz - key: tar.gz:tqibhpmfmqomdxmrsrhdvuwj2l6hrlgb +- key: tar.gz:rzvhpiqlfx4vbxrsf7bs6o2qq2l5tvsu + url: https://pypi.python.org/packages/b2/d5/bb4bf7fbc2e6b85d1e3832716546ecd434632d9d434a01efe87053fe5f25/Sphinx-1.5.1.tar.gz diff --git a/pkgs/sphinx_rtd_theme.yaml b/pkgs/sphinx_rtd_theme.yaml new file mode 100644 index 000000000..f81404e12 --- /dev/null +++ b/pkgs/sphinx_rtd_theme.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:e44en6fkzlbsx6kuens2le5usw3i3abv + url: https://pypi.python.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.tar.gz diff --git a/pkgs/sphinxtogithub.yaml b/pkgs/sphinxtogithub.yaml new file mode 100644 index 000000000..927a963fe --- /dev/null +++ b/pkgs/sphinxtogithub.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:curcwhvfl6b57xy6bgtw2txrxettujmq + url: https://pypi.python.org/packages/source/s/sphinxtogithub/sphinxtogithub-1.1.0.tar.gz diff --git a/pkgs/ssl_match_hostname.yaml b/pkgs/ssl_match_hostname.yaml index bfdb1b056..01f4699d5 100644 --- a/pkgs/ssl_match_hostname.yaml +++ b/pkgs/ssl_match_hostname.yaml @@ -1,4 +1,4 @@ -extends: [setuptools_package] +extends: [namespace_package] sources: - key: tar.gz:a5aq475qtkvxxwxv4ymn4zwd3lee4lr5 diff --git a/pkgs/superlu/make.inc.darwin b/pkgs/superlu/make.inc.darwin index e811359c7..8d9643378 100644 --- a/pkgs/superlu/make.inc.darwin +++ b/pkgs/superlu/make.inc.darwin @@ -21,7 +21,7 @@ PLAT = # # The name of the libraries to be created/linked to # -SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.1.a +SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a #BLASLIB = $(SuperLUroot)/lib/libblas.a diff --git a/pkgs/superlu/make.inc.linux b/pkgs/superlu/make.inc.linux index b9476c4f6..016a2eb01 100644 --- a/pkgs/superlu/make.inc.linux +++ b/pkgs/superlu/make.inc.linux @@ -21,7 +21,7 @@ PLAT = _linux # # The name of the libraries to be created/linked to # -SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.1.a +SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a #BLASLIB = $(SuperLUroot)/lib/libblas.a diff --git a/pkgs/superlu/make.inc.sgiicex b/pkgs/superlu/make.inc.sgiicex index bbd2c05d0..ce0e5b56b 100644 --- a/pkgs/superlu/make.inc.sgiicex +++ b/pkgs/superlu/make.inc.sgiicex @@ -21,7 +21,7 @@ PLAT = _linux # # The name of the libraries to be created/linked to # -SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.1.a +SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_4.3.a #BLASLIB = $(SuperLUroot)/lib/libblas.a @@ -44,10 +44,10 @@ ARCH = ar ARCHFLAGS = cr RANLIB = ranlib -CC = icc +CC = gcc CFLAGS = -O3 -fPIC NOOPTS = -fPIC -FORTRAN = ifort +FORTRAN = gfortran FFLAGS = -O2 -fPIC LOADER = $(FORTRAN) LOADOPTS = diff --git a/pkgs/superlu/superlu.yaml b/pkgs/superlu/superlu.yaml index f366c9441..d7fc073c2 100644 --- a/pkgs/superlu/superlu.yaml +++ b/pkgs/superlu/superlu.yaml @@ -5,7 +5,7 @@ dependencies: sources: - url: https://github.com/erdc-cm/superlu - key: git:55f7d100d8a5ffa2222534126c2b52986d4ff5bb + key: git:51cd6c3f05d4701fa7163aee4e356e11ac81153e build_stages: - when: platform == 'Darwin' @@ -38,6 +38,7 @@ build_stages: handler: bash bash: | cp _hashdist/make.inc.sgiicex make.inc + export INTEL_LICENSE_FILE=/p/home/apps/intel/parallel_studio_2016/server.lic export SuperLUroot=`pwd` export BLASLIB=$BLAS_LDFLAGS @@ -56,5 +57,5 @@ build_stages: bash: | mkdir ${ARTIFACT}/lib/ mkdir ${ARTIFACT}/include/ - cp lib/libsuperlu_4.1.a ${ARTIFACT}/lib/ + cp lib/libsuperlu_4.3.a ${ARTIFACT}/lib/ cp SRC/*.h ${ARTIFACT}/include/ \ No newline at end of file diff --git a/pkgs/swig.yaml b/pkgs/swig.yaml index 91e2e1877..0685530c5 100644 --- a/pkgs/swig.yaml +++ b/pkgs/swig.yaml @@ -3,8 +3,8 @@ dependencies: build: [pcre, python, {{build_with}}] sources: -- key: tar.gz:t5glt2hscpyedbjwi32y7zpiikgwgjin - url: http://downloads.sourceforge.net/swig/swig-3.0.5.tar.gz +- key: tar.gz:3ebr2uy5oqmifgsu2dkrytwzabybnmqt + url: http://downloads.sourceforge.net/swig/swig-3.0.11.tar.gz defaults: relocatable: false diff --git a/pkgs/sympy.yaml b/pkgs/sympy.yaml index a03dafba4..6f35a108d 100644 --- a/pkgs/sympy.yaml +++ b/pkgs/sympy.yaml @@ -1,11 +1,11 @@ -extends: [distutils_package] +extends: [setuptools_package] dependencies: build: [mpmath, fastcache] run: [mpmath, fastcache] defaults: - version: 0.7.6 + version: 1.0.0 when version == '0.7.6': sources: @@ -15,3 +15,7 @@ when version == 'master': sources: - key: git:488f3c206f16d4307c52ec65e3d6de4f6e42e747 url: https://github.com/sympy/sympy +when version == '1.0.0': + sources: + - key: tar.gz:h2wneegyhhsnxei5efvjewfdvrxzg2ms + url: https://pypi.python.org/packages/f3/ae/585ca7545c7e8d3a8130cc3d0cf53cfa489c137f8257e743fd3e18d7c401/sympy-1.0.tar.gz diff --git a/pkgs/szip.yaml b/pkgs/szip.yaml index 89409a14f..544d577f7 100755 --- a/pkgs/szip.yaml +++ b/pkgs/szip.yaml @@ -1,7 +1,7 @@ extends: [cmake_package] sources: -- url: http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz +- url: https://support.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz key: tar.gz:valnsxkwmlucpfrfvpn6u7iomikx27i7 build_stages: diff --git a/pkgs/terminado.yaml b/pkgs/terminado.yaml index 47daf21e1..b22d63246 100644 --- a/pkgs/terminado.yaml +++ b/pkgs/terminado.yaml @@ -5,5 +5,5 @@ dependencies: run: [ptyprocess,tornado] sources: - - key: tar.gz:mpujh37rxkcpd3t4jp6mu5twxio6mokf - url: https://pypi.python.org/packages/source/t/terminado/terminado-0.5.tar.gz + - key: tar.gz:fqf2d5reaz64zkxk27jci7h6akmamnk4 + url: https://pypi.python.org/packages/58/59/aabe84fce2f45da10165435cec204d982863e176f6849a4a4fe2652a20a8/terminado-0.6.tar.gz diff --git a/pkgs/tornado.yaml b/pkgs/tornado.yaml index 7d3a28568..e6d318606 100644 --- a/pkgs/tornado.yaml +++ b/pkgs/tornado.yaml @@ -1,8 +1,8 @@ extends: [setuptools_package] dependencies: - run: [backports-ssl_match_hostname] + run: [backports-ssl_match_hostname,backports-abc,singledispatch] sources: - - key: tar.gz:ufx43rhxnmmezobpj6pk52wo6yitwusl - url: https://pypi.python.org/packages/source/t/tornado/tornado-4.2.1.tar.gz + - key: tar.gz:fcmptexytdgud3vy2u5w352usxzpii5w + url: https://pypi.python.org/packages/1e/7c/ea047f7bbd1ff22a7f69fe55e7561040e3e54d6f31da6267ef9748321f98/tornado-4.4.2.tar.gz diff --git a/pkgs/traitlets.yaml b/pkgs/traitlets.yaml index d1ac9304a..d13baad52 100644 --- a/pkgs/traitlets.yaml +++ b/pkgs/traitlets.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:bmkawsuuutyzkgeh3g6oizinuii7pfqa - url: https://pypi.python.org/packages/source/t/traitlets/traitlets-4.0.0.tar.gz + - key: tar.gz:xkgjimr4zpup26joixmo72gjlu7aorgm + url: https://pypi.python.org/packages/b1/d6/5b5aa6d5c474691909b91493da1e8972e309c9f01ecfe4aeafd272eb3234/traitlets-4.3.1.tar.gz diff --git a/pkgs/triangle/triangle.yaml b/pkgs/triangle/triangle.yaml index d8d689c5f..aa07b99ae 100644 --- a/pkgs/triangle/triangle.yaml +++ b/pkgs/triangle/triangle.yaml @@ -1,8 +1,8 @@ extends: [autotools_package] sources: -- url: https://github.com/erdc-cm/triangle.git - key: git:7ecebd8389cf6bab52c0855a68efab98d5cf2383 +- key: zip:ukx6sgjrlf6eh2e3sc4llkzdj2lq2q2m + url: https://github.com/erdc-cm/triangle/archive/master.zip build_stages: - when: platform == 'Darwin' diff --git a/pkgs/umfpack3.yaml b/pkgs/umfpack3.yaml new file mode 100644 index 000000000..047cbe8d2 --- /dev/null +++ b/pkgs/umfpack3.yaml @@ -0,0 +1,26 @@ +extends: [base_package] + +dependencies: + build: [blas] +sources: +- url: http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-3.2.0.tar.gz + key: tar.gz:n3fumk34drmigrvhjjbctt3ya6py2guv + +build_stages: +- name: make_and_install + after: prologue + handler: bash + bash: | + echo "CFLAGS = -O3 -fPIC" > Make.generic + echo "RANLIB = ranlib" >> Make.generic + echo "CONFIG = -DNCBLAS" >> Make.generic + echo "LIB = -lm -l${BLAS_LDFLAGS}" >> Make.generic + make umfpack.a + mkdir ${ARTIFACT}/lib + mkdir ${ARTIFACT}/include + cp *.h ${ARTIFACT}/include + cp umfpack.a ${ARTIFACT}/lib/libumfpack.a + +when_build_dependency: + - {set: 'UMFPACK_LIBRARY', value: '${ARTIFACT}/lib/libumfpack.a'} + - {set: 'UMFPACK_INCLUDE', value: '${ARTIFACT}/include'} diff --git a/pkgs/vapory.yaml b/pkgs/vapory.yaml new file mode 100644 index 000000000..6519b4a25 --- /dev/null +++ b/pkgs/vapory.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:ogxfjnih5d6swfimf3mw5xu2dsxpoti5 + url: https://pypi.python.org/packages/9a/3b/c309825ca8fb68f83ec9d55210c625a6cb8d0fef279d0a7c1feb64027f86/Vapory-0.1.01.tar.gz diff --git a/pkgs/vcversioner.yaml b/pkgs/vcversioner.yaml index e8eb97af6..7b5b269d9 100644 --- a/pkgs/vcversioner.yaml +++ b/pkgs/vcversioner.yaml @@ -5,5 +5,5 @@ dependencies: run: [] sources: - - key: tar.gz:vtkdnbxjfzwixpvu6lxpkraikz5hvxvj - url: https://pypi.python.org/packages/source/v/vcversioner/vcversioner-2.14.0.0.tar.gz + - key: tar.gz:3ltayf5epf4b6rfeaedqdaz7dauricy6 + url: https://pypi.python.org/packages/c5/cc/33162c0a7b28a4d8c83da07bc2b12cee58c120b4a9e8bba31c41c8d35a16/vcversioner-2.16.0.0.tar.gz diff --git a/pkgs/vtk/vtk.yaml b/pkgs/vtk/vtk.yaml index 79d8f02ee..fb9fabafb 100644 --- a/pkgs/vtk/vtk.yaml +++ b/pkgs/vtk/vtk.yaml @@ -2,6 +2,7 @@ extends: [cmake_package] dependencies: build: - python + - gdal - setuptools - libtiff - when platform == 'linux': @@ -10,11 +11,11 @@ dependencies: - tk sources: -- url: http://www.vtk.org/files/release/5.10/vtk-5.10.1.tar.gz - key: tar.gz:6grebqpv6dme4j5vp2lc7dskpcywnms3 +- key: tar.gz:fvon2befiake3aqxcxdrrezfsfayxnep + url: http://www.vtk.org/files/release/7.1/VTK-7.1.1.tar.gz defaults: - # lib/vtk-5.10/libvtkHybrid.so.5.10.1 contains hard-coded path + # lib/vtk-7.1/libvtkHybrid.so.7.1.0 contains hard-coded path relocatable: false vtk_use_tk: false @@ -28,31 +29,8 @@ build_stages: export PYTHONPATH=${ARTIFACT}/{{python_site_packages_rel}}:$PYTHONPATH mkdir -p ${ARTIFACT}/{{python_site_packages_rel}} -- name: glx_glext_legacy_patch - files: [GLX_GLEXT_LEGACY.patch] - handler: bash - before: setup_builddir - bash: | - patch -p1 < _hashdist/GLX_GLEXT_LEGACY.patch - -- when: platform == 'Cygwin' - files: [vtk-5.10.1-cygwin.patch] - name: vtk_cygwin_patch - handler: bash - before: setup_builddir - bash: | - patch -p1 < _hashdist/vtk-5.10.1-cygwin.patch - -- when: platform == 'Darwin' - files: [vtk-disable-gc.patch] - name: vtk_disable_gc_patch - handler: bash - before: setup_builddir - bash: | - patch -p1 < _hashdist/vtk-disable-gc.patch - - name: configure - extra: + extra: - '-D BUILD_TESTING:BOOL=OFF' - '-D BUILD_EXAMPLES:BOOL=OFF' - '-D BUILD_SHARED_LIBS:BOOL=ON' @@ -60,9 +38,18 @@ build_stages: - '-D VTK_WRAP_TCL:BOOL=OFF' - '-D VTK_USE_GL2PS:BOOL=ON' - '-D VTK_PYTHON_SETUP_ARGS:STRING="--prefix=. --root=${ARTIFACT} --single-version-externally-managed"' - - '-D CMAKE_INSTALL_RPATH:STRING="${ARTIFACT}/lib/vtk-5.10"' - - '-D PYTHON_EXECUTABLE:FILEPATH="${PYTHON}"' + - '-D PYTHON_EXECUTABLE:FILEPATH=${PYTHON_DIR}/bin/python2.7' + - '-D PYTHON_INCLUDE_DIR:PATH=${PYTHON_DIR}/include/python2.7' + - '-D PYTHON_LIBRARY:FILEPATH=${PYTHON_DIR}/lib/libpython2.7.dylib' - '-D VTK_USE_SYSTEM_TIFF:BOOL=ON' + - '-D Module_vtkGeovisCore:BOOL=ON' + - '-D Module_vtkIOGDAL:BOOL=ON' + - '-D Module_vtkViewsInfovis:BOOL=ON' + - '-D Module_vtkRenderingMatplotlib:BOOL=ON' + - '-D Module_vtkRenderingGL2PSOpenGL2:BOOL=ON' + - '-D Module_vtkTestingRendering:BOOL=ON' + - '-D Module_vtkIOParallelExodus:BOOL=ON' + - '-D GDAL_DIR:PATH=${GDAL_DIR}' - when: vtk_use_tk name: configure @@ -74,34 +61,6 @@ build_stages: mode: update extra: ['-D VTK_USE_TK:BOOL=OFF'] -- when: platform == 'linux' - name: rpath_fix - after: install - handler: bash - bash: | - for lib in ${ARTIFACT}/lib/python{{pyver}}/site-packages/vtk/*.so; do - ${PATCHELF} --set-rpath ${ARTIFACT}/lib/vtk-5.10 ${lib} - done - -- when: platform == 'Darwin' - name: rpath_fix - after: install - handler: bash - bash: | - for vtklib in ${ARTIFACT}/lib/vtk-5.10/*.dylib; do - if [ ! -L ${vtklib} ]; then - install_name_tool -id @rpath/$(basename ${vtklib}) ${vtklib} - otool -L ${vtklib} | while read line; do - set +e - lib=$(echo $line | sed 's/\(lib.*\.dylib\).*/\1/' | grep ^lib) - set -e - if [ ! -z ${lib} ]; then - install_name_tool -change ${lib} @rpath/${lib} ${vtklib} - fi - done - fi - done - profile_links: - name: python_packages link: 'lib/python{{pyver}}/site-packages/*' diff --git a/pkgs/wcwidth.yaml b/pkgs/wcwidth.yaml index 07ea795a3..f816914ad 100644 --- a/pkgs/wcwidth.yaml +++ b/pkgs/wcwidth.yaml @@ -1,5 +1,9 @@ extends: [setuptools_package] +dependencies: + build: [] + run: [] + sources: - - key: tar.gz:3sz6yr3razwmcxhwvk25lrfetgs7ahdh - url: https://pypi.python.org/packages/c2/d1/7689293086a8d5320025080cde0e3155b94ae0a7496fb89a3fbaa92c354a/wcwidth-0.1.6.tar.gz + - key: tar.gz:hxzxg4rcnvxghynr4hw2cxczjpfjrirn + url: https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495/wcwidth-0.1.7.tar.gz diff --git a/pkgs/webencodings.yaml b/pkgs/webencodings.yaml new file mode 100644 index 000000000..996a6277e --- /dev/null +++ b/pkgs/webencodings.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:uxcv52j3ettub7uvdq33lqri3tgb6fyu + url: https://pypi.python.org/packages/c3/e5/74d05eed73b09752ac3dc4a8a69ae92ffa1ce92fcb03eaa624d1fcd17e33/webencodings-0.5.tar.gz diff --git a/pkgs/widgetsnbextension.yaml b/pkgs/widgetsnbextension.yaml new file mode 100644 index 000000000..f73d947f7 --- /dev/null +++ b/pkgs/widgetsnbextension.yaml @@ -0,0 +1,9 @@ +extends: [setuptools_package] + +dependencies: + build: [] + run: [] + +sources: + - key: tar.gz:ynti45stet3ipjirf6sfhizixwzg47e6 + url: https://pypi.python.org/packages/f2/8f/a659f0f75a3107998fe9aa7c6f6c80e248fc103e3bbf36020bc176f98bcb/widgetsnbextension-2.0.0b7.tar.gz diff --git a/pkgs/yaml.yaml b/pkgs/yaml.yaml index 5f13e82a4..39411ff6d 100644 --- a/pkgs/yaml.yaml +++ b/pkgs/yaml.yaml @@ -1,5 +1,5 @@ -extends: [distutils_package] +extends: [setuptools_package] sources: - - url: http://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz - key: tar.gz:44j5urojnsstuouljaka2qjag5g3miw7 + - key: zip:llec4qiqit5rfg5olt56wo5ge2wlflzr + url: https://pypi.python.org/packages/6b/f0/a0250248ea260d55748fff586d89a32afbb22656f4498b08d2636a48d4ec/PyYAML-3.12.zip diff --git a/pkgs/zmq.yaml b/pkgs/zmq.yaml index dd1b4230a..3dea59f12 100755 --- a/pkgs/zmq.yaml +++ b/pkgs/zmq.yaml @@ -1,8 +1,8 @@ extends: [autotools_package] sources: -- key: tar.gz:mgzrzaynwn3xo7sboi22etjwmcslzq7u - url: http://download.zeromq.org/zeromq-4.1.3.tar.gz +- key: tar.gz:ko4dx4hos6etd53pvhfunlkk77vgk6ds + url: https://github.com/zeromq/libzmq/releases/download/v4.2.0/zeromq-4.2.0.tar.gz build_stages: - name: configure diff --git a/pkgs/zoltan.yaml b/pkgs/zoltan.yaml index da583de12..6f10b3d19 100644 --- a/pkgs/zoltan.yaml +++ b/pkgs/zoltan.yaml @@ -1,32 +1,39 @@ extends: [autotools_package] dependencies: - build: [mpi, {{build_with}}] + build: [mpi, parmetis, {{build_with}}] sources: -- key: tar.gz:lpoumvepxhdtwis3xtz5ebwfldbrrszj - url: http://www.cs.sandia.gov/~kddevin/Zoltan_Distributions/zoltan_distrib_v3.8.tar.gz +- key: tar.gz:2dly7xvlpi4fzb6tmzvyvdohjcmu74cn + url: http://www.cs.sandia.gov/~kddevin/Zoltan_Distributions/zoltan_distrib_v3.83.tar.gz defaults: #include/Makefile.export.zoltan.macros relocatable: false build_stages: +- name: setup_builddir + after: prologue + handler: bash + bash: | + mkdir -p _build + cd _build - - name: setup_builddir - after: prologue - handler: bash - bash: | - mkdir -p _build - cd _build +- name: setEnv + after: setup_builddir + handler: bash + bash: | + export MPI_DIR=$MPI_ROOT + export CFLAGS="-m64" + export CXXFLAGS="-m64" + export CPPFLAGS="-m64" + export FCFLAGS="-m64" - - name: setEnv - after: setup_builddir - handler: bash - bash: | - export MPI_DIR=$(dirname $(dirname $MPICC) ) - export LD_LIBRARY_PATH=${MPI_DIR}/lib - - - name: configure - after: setEnv - configure_path: ".." - extra: ['--with-cflags=-fPIC', '--with-cxxflags=-fPIC'] +- name: configure + after: setEnv + configure_path: ".." + extra: ['--with-cflags=-fPIC', + '--with-gnumake', + '--with-parmetis', + '--with-parmetis-libdir=${PARMETIS_DIR}/lib', + '--with-parmetis-incdir=${PARMETIS_DIR}/include', + '--with-cxxflags=-fPIC'] diff --git a/pkgs/zope-interface.yaml b/pkgs/zope-interface.yaml index 0ca7acc53..7d0cea9cc 100644 --- a/pkgs/zope-interface.yaml +++ b/pkgs/zope-interface.yaml @@ -5,8 +5,8 @@ dependencies: run: [] sources: - - url: https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz - key: tar.gz:shf2pn6nps4c632oai76o74u3q67jlss +- key: tar.gz:q6ao62gkrq76dk5tbqcyuwibkeu5nyck + url: https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz when_build_dependency: - prepend_path: PYTHONPATH diff --git a/proteus_debian_stack.yaml b/proteus_debian_stack.yaml new file mode 100644 index 000000000..2f9e7cefa --- /dev/null +++ b/proteus_debian_stack.yaml @@ -0,0 +1,68 @@ +# This profile file controls your <#> (HashDist) build environment. + +# In the future, we'll provide better incorporation of +# automatic environment detection. For now, have a look +# at the YAML files in the top-level directory and choose +# the most *specific* file that matches your environment. + +extends: +- file: debian.yaml + +# The packages list specifies all the packages that you +# require installed. <#> will ensure that all packages +# and their dependencies are installed when you build this +# profile. + +packages: + openjpeg: + version: '2.1' + openssl: + use: host-openssl + python: + host: false + link: shared + build_with: | + bzip2, sqlite, openssl + blas: + use: openblas + lapack: + use: openblas-lapack + daetk: + mpi: + use: mpich + mpi4py: + nose: + hdf5: + parmetis: + petsc: + version: 3.7.5 + build_with: | + parmetis, cmake, openblas + download: | + superlu, superlu_dist, hypre, blacs, scalapack, mumps + coptflags: -O2 + link: shared + debug: true + petsc4py: + version: 3.7.0 + with_conf: true + pytables: + tetgen: + triangle: + memory_profiler: + scipy: + h5py: + ode: + zoltan: + build_with: | + parmetis + chrono: + gmsh: + scorec: + matplotlib: + proteus: + boost: + toolset: gcc + address_model: 64 + build_with: | + python diff --git a/scripts/cygstack.txt b/scripts/cygstack.txt index d58b1584a..388c8bdb6 100644 --- a/scripts/cygstack.txt +++ b/scripts/cygstack.txt @@ -62,6 +62,7 @@ gzip 1.4-1 hostname 3.13-1 inputproto 2.3-1 ipc-utils 1.0-2 +jasper 1.900.1-13 kbproto 1.0.6-1 lapack 3.4.2-1 less 458-1 @@ -136,6 +137,7 @@ libidn11 1.26-1 libintl8 0.18.1.1-3 libiodbc2 3.52.8-2 libisl10 0.11.1-2 +libjasper-devel 1.900.1-13 libjpeg8 1.2.1-2 libjson-c-common 0.11-1 libjson-c2 0.11-1 @@ -226,6 +228,7 @@ libssp0 4.8.1-3 libstdc++6 4.8.1-3 libsybdb5 0.91-4 libtasn1_6 3.3-1 +libtool 2.4-1 libtiff5 3.9.7-3 libuuid1 2.21.2-1 libuuid-devel 2.21.2-1 @@ -316,3 +319,4 @@ xz 5.0.4-1 zlib-devel 1.2.8-1 zlib0 1.2.8-1 zsh 5.0.2-1 +