Skip to content

Commit

Permalink
Merge branch 'master' into cv-version-update
Browse files Browse the repository at this point in the history
  • Loading branch information
sambible authored Oct 18, 2024
2 parents 468943d + 98c53e4 commit a56f7b5
Show file tree
Hide file tree
Showing 48 changed files with 1,969 additions and 243 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ updates:
schedule:
interval: "daily"
labels:
- '6.16.z'
- "CherryPick"
- "dependencies"
- "6.15.z"
- "6.14.z"
- "6.13.z"
- "6.12.z"

# Maintain dependencies for our GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
labels:
- '6.16.z'
- "CherryPick"
- "dependencies"
- "6.15.z"
- "6.14.z"
- "6.13.z"
- "6.12.z"
2 changes: 1 addition & 1 deletion .github/workflows/auto_cherry_pick_merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- id: automerge
name: Auto merge of cherry-picked PRs.
uses: "pascalgn/[email protected].3"
uses: "pascalgn/[email protected].4"
env:
GITHUB_TOKEN: "${{ secrets.CHERRYPICK_PAT }}"
MERGE_LABELS: "AutoMerge_Cherry_Picked, Auto_Cherry_Picked"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11']
python-version: ['3.10', '3.11', '3.12']
steps:
- name: Checkout Airgun
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ ci:

repos:
- repo: https://github.com/psf/black
rev: 24.4.2
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.2
rev: v0.6.8
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
7 changes: 7 additions & 0 deletions airgun/entities/activationkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ def remove_host_collection(self, entity_name, hc_name):
view.flash.assert_no_error()
view.flash.dismiss()

def enable_repository(self, entity_name, repo_name):
view = self.navigate_to(self, 'Edit', entity_name=entity_name)
view.repository_sets.click()
view.repository_sets.search(repo_name)
view.repository_sets.check_box.click()
view.repository_sets.actions.fill('Override to Enabled')


@navigator.register(ActivationKeyEntity, 'All')
class ShowAllActivationKeys(NavigateStep):
Expand Down
Loading

0 comments on commit a56f7b5

Please sign in to comment.