range(start, stop; length, step) #633

Nosferican · 2018-10-03T21:10:58Z

Pre-Compat of #631 per JuliaLang/julia#28708.

Pre-Compat of #631

martinholters · 2018-10-04T05:44:41Z

src/Compat.jl

@@ -1839,6 +1839,12 @@ if VERSION < v"0.7.0-beta2.143"
    end
 end

+if v"1.0" ≤ VERSION < v"1.1"


Can't we support this on earlier versions, too? Also, we probably should either wait until JuliaLang/julia#28708 has been merged and we know the exact upper bound, or make this depend on whether the new method is defined. (By looking at methods(range, Tuple{Any,Any}), maybe?)

Letting go by JuliaLang/julia#28708 (comment) since it is has already been decided the feature will be added in the next minor release. I can test the @isdefined method as well.

it is has already been decided the feature will be added in the next minor release

Yes, but we'd need the XXX in v"1.1.0-DEV.XXX" for the version bound here.

I see no reason to merge it now then, why wait?

"it" referring to JuliaLang/julia#28708? Agree.

Right, I rebased it just now.

If we can have it merged now (no more planned patch releases), I can extract the exact version to use here after it has been merged.

martinholters

Needs a README entry.

martinholters · 2018-10-04T05:46:47Z

src/Compat.jl

+if v"1.0" ≤ VERSION < v"1.1"
+    # https://github.com/JuliaLang/julia/pull/28708
+    Base.range(start, stop; length::Union{Integer,Nothing}=nothing, step=nothing) =
+        Base._range(start, step, stop, length)


I don't think we should be calling this internal function. Why not use the old range method?

I took it from the un merged PR, but good point.

Calling the lowering function does make the code simpler than the various cases using the current range method.

Doesn't just Base.range(start, stop; kwargs...) = range(start; stop=stop, kwargs...) work?

martinholters · 2018-10-04T05:48:29Z

test/runtests.jl

@@ -1518,4 +1518,9 @@ end
                                   3  4  3  4  3  4]
 @test repeat([1, 2], 1, 2, 3) == [x for x in 1:2, y in 1:2, z in 1:3]

+# [1.0, 1.1)
+if v"1.0" ≤ VERSION < v"1.1"


Even if we only define the method here prior to v"1.1", we should still test it afterwards to make sure it works as promised.

test/runtests.jl

martinholters · 2018-10-04T09:01:50Z

test/runtests.jl

@@ -1518,4 +1518,10 @@ end
                                   3  4  3  4  3  4]
 @test repeat([1, 2], 1, 2, 3) == [x for x in 1:2, y in 1:2, z in 1:3]

+# [1.0, 1.1)
+if v"1.0" ≤ VERSION && isempty(methods(range, Tuple{Any,Any}))


The isempty(methods(...)) test is wrong here. We definitely want the tests to run if the method is defined. Actually, the tests should (implicitly) verify the method is defined.

julia> VERSION v"1.0.1" julia> isempty(methods(range, Tuple{Any,Any})) true julia> Base.range(start, stop; length::Union{Integer,Nothing}=nothing, step=nothing) = Base._range(start, step, stop, length) julia> isempty(methods(range, Tuple{Any,Any})) false

I used that to see if it would test for the missing method. Could you point me to in the direction I should go?

Just v"1.0" ≤ VERSION? (Although I repeat that I'd prefer this to work from 0.6 on, and I see absolutely no reason why this shouldn't work on 0.7.)

martinholters · 2018-10-04T09:10:34Z

README.md

