Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DON'T MERGE] Try JuliaPy/Conda.jl#129 #590

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions .travis.yml
Expand Up @@ -2,7 +2,6 @@ language: julia
os:
- linux
julia:
- 0.6
- 0.7
- nightly
addons:
Expand All @@ -14,16 +13,14 @@ env:
global:
- PYCALL_DEBUG_BUILD="yes"
matrix:
- PYTHON=python # python 2.7
- PYTHON=python3 # python 3.5
- PYTHON=Conda # not actually a python version, here to test Conda.jl's python
matrix:
include:
- &test-macos-py2
language: julia
os: osx
env: PYTHON=python
julia: 0.6
julia: 0.7
- &test-macos-py3
<<: *test-macos-py2
before_install:
Expand All @@ -35,9 +32,6 @@ matrix:
- &test-macos-conda
<<: *test-macos-py2
env: PYTHON=Conda
- {<<: *test-macos-py2, julia: 0.7}
- {<<: *test-macos-py3, julia: 0.7}
- {<<: *test-macos-conda, julia: 0.7}
- {<<: *test-macos-py2, julia: nightly}
- {<<: *test-macos-py3, julia: nightly}
- {<<: *test-macos-conda, julia: nightly}
Expand Down
118 changes: 118 additions & 0 deletions Manifest.toml
@@ -0,0 +1,118 @@
[[Base64]]
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

[[Compat]]
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
git-tree-sha1 = "2d9e14d19bad3f9ad5cc5e4cffabc3cfa59de825"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "1.3.0"

[[Conda]]
deps = ["Compat", "JSON", "VersionParsing"]
git-tree-sha1 = "79e34f04163a9d65201aaffd8cb1096468ef2c0c"
repo-rev = "be5e924ecb95d4abb8424512b578e012c7c331d4"
repo-url = "https://github.com/JuliaPy/Conda.jl.git"
uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d"
version = "1.1.1+"

[[Dates]]
deps = ["Printf"]
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"

[[DelimitedFiles]]
deps = ["Mmap"]
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"

[[Distributed]]
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

[[InteractiveUtils]]
deps = ["LinearAlgebra", "Markdown"]
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"

[[JSON]]
deps = ["Dates", "Distributed", "Mmap", "Pkg", "Sockets", "Test", "Unicode"]
git-tree-sha1 = "fec8e4d433072731466d37ed0061b3ba7f70eeb9"
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
version = "0.19.0"

[[LibGit2]]
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

[[Libdl]]
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

[[LinearAlgebra]]
deps = ["Libdl"]
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[[Logging]]
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"

[[MacroTools]]
deps = ["Compat"]
git-tree-sha1 = "c443e1c8d58a4e9f61b708ad0a88286c7042145b"
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
version = "0.4.4"

[[Markdown]]
deps = ["Base64"]
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"

[[Mmap]]
uuid = "a63ad114-7e13-5084-954f-fe012c677804"

[[Pkg]]
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[[Printf]]
deps = ["Unicode"]
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[[REPL]]
deps = ["InteractiveUtils", "Markdown", "Sockets"]
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[[Random]]
deps = ["Serialization"]
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[[SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"

[[Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"

[[SharedArrays]]
deps = ["Distributed", "Mmap", "Random", "Serialization"]
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"

[[Sockets]]
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"

[[SparseArrays]]
deps = ["LinearAlgebra", "Random"]
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[[Statistics]]
deps = ["LinearAlgebra", "SparseArrays"]
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[[Test]]
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[[UUIDs]]
deps = ["Random"]
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[[Unicode]]
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

[[VersionParsing]]
deps = ["Compat"]
git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669"
uuid = "81def892-9a0e-5fdd-b105-ffc91e053289"
version = "1.1.3"
8 changes: 8 additions & 0 deletions Project.toml
@@ -0,0 +1,8 @@
name = "PyCall"
uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"

[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
VersionParsing = "81def892-9a0e-5fdd-b105-ffc91e053289"
19 changes: 0 additions & 19 deletions appveyor.yml
@@ -1,30 +1,11 @@
environment:
matrix:
- julia_version: 0.6
python_version: "27"
- julia_version: 0.6
python_version: "37"
- julia_version: 0.6
python_version: "Conda"

- julia_version: 0.7
python_version: "27"
- julia_version: 0.7
python_version: "37"
- julia_version: 0.7
python_version: "Conda"

- julia_version: 1
python_version: "27"
- julia_version: 1
python_version: "37"
- julia_version: 1
python_version: "Conda"

- julia_version: nightly
python_version: "27"
- julia_version: nightly
python_version: "37"
- julia_version: nightly
python_version: "Conda"

Expand Down
4 changes: 4 additions & 0 deletions test/runtests.jl
@@ -1,6 +1,10 @@
using PyCall, Compat
using Compat.Test, Compat.Dates, Compat.Serialization

using Compat: Pkg
display(Pkg.installed())
println()

filter(f, itr) = collect(Iterators.filter(f, itr))
filter(f, d::AbstractDict) = Base.filter(f, d)

Expand Down