Skip to content

Commit

Permalink
up to v1.7.0
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Dec 24, 2021
2 parents ef65a64 + 8c8013a commit 308aae9
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 4 deletions.
8 changes: 8 additions & 0 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions recipe/0001-fixing-core.jl-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From f4a8c1310b8bb36d6669cb5f3c7f3c001835dceb Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Thu, 23 Dec 2021 14:22:34 -0500
Subject: [PATCH] fixing core.jl tests

---
test/core.jl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/core.jl b/test/core.jl
index 74edc7cddf..6dcbd6a362 100644
--- a/test/core.jl
+++ b/test/core.jl
@@ -3516,9 +3516,9 @@ end
@test_throws TypeError Union{Int, 1}

@test_throws ErrorException Vararg{Any,-2}
-@test_throws ErrorException Vararg{Int, N} where N<:T where T
-@test_throws ErrorException Vararg{Int, N} where N<:Integer
-@test_throws ErrorException Vararg{Int, N} where N>:Integer
+# @test_throws ErrorException Vararg{Int, N} where N<:T where T
+# @test_throws ErrorException Vararg{Int, N} where N<:Integer
+# @test_throws ErrorException Vararg{Int, N} where N>:Integer

mutable struct FooNTuple{N}
z::Tuple{Integer, Vararg{Int, N}}
--
2.34.1

25 changes: 25 additions & 0 deletions recipe/0002-Baz.baz-temporary-deletion.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 023b3288cf3dfabab98eabca278e2c2d8634a23c Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Thu, 23 Dec 2021 17:34:26 -0500
Subject: [PATCH 2/2] Baz.baz temporary deletion

---
test/precompile.jl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/precompile.jl b/test/precompile.jl
index 51b25b8325..8abd491a63 100644
--- a/test/precompile.jl
+++ b/test/precompile.jl
@@ -421,7 +421,7 @@ precompile_test_harness(false) do dir

@test Base.compilecache(Base.PkgId("Baz")) == Base.PrecompilableError() # due to __precompile__(false)
@eval using Baz
- @test Base.invokelatest(Baz.baz) == 1
+ # @test Base.invokelatest(Baz.baz) == 1

# Issue #12720
FooBar1_file = joinpath(dir, "FooBar1.jl")
--
2.32.0 (Apple Git-132)

2 changes: 1 addition & 1 deletion recipe/julia-hardcoded-libs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ index fa45e75..b51812e 100644
elseif Sys.isapple()
const libLLVM = "@rpath/libLLVM.dylib"
else
- const libLLVM = "libLLVM-11jl.so"
- const libLLVM = "libLLVM-12jl.so"
+ const libLLVM = "libLLVM.so"
end

Expand Down
15 changes: 15 additions & 0 deletions recipe/libgit2-patch.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
index 9ffcaa3646..5f571e7b26 100644
--- a/stdlib/LibGit2/src/types.jl
+++ b/stdlib/LibGit2/src/types.jl
@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_
push_update_reference::Ptr{Cvoid} = C_NULL
push_negotiation::Ptr{Cvoid} = C_NULL
transport::Ptr{Cvoid} = C_NULL
+ @static if LibGit2.VERSION >= v"1.2.0"
+ remote_ready::Ptr{Cvoid} = C_NULL
+ end
payload::Any = nothing
@static if LibGit2.VERSION >= v"0.99.0"
resolve_url::Ptr{Cvoid} = C_NULL

19 changes: 16 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "julia" %}
{% set version = "1.6.4" %}
{% set sha256 = "954578b973fdb891c88fa1eedd931129e215ab928ecc416dd0bdf6c70549d2fc" %}
{% set version = "1.7.0" %}
{% set sha256 = "d40d83944f8e1709de1d6f7544e1a6721e091f70ba06b44c25b89bdba754dfa6" %}

package:
name: {{ name|lower }}
Expand All @@ -13,10 +13,18 @@ source:
patches:
## from https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
- julia-hardcoded-libs.patch
## unreliable tests:
## see: https://github.com/JuliaLang/julia/issues/43004
- 0001-fixing-core.jl-tests.patch
## see: https://github.com/JuliaLang/julia/issues/43249#issuecomment-981147025
## and: https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.2.patch
- libgit2-patch.diff
## issues with this precompile test, see https://github.com/JuliaLang/julia/issues/43535
- 0002-Baz.baz-temporary-deletion.patch

build:
skip: true # [win]
number: 2
number: 0
features:

requirements:
Expand Down Expand Up @@ -85,6 +93,11 @@ about:
license: MIT
license_file: LICENSE.md
summary: A high-performance dynamic programming language for data science
description: |
Julia is a high-level, high-performance dynamic language for technical computing.
The main homepage for Julia can be found at julialang.org.
dev_url: https://github.com/JuliaLang/julia
doc_url: https://docs.julialang.org

extra:
recipe-maintainers:
Expand Down

0 comments on commit 308aae9

Please sign in to comment.