Skip to content

Commit ed05993

Browse files
committed
truncate
1 parent 71ebce9 commit ed05993

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

.circleci/config.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ jobs:
258258
name: Install Python dependencies
259259
command: |
260260
source venv_test/bin/activate
261-
python -m pip install -U pip setuptools wheel "numpy" "pandas" "scipy" "pytest"
261+
python -m pip install -U pip setuptools wheel
262262
- run:
263263
name: Install Grid2op
264264
command: |
@@ -271,8 +271,7 @@ jobs:
271271
source venv_test/bin/activate
272272
./utils/install_julia.sh 1.10.4
273273
python -m pip install julia
274-
#python ./utils/install_pycall.py
275-
julia -e 'using Pkg; Pkg.add([Pkg.PackageSpec(;name="Ipopt"), Pkg.PackageSpec(;name="PowerModels", version="0.21.3"), Pkg.PackageSpec(;name="PyCall"), Pkg.PackageSpec(;url="https://github.com/loriab/PandaModels.jl", rev="update_pm")])'
274+
julia -e 'using Pkg; Pkg.add(["PandaModels", "PyCall"])'
276275
- run:
277276
name: Environment information
278277
command: |
@@ -284,29 +283,12 @@ jobs:
284283
python-jl --version
285284
julia --version
286285
julia -e 'using Pkg; Pkg.status(); Pkg.status(outdated=true)'
287-
- run:
288-
name: Test PowerModels in Julia
289-
no_output_timeout: 30m
290-
command: |
291-
source venv_test/bin/activate
292-
julia -e 'using PyCall; math = pyimport("math"); print(math.sin(math.pi/4))'
293-
julia -e 'using Pkg; Pkg.test("PowerModels")'
294-
# PM testing above is clean but takes 30m
295-
- run:
296-
name: Test PandaModels in Julia
297-
command: |
298-
source venv_test/bin/activate
299-
julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name="Ipopt", version="0.9"))'
300-
julia -e 'using Pkg; Pkg.status(); Pkg.status(outdated=true)'
301-
julia -e 'using Pkg; Pkg.test("PandaModels")'
302-
# PdM testing above has a couple failures b/c Ipopt=1 unless downgrade (taking PM with it)
303286
- run:
304287
name: Test PowerModels in PandaPower
305288
command: |
306289
source venv_test/bin/activate
307290
python -m pytest -v venv_test/lib/python3.12/site-packages/pandapower/test/opf/test_pandamodels_runpm.py
308291
# use python-jl instead of python above if get a static libpython error
309-
# PdP testing above has a couple failures b/c Ipopt=1 unless downgrade (taking PM with it)
310292
311293
install39:
312294
executor: python39

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ def my_test_suite():
8181
"ChroniX2Grid>=1.2.0.post1"
8282
],
8383
"powermodels": [
84+
"PandaModelsBackend"
8485
],
8586
}
8687
}

utils/install_pycall.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)