Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/code_changes.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Workflow that runs on code changes to the master branch.
# Workflow that runs on code changes to the main branch.

name: Code changes
on:
push:
branches:
- master
- main

paths:
- policyengine_uk/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Deploy documentation
on:
push:
# Runs on pushes targeting the default branch
branches: [master]
branches: [main]
env:
# `BASE_URL` determines, relative to the root of the domain, the URL that your site is served from.
# E.g., if your site lives at `https://mydomain.org/myproject`, set `BASE_URL=/myproject`.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_code_changes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Code changes
on:
pull_request:
branches:
- master
- main

paths:
- policyengine_uk/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_docs_changes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Docs changes
on:
pull_request:
branches:
- master
- main

paths:
- docs/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/versioning.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Workflow that runs on versioning metadata updates.

name: Versioning updates
name: Versioning updates
on:
push:
branches:
- master
- main

paths:
- changelog_entry.yaml
Expand Down
2 changes: 1 addition & 1 deletion policyengine_uk/microsimulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Third-party imports
import numpy as np
from microdf import MicroDataFrame, MicroSeries
from microdf import MicroDataFrame, MicroSeries

# PolicyEngine core imports
from policyengine_core.tracers import SimpleTracer
Expand Down