Merge pull request #5922: Misc cleanups

cognifloyd · web-flow · commit 14e98ca97152 · 2023-03-08T12:26:27.000-06:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,7 +16,7 @@ Added
   to pants' use of PEX lockfiles. This is not a user-facing addition.
   #5778 #5789 #5817 #5795 #5830 #5833 #5834 #5841 #5840 #5838 #5842 #5837 #5849 #5850
   #5846 #5853 #5848 #5847 #5858 #5857 #5860 #5868 #5871 #5864 #5874 #5884 #5893 #5891
-  #5890 #5898 #5901 #5906 #5899 #5907 #5909
+  #5890 #5898 #5901 #5906 #5899 #5907 #5909 #5922
   Contributed by @cognifloyd
 
 * Added a joint index to solve the problem of slow mongo queries for scheduled executions. #5805
diff --git a/contrib/packs/actions/pack_mgmt/unload.py b/contrib/packs/actions/pack_mgmt/unload.py
@@ -20,13 +20,13 @@
 from st2common.persistence.pack import Pack
 from st2common.persistence.pack import ConfigSchema
 from st2common.persistence.pack import Config
-from st2common.persistence.reactor import SensorType
-from st2common.persistence.reactor import TriggerType
-from st2common.persistence.reactor import Trigger
-from st2common.persistence.reactor import Rule
 from st2common.persistence.action import Action
 from st2common.persistence.action import ActionAlias
 from st2common.persistence.policy import Policy
+from st2common.persistence.rule import Rule
+from st2common.persistence.sensor import SensorType
+from st2common.persistence.trigger import Trigger
+from st2common.persistence.trigger import TriggerType
 from st2common.constants.pack import SYSTEM_PACK_NAMES
 from st2common.services.triggers import cleanup_trigger_db_for_rule
 from st2common.exceptions.db import StackStormDBObjectNotFoundError
diff --git a/contrib/packs/tests/BUILD b/contrib/packs/tests/BUILD
@@ -4,7 +4,7 @@ python_tests(
         "test_action_download.py": {
             "dependencies": [
                 # imports tests.fixtures which is ambiguous. Tell pants which one to use.
-                "contrib/packs/tests/fixtures",
+                "./fixtures",
             ],
         }
     },
diff --git a/lockfiles/st2-constraints.txt b/lockfiles/st2-constraints.txt
@@ -1,5 +1,6 @@
 # Add/remove version constraints for transitive dependencies in this file
 # (transitive dependencies are dependencies of our direct dependencies).
+# Then run `./pants generate-lockfiles --resolve=st2` to regenerate the lockfile.
 #
 # Direct dependencies should be recorded in `requirements-pants.txt`, not here.
 
diff --git a/requirements-pants.txt b/requirements-pants.txt
@@ -1,4 +1,5 @@
 # Add/remove direct 3rd party dependencies here, with version constraints if necessary.
+# Then run `./pants generate-lockfiles --resolve=st2` to regenerate the lockfile.
 #
 # Please do not add transitive dependencies in this file (ie dependencies of our dependencies).
 # Use `lockfiles/st2-constraints.txt` to constrain the version of these transitive dependencies.
diff --git a/st2common/st2common/cmd/purge_executions.py b/st2common/st2common/cmd/purge_executions.py
diff --git a/st2common/st2common/cmd/purge_rule_enforcements.py b/st2common/st2common/cmd/purge_rule_enforcements.py
@@ -14,7 +14,7 @@
 
 
 """
-A utility script that purges trigger instances older than certain
+A utility script that purges rule enforcements older than certain
 timestamp.
 
 *** RISK RISK RISK. You will lose data. Run at your own risk. ***
diff --git a/st2common/st2common/cmd/purge_tokens.py b/st2common/st2common/cmd/purge_tokens.py
@@ -14,8 +14,7 @@
 
 
 """
-A utility script that purges trigger instances older than certain
-timestamp.
+A utility script that purges tokens older than certain timestamp.
 
 *** RISK RISK RISK. You will lose data. Run at your own risk. ***
 """
diff --git a/st2common/st2common/cmd/purge_traces.py b/st2common/st2common/cmd/purge_traces.py
@@ -14,8 +14,7 @@
 
 
 """
-A utility script that purges trigger instances older than certain
-timestamp.
+A utility script that purges traces older than certain timestamp.
 
 *** RISK RISK RISK. You will lose data. Run at your own risk. ***
 """
diff --git a/st2common/st2common/cmd/purge_trigger_instances.py b/st2common/st2common/cmd/purge_trigger_instances.py
diff --git a/st2reactor/st2reactor/rules/tester.py b/st2reactor/st2reactor/rules/tester.py
@@ -27,7 +27,8 @@
 from st2common.models.db.trigger import TriggerDB
 from st2common.models.db.trigger import TriggerInstanceDB
 from st2common.models.system.common import ResourceReference
-from st2common.persistence.reactor import Rule, TriggerInstance, Trigger
+from st2common.persistence.rule import Rule
+from st2common.persistence.trigger import Trigger, TriggerInstance
 
 from st2reactor.rules.enforcer import RuleEnforcer
 from st2reactor.rules.matcher import RulesMatcher

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ python_tests(`
`4`	`4`	`"test_action_download.py": {`
`5`	`5`	`"dependencies": [`
`6`	`6`	`# imports tests.fixtures which is ambiguous. Tell pants which one to use.`
`7`		`- "contrib/packs/tests/fixtures",`
	`7`	`+ "./fixtures",`
`8`	`8`	`],`
`9`	`9`	`}`
`10`	`10`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`# Add/remove version constraints for transitive dependencies in this file`
`2`	`2`	`# (transitive dependencies are dependencies of our direct dependencies).`
	`3`	+# Then run `./pants generate-lockfiles --resolve=st2` to regenerate the lockfile.
`3`	`4`	`#`
`4`	`5`	# Direct dependencies should be recorded in `requirements-pants.txt`, not here.
`5`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Add/remove direct 3rd party dependencies here, with version constraints if necessary.`
	`2`	+# Then run `./pants generate-lockfiles --resolve=st2` to regenerate the lockfile.
`2`	`3`	`#`
`3`	`4`	`# Please do not add transitive dependencies in this file (ie dependencies of our dependencies).`
`4`	`5`	# Use `lockfiles/st2-constraints.txt` to constrain the version of these transitive dependencies.