@@ -358,6 +358,9 @@ Currently, the `@compat` macro supports the following syntaxes:

 * `repmat` is now `repeat` ([#26039])

+* `range` will support `range(start, stop; length, step)` for Julia 1.0 which
+  will be included in Julia 1.1.


Using future tense is not very ... future-proof here. Maybe just "range supports range(start, stop; length, step) for Julia 1.0" (or "supports stop as a positional argument", although that is less clear). Also should link to the Julia PR.

martinholters · 2018-10-04T09:30:21Z

test/runtests.jl

@@ -1518,4 +1518,10 @@ end
                                   3  4  3  4  3  4]
 @test repeat([1, 2], 1, 2, 3) == [x for x in 1:2, y in 1:2, z in 1:3]

+# [1.0, 1.1)
+if v"0.7" ≤ VERSION && isempty(methods(range, Tuple{Any,Any}))


Still has the bogus && isempty(methods(range, Tuple{Any,Any})).

What replacement do you recommend given that the PR hasn't been merged (can't use a precise v"1.0-xxxx")?

None. We want the tests to be run on all versions (0.7 and up, actually). If you look at the other tests, they don't come with an upper version bound. If Julia is recent enough that Compat doesn't have to do anything, we still test things work as expected/promised.

So that would be

if v"0.7" ≤ VERSION

then?

Yes. (That's what I tried to say in #633 (comment)).

The condition should be completely removed now (assuming we succeed in making this work for 0.6).

martinholters · 2018-10-04T11:17:18Z

src/Compat.jl

@@ -1839,6 +1839,11 @@ if VERSION < v"0.7.0-beta2.143"
    end
 end

+if v"0.7" ≤ VERSION


Ah, this should be guarded with && isempty(methods(range, Tuple{Any,Any})), while the tests should not. However, on 0.7, that does not work, because of the deprecated, old range(a, len) methods. That also makes me wonder whether we actually should be adding this method on 0.7. I'd say yes, but might be worth discussing.

martinholters · 2018-10-04T11:21:02Z

src/Compat.jl

@@ -1839,6 +1839,11 @@ if VERSION < v"0.7.0-beta2.143"
    end
 end

+if v"0.7" ≤ VERSION
+    # https://github.com/JuliaLang/julia/pull/28708
+    Base.range(start, stop; kwargs...) = range(start; stop=stop, kwargs...)


Heh, thanks to #511, this definition actually works on 0.6, too. But there we have the keyword-argument-less, two-argument methods, too. However, if we omit the Base qualification, then this will add a method to the existing Compat.range on 0.6 and to Base.range on 0.7 and later. Doesn't sound too bad.

martinholters · 2018-10-04T11:36:09Z

So condensing my comments, this definition might be worth a try:

if VERSION ≤ v"1.0" || isempty(methods(range, Tuple{Any,Any}))
    range(start, stop; kwargs...) = range(start; stop=stop, kwargs...)
end

However, that would require the code from #511 to be adjusted to only import range after the removal of the deprecated two-arg methods, and define Compat.range(start; kwargs...) = Base.range(start; kwargs...) (or similar) otherwise. Then the new method would be accessible as Compat.range (and just range on 1.0 and above, though I'm not sure we want to advertise that).

martinholters

The custom range function has to stay for Julia 0.6. For Julia 0.7, we define our own function which just forwards to Base.range for range(start; kws...) and add a method for range(start, stop; kws...). For Julia 1.0, we add that method to Base.range. I hope that works...

martinholters · 2018-10-05T07:53:42Z

src/Compat.jl

@@ -1506,27 +1506,7 @@ end
    const LinRange = Base.LinSpace
    export LinRange

-    function range(start; step=nothing, stop=nothing, length=nothing)


This definition needs to stay for 0.6.

src/Compat.jl

martinholters · 2018-10-05T08:11:07Z

src/Compat.jl

@@ -1527,6 +1527,9 @@ end
            return linspace(start, stop, length)
        end
    end
+elseif VERSION < v"1.0.0-DEV.57"
+    import LinRange


Sorry, this should be import Base: LinRange.

martinholters · 2018-10-05T08:23:23Z

test/runtests.jl

@@ -1518,4 +1518,8 @@ end
                                   3  4  3  4  3  4]
 @test repeat([1, 2], 1, 2, 3) == [x for x in 1:2, y in 1:2, z in 1:3]

