Skip to content

Commit dd9c125

Browse files
authored
Merge pull request #520 from HSF/dev
fix pyproject
2 parents d5805fc + c75dae3 commit dd9c125

File tree

9 files changed

+43
-9
lines changed

9 files changed

+43
-9
lines changed

atlas/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,7 @@ Source = "https://github.com/HSF/iDDS"
4545

4646
[tool.setuptools]
4747
package-dir = {"" = "lib"}
48-
packages = ["idds.atlas"]
48+
49+
[tool.setuptools.packages.find]
50+
where = ["lib"]
51+
include = ["idds.atlas*"]

client/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ Source = "https://github.com/HSF/iDDS"
3636

3737
[tool.setuptools]
3838
package-dir = {"" = "lib"}
39-
packages = ["idds.client"]
39+
40+
[tool.setuptools.packages.find]
41+
where = ["lib"]
42+
include = ["idds.client*"]
4043

4144
[tool.setuptools.package-data]
4245
"*" = ["*.template"]

common/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ Source = "https://github.com/HSF/iDDS"
3333

3434
[tool.setuptools]
3535
package-dir = {"" = "lib"}
36-
packages = ["idds.common"]
36+
37+
[tool.setuptools.packages.find]
38+
where = ["lib"]
39+
include = ["idds.common*"]
3740

3841
[tool.setuptools.package-data]
3942
"idds.common" = ["*.template"]

doma/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ Source = "https://github.com/HSF/iDDS"
3333

3434
[tool.setuptools]
3535
package-dir = {"" = "lib"}
36-
packages = ["idds.doma"]
36+
37+
[tool.setuptools.packages.find]
38+
where = ["lib"]
39+
include = ["idds.doma*"]

main/pyproject.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,17 @@ Source = "https://github.com/HSF/iDDS"
6464

6565
[tool.setuptools]
6666
package-dir = {"" = "lib"}
67-
packages = ["idds.agents", "idds.api", "idds.core", "idds.orm", "idds.rest", "idds.tests"]
67+
68+
[tool.setuptools.packages.find]
69+
where = ["lib"]
70+
include = [
71+
"idds.agents*",
72+
"idds.api*",
73+
"idds.core*",
74+
"idds.orm*",
75+
"idds.rest*",
76+
"idds.tests*",
77+
]
6878

6979
[tool.setuptools.package-data]
7080
"*" = ["*.template", "*.cfg", "*.conf", "*.ini", "*.sql"]

monitor/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ Source = "https://github.com/HSF/iDDS"
3232

3333
[tool.setuptools]
3434
package-dir = {"" = "lib"}
35-
packages = ["idds.monitor"]
35+
36+
[tool.setuptools.packages.find]
37+
where = ["lib"]
38+
include = ["idds.monitor*"]
3639

3740
[tool.setuptools.package-data]
3841
"idds.monitor" = ["data/**/*"]

prompt/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ Source = "https://github.com/HSF/iDDS"
3232

3333
[tool.setuptools]
3434
package-dir = {"" = "lib"}
35-
packages = ["idds.prompt"]
35+
36+
[tool.setuptools.packages.find]
37+
where = ["lib"]
38+
include = ["idds.prompt*"]

website/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ Source = "https://github.com/HSF/iDDS"
3232

3333
[tool.setuptools]
3434
package-dir = {"" = "lib"}
35-
packages = ["idds.website"]
35+
36+
[tool.setuptools.packages.find]
37+
where = ["lib"]
38+
include = ["idds.website*"]
3639

3740
[tool.setuptools.package-data]
3841
"idds.website" = ["data/**/*"]

workflow/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ Source = "https://github.com/HSF/iDDS"
3434

3535
[tool.setuptools]
3636
package-dir = {"" = "lib"}
37-
packages = ["idds.iworkflow", "idds.workflow", "idds.workflowv2"]
37+
38+
[tool.setuptools.packages.find]
39+
where = ["lib"]
40+
include = ["idds.iworkflow*", "idds.workflow*", "idds.workflowv2*"]

0 commit comments

Comments
 (0)