Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into refactor-and-typecheck-api-interfaces
Browse files Browse the repository at this point in the history
JessicaS11 authored Sep 16, 2024
2 parents e41aed0 + d0bc315 commit 81d60dd
Showing 13 changed files with 7,036 additions and 5,654 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
@@ -6,33 +6,29 @@ on:
push:
branches:
- "main" # Releases
- "development" # PR merges
- "development" # Feature PR merges
pull_request:
branches:
- "main" # Release pull requests
pull_request_review:
types:
- "submitted"
paths:
- ".github/**"
- "icepyx/**/*.py"
- "pyproject.toml"
- "requirements*.txt"
- "main" # Release PRs
workflow_dispatch:
inputs:
ref:
description: "The ref to test"
type: "string"


jobs:
test:
name: "Integration test"
# Job is conditional:
# - Do not run on PRs from forks
# - Do not run on `pull_request_review` events unless the PR is approved.
if: "${{ !github.event.pull_request.head.repo.fork && (github.event.action != 'pull_request_review' || github.event.review.state == 'approved') }}"
# Do not run on PRs from forks:
if: "${{ !github.event.pull_request.head.repo.fork }}"
runs-on: "ubuntu-latest"

steps:
- uses: "actions/checkout@v4"
with:
fetch-depth: 0
ref: "${{ inputs.ref }}"

- uses: "./.github/actions/install-icepyx"
with:
2 changes: 1 addition & 1 deletion .github/workflows/traffic_action.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ jobs:

# Calculates traffic and clones and stores in CSV file
- name: GitHub traffic
uses: sangonzal/repository-traffic-action@v0.1.5
uses: sangonzal/repository-traffic-action@v.0.1.6
env:
TRAFFIC_ACTION_TOKEN: ${{ secrets.TRAFFIC_ACTION_TOKEN }}

4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -26,14 +26,14 @@ repos:
- tomli

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.0
rev: v0.6.3
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]
- id: ruff-format

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.18
rev: v0.19
hooks:
- id: validate-pyproject

Loading

0 comments on commit 81d60dd

Please sign in to comment.