+# Support for positional `stop`
+@test range(0, 5, length = 6) == 0.0:1.0:5.0
+@test range(0, 10, step = 2) == 0:2:10


These should be Compat.range.

martinholters · 2018-10-05T08:28:44Z

README.md

@@ -358,6 +358,8 @@ Currently, the `@compat` macro supports the following syntaxes:

 * `repmat` is now `repeat` ([#26039])

+* `range` supports `range(start, stop; length, step)` (`stop` as positional argument) ([#28708])


This should be Compat.range.

Hm, could also be merged with

Compat.jl/README.md

Line 204 in a535c0a

* `Compat.range` supporting keyword arguments ([#25896]).

but I'm not sure of a good wording.

martinholters

Good to go from my side. I'd like to keep it open for a bit, though, for others to have chance to review the final version we've come up with here.

Also might be worth testing against https://github.com/JuliaLang/julia/tree/jb/2argrange to make sure it doesn't break once JuliaLang/julia#28708 gets merged. Have you done that? Otherwise I can do so.

Nosferican · 2018-10-05T17:49:07Z

I haven't. I would appreciate if you can check against it and let me know (I mostly use the binaries and don't build it from source).

arnavs · 2018-10-11T21:46:33Z

Any progress on this?

martinholters · 2018-10-12T12:47:49Z

Thanks for the bump, I had gotten distracted by other things. So I've successfully checked against JuliaLang/julia#28708 just now, nobody has voiced any objections... Merge!

arnavs · 2018-10-16T00:39:17Z

Thanks so much @martinholters! And appreciate your tagging a new release so we can use the feature.

range(start, stop; length, step)

966cdf0

Pre-Compat of #631

martinholters reviewed Oct 4, 2018

View reviewed changes

martinholters requested changes Oct 4, 2018

View reviewed changes

Addressed comments

f63c02c

martinholters reviewed Oct 4, 2018

View reviewed changes

Fix README and Compat from Julia 0.7 - 1.1

16b7b64

martinholters reviewed Oct 4, 2018

View reviewed changes

Nosferican added 2 commits October 4, 2018 05:59

Tests for ≥ 0.7

021cfe6

Avoid using internal

4071b02

martinholters reviewed Oct 4, 2018

View reviewed changes

Is this the way?

025c138

martinholters requested changes Oct 5, 2018

View reviewed changes

Fixes.

fbc52c3

martinholters reviewed Oct 5, 2018

View reviewed changes

Nosferican added 2 commits October 5, 2018 04:13

fix import statement

5f7fd09

Fix tests

e5f549b

martinholters reviewed Oct 5, 2018

View reviewed changes

Tests and README

8d8906c

martinholters approved these changes Oct 5, 2018

View reviewed changes

arnavs mentioned this pull request Oct 5, 2018

Ranges pass QuantEcon/lecture-source-jl#149

Closed

martinholters merged commit 052636a into JuliaLang:master Oct 12, 2018

martinholters mentioned this pull request Nov 29, 2018

Make range definition depend on a VERSION check #637

Merged

		@@ -358,6 +358,8 @@ Currently, the `@compat` macro supports the following syntaxes:

		* `repmat` is now `repeat` ([#26039])

		* `range` supports `range(start, stop; length, step)` (`stop` as positional argument) ([#28708])

range(start, stop; length, step) #633

range(start, stop; length, step) #633

Conversation

Nosferican commented Oct 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

martinholters left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nosferican Oct 4, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

martinholters commented Oct 4, 2018

martinholters left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

martinholters left a comment

Choose a reason for hiding this comment

Nosferican commented Oct 5, 2018

arnavs commented Oct 11, 2018

martinholters commented Oct 12, 2018

arnavs commented Oct 16, 2018

Nosferican Oct 4, 2018 •

edited

Loading