Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JuliaLang/julia into jb/kwargs
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeffBezanson
JeffBezanson committed Apr 3, 2013
2 parents 16706c0 + 175f696 commit 92642aa
Show file tree
Hide file tree
Showing 2 changed files with 234 additions and 13 deletions.
232 changes: 222 additions & 10 deletions doc/packages/packagelist.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ _________________________________________
Dependencies::

BinDeps Any Version
julia [v"0.1.0-"]

Contributors:

Expand Down Expand Up @@ -545,7 +546,7 @@ ________________________________________________

Dependencies::

None
Iterators Any Version

Contributors:

Expand Down Expand Up @@ -615,23 +616,23 @@ ________________________________________________
:alt: Daniel Jones
:target: https://github.com/dcjones

.. image:: https://secure.gravatar.com/avatar/21aeae1f260365557523718bc19640f7?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
.. image:: https://secure.gravatar.com/avatar/2989a078f4caff6fb86fa30e59bd9aa9?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Stefan Karpinski
:target: https://github.com/StefanKarpinski
:alt: Tim Holy
:target: https://github.com/timholy

.. image:: https://secure.gravatar.com/avatar/b4b8db23d8096b722483a57d21b7d65d?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Jeff Bezanson
:target: https://github.com/JeffBezanson

.. image:: https://secure.gravatar.com/avatar/2989a078f4caff6fb86fa30e59bd9aa9?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
.. image:: https://secure.gravatar.com/avatar/21aeae1f260365557523718bc19640f7?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Tim Holy
:target: https://github.com/timholy
:alt: Stefan Karpinski
:target: https://github.com/StefanKarpinski

----

Expand Down Expand Up @@ -1517,6 +1518,38 @@ ___________________________________________________________

----

`GLFW <https://github.com/jayschwa/GLFW.jl>`_
_____________________________________________

.. image:: https://secure.gravatar.com/avatar/805857de807ffc1b543e807f727d05c6?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: Jay Weisskopf
:target: https://github.com/jayschwa

Current Version: ``0.0.0``

GLFW bindings for Julia. GLFW is a multi-platform library for opening a window, creating an OpenGL context, and managing input.

Maintainer: `Jay Weisskopf <https://github.com/jayschwa>`_

Documentation: `<http://www.glfw.org/>`_

Dependencies::

None

Contributors:

.. image:: https://secure.gravatar.com/avatar/805857de807ffc1b543e807f727d05c6?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Jay Weisskopf
:target: https://github.com/jayschwa

----

`GLM <https://github.com/JuliaStats/GLM.jl>`_
_____________________________________________

Expand Down Expand Up @@ -1835,6 +1868,39 @@ ______________________________________________

----

`GoogleCharts <https://github.com/jverzani/GoogleCharts.jl>`_
_____________________________________________________________

.. image:: https://secure.gravatar.com/avatar/8f514187144b1b19b0205fce41284d32?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: john verzani
:target: https://github.com/jverzani

Current Version: ``0.0.0``

Julia interface to Google Chart Tools

Maintainer: `john verzani <https://github.com/jverzani>`_

Dependencies::

Calendar Any Version
DataFrames Any Version
JSON Any Version
Mustache Any Version

Contributors:

.. image:: https://secure.gravatar.com/avatar/8f514187144b1b19b0205fce41284d32?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: john verzani
:target: https://github.com/jverzani

----

`Graphs <https://github.com/johnmyleswhite/Graphs.jl>`_
_______________________________________________________

Expand Down Expand Up @@ -2216,6 +2282,48 @@ ________________________________________________

----

`ImmutableArrays <https://github.com/twadleigh/ImmutableArrays.jl>`_
____________________________________________________________________

.. image:: https://secure.gravatar.com/avatar/9553bee3aa95ce13310db4f5f70acc62?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: Tracy Wadleigh
:target: https://github.com/twadleigh

Current Version: ``0.0.0``

Statically-sized immutable vectors and matrices.

Maintainer: `Tracy Wadleigh <https://github.com/twadleigh>`_

Dependencies::

julia [v"0.2.0-"]

Contributors:

.. image:: https://secure.gravatar.com/avatar/9553bee3aa95ce13310db4f5f70acc62?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Tracy Wadleigh
:target: https://github.com/twadleigh

.. image:: https://secure.gravatar.com/avatar/805857de807ffc1b543e807f727d05c6?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Jay Weisskopf
:target: https://github.com/jayschwa

.. image:: https://secure.gravatar.com/avatar/cd90bb9515507b0f998f7e5dbccbd238?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Olli Wilkman
:target: https://github.com/dronir

----

`IniFile <https://github.com/JuliaLang/IniFile.jl>`_
____________________________________________________

Expand Down Expand Up @@ -2429,6 +2537,36 @@ __________________________________________

----

`JudyDicts <https://github.com/tanmaykm/JudyDicts.jl>`_
_______________________________________________________

.. image:: https://secure.gravatar.com/avatar/eea0b193dae8ac47946202ee404a6d7a?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: Tanmay Mohapatra
:target: https://github.com/tanmaykm

Current Version: ``0.0.0``

Judy Array for Julia

Maintainer: `Tanmay Mohapatra <https://github.com/tanmaykm>`_

Dependencies::

None

Contributors:

.. image:: https://secure.gravatar.com/avatar/eea0b193dae8ac47946202ee404a6d7a?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Tanmay Mohapatra
:target: https://github.com/tanmaykm

----

