Skip to content

Commit 20a60b8

Browse files
author
Christopher Doris
committed
Merge remote-tracking branch 'origin/main' into v1
2 parents 03e2ed4 + 52db81d commit 20a60b8

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ jobs:
6767
fail-fast: false
6868
matrix:
6969
os: [ubuntu-latest, windows-latest, macos-latest]
70-
pyversion: ["3", "3.10"]
70+
pyversion: ['3.13', '3.10']
7171
juliaexe: ["@JuliaPkg"]
7272
include:
7373
- os: ubuntu-latest
74-
pyversion: 3
74+
pyversion: '3.13'
7575
juliaexe: julia
7676
env:
7777
MANUAL_TEST_PROJECT: /tmp/juliacall-test-project

CondaPkg.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ version = ">=3.10,<4"
1515
[dev.deps]
1616
matplotlib = ""
1717
pyside6 = ""
18+
python = "<3.14"

Project.toml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ CategoricalArraysExt = "CategoricalArrays"
2323
PyCallExt = "PyCall"
2424

2525
[compat]
26-
Aqua = "0 - 999"
2726
CategoricalArrays = "0.10, 1"
2827
CondaPkg = "0.2.33"
2928
Dates = "1"
@@ -35,18 +34,12 @@ PyCall = "1"
3534
REPL = "1"
3635
Serialization = "1"
3736
Tables = "1"
38-
Test = "1"
39-
TestItemRunner = "0 - 999"
4037
UnsafePointers = "1"
4138
julia = "1.10"
4239

4340
[extras]
44-
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
4541
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
4642
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
47-
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
48-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
49-
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
5043

51-
[targets]
52-
test = ["Aqua", "PyCall", "Test", "TestItemRunner", "REPL"]
44+
[workspace]
45+
projects = ["test", "docs", "benchmark"]

docs/Project.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
44

55
[compat]
66
Documenter = "1"
7-
8-
[sources]
9-
PythonCall = {path = ".."}

test/Project.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[deps]
2+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
3+
CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
4+
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
5+
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
6+
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
7+
PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
8+
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
9+
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
10+
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
11+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
12+
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
13+
14+
[compat]
15+
PyCall = "1"

0 commit comments

Comments
 (0)