Skip to content

Commit a67181a

Browse files
Try Conda
1 parent 46f6812 commit a67181a

6 files changed

Lines changed: 34 additions & 26 deletions

File tree

.appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ environment:
1414
- julia_version: nightly
1515

1616
platform:
17-
- x86 # 32-bit
17+
# Currently, the 32-bit build is taking >1hr, which fails
18+
# and cannot be increased: https://www.appveyor.com/docs/build-configuration/#build-timeout
19+
# TODO: Add 32-bit build back in
20+
# This can likely be fixed by reducing the deps
21+
# - x86 # 32-bit
1822
- x64 # 64-bit
1923

2024
# Uncomment the following lines to allow failures on nightly julia

Manifest.toml

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ version = "0.1.0"
55

66
[deps]
77
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
8+
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
89
ConfParser = "88353bc9-fd38-507d-a820-d3b43837d6b9"
910
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
1011
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"

docs/Manifest.toml

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
3+
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
34
ConfParser = "88353bc9-fd38-507d-a820-d3b43837d6b9"
45
DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
56
Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"

src/Histograms.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ using PyCall
1515
using NPZ
1616
using ..Utilities
1717

18-
scsta = PyCall.pyimport("scipy.stats")
18+
using Conda
19+
Conda.add("scipy")
20+
scsta = pyimport_conda("scipy.stats","")
1921

2022
"""
2123
A simple struct to store samples for empirical PDFs (histograms, distances etc.)

0 commit comments

Comments
 (0)