`JuliaWebRepl <https://github.com/vtjnash/JuliaWebRepl.jl>`_
____________________________________________________________

Expand Down Expand Up @@ -2884,7 +3022,7 @@ ___________________________________________________

Clp Any Version
CoinMP Any Version
julia [v"0.1.0-"]
julia [v"0.2.0-"]

Contributors:

Expand All @@ -2902,6 +3040,36 @@ ___________________________________________________

----

`MathProgBase <https://github.com/mlubin/MathProgBase.jl>`_
___________________________________________________________

.. image:: https://secure.gravatar.com/avatar/b0cf54b8431443687735cb486599ea9c?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: Miles Lubin
:target: https://github.com/mlubin

Current Version: ``0.0.0``

Provides standard interface to linear programming solvers, including linprog function.

Maintainer: `Miles Lubin <https://github.com/mlubin>`_

Dependencies::

julia [v"0.1.0-"]

Contributors:

.. image:: https://secure.gravatar.com/avatar/b0cf54b8431443687735cb486599ea9c?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Miles Lubin
:target: https://github.com/mlubin

----

`Meshes <https://github.com/twadleigh/Meshes.jl>`_
__________________________________________________

Expand Down Expand Up @@ -2958,6 +3126,7 @@ __________________________________________________________

Distributions Any Version
NLopt Any Version
julia [v"0.2.0-"]

Contributors:

Expand Down Expand Up @@ -3715,6 +3884,12 @@ _____________________________________________________________
:alt: dmbates
:target: https://github.com/dmbates

.. image:: https://secure.gravatar.com/avatar/62df30beab9c2a6f3fe3f86995e94387?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: David de Laat
:target: https://github.com/daviddelaat

----

`RNGTest <https://github.com/andreasnoackjensen/RNGTest.jl>`_
Expand Down Expand Up @@ -3979,6 +4154,36 @@ ________________________________________________________________________________

----

`SimJulia <https://github.com/BenLauwens/SimJulia.jl>`_
_______________________________________________________

.. image:: https://secure.gravatar.com/avatar/d90d902f9f64a30155b8a87441615cc2?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 80px
:width: 80px
:align: right
:alt: Ben Lauwens
:target: https://github.com/BenLauwens

Current Version: ``0.0.0``

Process oriented simulation library written in Julia

Maintainer: `Ben Lauwens <https://github.com/BenLauwens>`_

Dependencies::

None

Contributors:

.. image:: https://secure.gravatar.com/avatar/d90d902f9f64a30155b8a87441615cc2?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Ben Lauwens
:target: https://github.com/BenLauwens

----

`Sims <https://github.com/tshort/Sims.jl>`_
___________________________________________

Expand Down Expand Up @@ -4075,6 +4280,12 @@ ______________________________________________
:alt: Patrick O'Leary
:target: https://github.com/pao

.. image:: https://secure.gravatar.com/avatar/ed9f9395e60acde24eb4bb89fe2154aa?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
:alt: Keno Fischer
:target: https://github.com/loladiro

.. image:: https://secure.gravatar.com/avatar/2989a078f4caff6fb86fa30e59bd9aa9?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png
:height: 40px
:width: 40px
Expand Down Expand Up @@ -4590,7 +4801,7 @@ ______________________________________________
:alt: Daniel Casimiro
:target: https://github.com/dancasimiro

Current Version: ``0.0.0``
Current Version: ``0.1.0``

Julia package for working with WAV files

Expand All @@ -4599,6 +4810,7 @@ ______________________________________________
Dependencies::

Options Any Version
julia [v"0.1.0-", v"0.2.0-"]

Contributors:

Expand Down Expand Up @@ -4781,5 +4993,5 @@ _________________________________________________

----

.. footer: 126 packages, generated 31 Mar 2013 10:28:32 GMT+01:00
.. footer: 132 packages, generated 3 Apr 2013 11:25:16 GMT+01:00
15 changes: 12 additions & 3 deletions extras/pkg2.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ intersect(a::VersionInterval, b::VersionInterval) = VersionInterval(max(a.lower,
intersect(A::Vector{VersionInterval}, B::Vector{VersionInterval}) =
sortby!(filter!(i->!isempty(i), vec([ intersect(a,b) for a in A, b in B ])), i->i.lower)

typealias Requires Dict{ByteString,Vector{VersionInterval}}

function parse_requires(readable)
reqs = Dict{ByteString,Vector{VersionInterval}}()
reqs = Requires()
for line in eachline(readable)
ismatch(r"^\s*(?:#|$)", line) && continue
fields = split(replace(line, r"#.*$", ""))
Expand All @@ -42,6 +44,13 @@ function parse_requires(readable)
end
parse_requires(file::String) = open(parse_requires,file)

function merge!(A::Requires, B::Requires)
for (pkg, ivals) in B
A[pkg] = has(A,pkg) ? intersect(A[pkg], ivals) : ivals
end
return A
end

each_installed() = @task begin
for line in eachline(`ls`)
name = chomp(line)
Expand Down Expand Up @@ -69,9 +78,9 @@ function requirements()
for pkg in each_installed()
isfixed(pkg) || continue
isfile(pkg, "REQUIRE") || continue
append!(reqs, parse_requires(joinpath(pkg, "REQUIRE")))
merge!(reqs, parse_requires(joinpath(pkg, "REQUIRE")))
end
sort!(reqs)
return reqs
end

# end # module

0 comments on commit 92642aa

Please sign in to comment.