Merge pull request #290 from tmaeno/master

PEP517
PanDAWMS · Jan 25, 2024 · 1ef2c79 · 1ef2c79
2 parents c216e3c + 093829a
commit 1ef2c79
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 344 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,11 +11,9 @@ repos:
     hooks:
     -   id: black
         types: [python]
-        args: ["--config", "package/pyproject.toml"]
 
 -   repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
     -   id: isort
         name: isort (python)
-        args: ["--settings-path", "package/pyproject.toml"]
diff --git a/PandaPkgInfo.py b/PandaPkgInfo.py
@@ -1 +1 @@
-release_version = "0.1.1"
+release_version = "0.2.0"
diff --git a/pandaserver/dataservice/ErrorCode.py b/pandaserver/dataservice/ErrorCode.py
@@ -15,7 +15,7 @@
 # location registration failures
 EC_Location = 203
 
-# lost file (=taskbuffer.ErrorCode.EC_LostFile)
+# lost file (taskbuffer.ErrorCode.EC_LostFile)
 EC_LostFile = 110
 
 # missing nEvents

diff --git a/package/pyproject.toml → pyproject.toml b/package/pyproject.toml → pyproject.toml
@@ -7,11 +7,10 @@ name = "panda-server"
 dynamic = ["version"]
 description = "PanDA Server Package"
 readme = "README.md"
-license = "Apache-2.0"
+license = {text = "Apache-2.0"}
 authors = [
     { name = "PanDA Team", email = "[email protected]" },
 ]
-
 dependencies = [
     'panda-common>=0.0.34',
     'panda-client-light>=1.5.55',
@@ -31,11 +30,12 @@ dependencies = [
     'ruamel.yaml',
     'cwl-utils>=0.13',
     'packaging',
-    'snakemake==6.15.5',
+    'snakemake==7.30.1',
     'numpy',
     'scipy',
     'werkzeug'
 ]
+requires-python = ">=3.8"
 
 [project.optional-dependencies]
 oracle = ['cx_Oracle']
@@ -61,6 +61,7 @@ packages = ["pandaserver"]
 
 [tool.hatch.build.targets.wheel.shared-data]
 "templates" = "etc/panda"
+"templates/bin" = "usr/bin"
 "templates/init.d" = "etc/rc.d/init.d"
 "templates/systemd" = "etc/systemd/system"
 

diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/...ates/panda_server-makeSlsXml.exe.template → .../bin/panda_server-makeSlsXml.exe.template b/...ates/panda_server-makeSlsXml.exe.template → .../bin/panda_server-makeSlsXml.exe.template
diff --git a/...lates/panda_server-vomsrenew.exe.template → ...s/bin/panda_server-vomsrenew.exe.template b/...lates/panda_server-vomsrenew.exe.template → ...s/bin/panda_server-vomsrenew.exe.template
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		release_version = "0.1.1"
		release_version = "0.2.0"