diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 770460fe..74e6ade4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,22 +18,22 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 -fftw: -- '3' fortran_compiler: - gfortran fortran_compiler_version: - '9' gmp: - '6' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib +libgit2: +- '1.1' +libssh2: +- '1' +libunwind: +- '1' mpfr: - '4' +pcre2: +- '10.37' perl: - 5.26.2 pin_run_as_build: @@ -41,8 +41,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: diff --git a/.ci_support/migrations/pcre21037.yaml b/.ci_support/migrations/pcre21037.yaml deleted file mode 100644 index 43cf4037..00000000 --- a/.ci_support/migrations/pcre21037.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1622491612.3316026 -pcre2: -- '10.37' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c2447382..ae94f808 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -16,24 +16,22 @@ cxx_compiler: - clangxx cxx_compiler_version: - '11' -fftw: -- '3' fortran_compiler: - gfortran fortran_compiler_version: - '9' gmp: - '6' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib +libgit2: +- '1.1' +libssh2: +- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: - '4' +pcre2: +- '10.37' perl: - 5.26.2 pin_run_as_build: @@ -41,8 +39,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: diff --git a/conda-forge.yml b/conda-forge.yml index 1c09752d..118bd44b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1 +1,3 @@ conda_forge_output_validation: true +azure: + store_build_artifacts: True diff --git a/recipe/build.sh b/recipe/build.sh index e83f8379..280f469e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,39 +12,45 @@ html : mkdir -p _build/html EOF + # Julia sets this to unix makefiles later on in its build process export CMAKE_GENERATOR="make" -NO_GIT=1 make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC +make -C base version_git.jl.phony CC=$CC CXX=$CXX FC=$FC export EXTRA_MAKEFLAGS="" if [ "$(uname)" == "Darwin" ] then - export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=1" + export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=0" elif [ "$(uname)" == "Linux" ] then - # On linux the released version of libunwind has issues building julia - # See: https://github.com/JuliaLang/julia/issues/23615 - export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBUNWIND=0" + export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1" fi -make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc NO_GIT=1 \ - LIBBLAS=-lblas LIBBLASNAME=libblas LIBLAPACK=-llapack LIBLAPACKNAME=liblapack \ +# using system utf8proc can be enabled in 1.7.0. See https://github.com/JuliaLang/julia/commit/ba653ecb1c81f1465505c2cea38b4f8149dd20b3 +make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ + LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-lopenblas64_ LIBLAPACKNAME=libopenblas64_ \ USE_SYSTEM_ARPACK=1 \ USE_SYSTEM_BLAS=1 \ + USE_BLAS64=1 \ USE_SYSTEM_CURL=1 \ - USE_SYSTEM_FFTW=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LLVM=0 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_OPENLIBM=1 \ - USE_SYSTEM_OPENSPECFUN=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_CSL=0 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_LIBUV=0 \ + USE_SYSTEM_UTF8PROC=0 \ + USE_SYSTEM_MBEDTLS=0 \ + USE_SYSTEM_NGHTTP2=1 \ + USE_SYSTEM_ZLIB=1 \ + USE_SYSTEM_P7ZIP=1 \ ${EXTRA_MAKEFLAGS} \ TAGGED_RELEASE_BANNER="conda-forge-julia release" \ CC=$CC CXX=$CXX FC=$FC \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7c3e781e..083ee82a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,64 +1,68 @@ {% set name = "julia" %} -{% set version = "1.1.1" %} -{% set sha256 = "0155a33448cb2334ae7487a35a2416a4205da4541b90fc9f97208da11e273c9e" %} +{% set version = "1.6.1" %} +{% set sha256 = "71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f" %} package: name: {{ name|lower }} version: {{ version }} source: - fn: v{{ version }}.tar.gz - url: https://github.com/JuliaLang/julia/archive/v{{ version }}.tar.gz + fn: julia-{{ version }}-full.tar.gz + url: https://github.com/JuliaLang/julia/releases/download/v{{ version }}/julia-{{ version }}-full.tar.gz sha256: {{ sha256 }} build: skip: True # [win] - number: 7 + number: 0 features: requirements: build: - - cmake-binary - perl - - python 2.7.* + - python 3 - {{ compiler('fortran') }} - {{ compiler('c') }} - {{ compiler('cxx') }} host: - - libblas - - libcblas - - liblapack + - openblas-ilp64 - patchelf # [linux] - - zlib - - openlibm 0.5.4 - - openspecfun 0.5.3 - - fftw + - openlibm - gmp - mpfr - curl - - libgit2 0.27 + - libgit2 # [not osx] + - libssh2 - libosxunwind # [osx] + - libunwind # [linux] - arpack - suitesparse - - pcre2 10.23 + - pcre2 + - git + - libnghttp2 + - zlib + - p7zip run: - - zlib - - {{ pin_compatible("libgit2", max_pin="x.x") }} + - openblas-ilp64 - libosxunwind # [osx] - - fftw + - libunwind # [linux] - gmp - mpfr - - openlibm 0.5.4 - - openspecfun 0.5.3 + - openlibm - arpack - suitesparse + - pcre2 - curl - - pcre2 10.23 + - libgit2 # [not osx] + - libssh2 + - git + - libnghttp2 + - zlib + - p7zip test: commands: - - julia -e 'Base.runtests("LibGit2/online Pkg/pkg")' + - julia -e 'Base.runtests(["core", "regex", "Downloads"])' requires: - perl