Merge pull request #255 from wguanicedew/dev

Dev
HSF · Jan 3, 2024 · edf2422 · edf2422
2 parents a0ffee3 + 862fa17
commit edf2422
Show file tree

Hide file tree

Showing 57 changed files with 2,149 additions and 566 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -49,4 +49,3 @@ jobs:
         python main/tools/pypi/update_version.py ${version_tag}
         python setup.py sdist bdist_wheel
         twine upload  */dist/idds*-${version_tag}.tar.gz
-        twine upload  */dist/idds*-${version_tag}*.whl
diff --git a/atlas/lib/idds/atlas/version.py b/atlas/lib/idds/atlas/version.py
@@ -9,4 +9,4 @@
 # - Wen Guan, <[email protected]>, 2019 - 2021
 
 
-release_version = "0.11.5"
+release_version = "2.0.9"
diff --git a/atlas/tools/env/environment.yml b/atlas/tools/env/environment.yml
@@ -13,5 +13,5 @@ dependencies:
   - panda-client-light     # panda client
   - rucio-clients
   - rucio-clients-atlas
-  - idds-common==0.11.5
-  - idds-workflow==0.11.5
+  - idds-common==2.0.9
+  - idds-workflow==2.0.9
diff --git a/client/lib/idds/client/version.py b/client/lib/idds/client/version.py
@@ -9,4 +9,4 @@
 # - Wen Guan, <[email protected]>, 2019 - 2021
 
 
-release_version = "0.11.5"
+release_version = "2.0.9"
diff --git a/client/tools/env/environment.yml b/client/tools/env/environment.yml
@@ -7,5 +7,5 @@ dependencies:
   - urllib3                          # url connections
   - tabulate
   - argcomplete
-  - idds-common==0.11.5
-  - idds-workflow==0.11.5
+  - idds-common==2.0.9
+  - idds-workflow==2.0.9
diff --git a/common/lib/idds/common/constants.py b/common/lib/idds/common/constants.py
@@ -293,6 +293,8 @@ class ContentStatus(IDDSEnum):
     Missing = 9
     Cancelled = 10
     Activated = 11
+    SubAvailable = 12
+    FinalSubAvailable = 13
 
 
 class ContentLocking(IDDSEnum):

diff --git a/common/lib/idds/common/version.py b/common/lib/idds/common/version.py
@@ -9,4 +9,4 @@
 # - Wen Guan, <[email protected]>, 2019 - 2021
 
 
-release_version = "0.11.5"
+release_version = "2.0.9"
diff --git a/common/tools/env/environment.yml b/common/tools/env/environment.yml
@@ -7,4 +7,4 @@ dependencies:
   - pyjwt            # Pyjwt
   - packaging
   - requests
-  - dogpile.cache
+  - dogpile.cache
diff --git a/doma/lib/idds/doma/version.py b/doma/lib/idds/doma/version.py
@@ -9,4 +9,4 @@
 # - Wen Guan, <[email protected]>, 2020 - 2021
 
 
-release_version = "0.11.5"
+release_version = "2.0.9"
diff --git a/doma/lib/idds/doma/workflowv2/domapandawork.py b/doma/lib/idds/doma/workflowv2/domapandawork.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@
		# - Wen Guan, <[email protected]>, 2019 - 2021


		release_version = "0.11.5"
		release_version = "2.0.9"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@
		# - Wen Guan, <[email protected]>, 2020 - 2021


		release_version = "0.11.5"
		release_version = "2.0.9"