Skip to content

Commit

Permalink
chore: use main branch
Browse files Browse the repository at this point in the history
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
  • Loading branch information
henryiii committed Oct 9, 2024
1 parent 721bf72 commit 3c6045d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
release:
types:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- master
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img alt="Particle Logo" src="https://github.com/scikit-hep/particle/raw/master/docs/ParticleLogo300.png"/>
<img alt="Particle Logo" src="https://github.com/scikit-hep/particle/raw/main/docs/ParticleLogo300.png"/>

# Particle: PDG particle data and identification codes

Expand All @@ -8,9 +8,9 @@
[![Zenodo DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2552429.svg)](https://doi.org/10.5281/zenodo.2552429)

[![GitHub Actions Status: CI](https://github.com/scikit-hep/particle/workflows/CI/badge.svg)](https://github.com/scikit-hep/particle/actions)
[![Code Coverage](https://codecov.io/gh/scikit-hep/particle/graph/badge.svg?branch=master)](https://codecov.io/gh/scikit-hep/particle?branch=master)
[![Code Coverage](https://codecov.io/gh/scikit-hep/particle/graph/badge.svg?branch=main)](https://codecov.io/gh/scikit-hep/particle?branch=main)

[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/scikit-hep/particle/master?urlpath=lab/tree/notebooks/ParticleDemo.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/scikit-hep/particle/main?urlpath=lab/tree/notebooks/ParticleDemo.ipynb)

Particle provides a pythonic interface to the [Particle Data Group](http://pdg.lbl.gov/) (PDG)
particle data tables and particle identification codes,
Expand Down Expand Up @@ -43,7 +43,7 @@ or similar (use `--user`, `virtualenv`, etc. if you wish).

## Changelog

See the [changelog](https://github.com/scikit-hep/particle/blob/master/docs/CHANGELOG.md) for a history of notable changes.
See the [changelog](https://github.com/scikit-hep/particle/blob/main/docs/CHANGELOG.md) for a history of notable changes.

## Getting started: PDG IDs

Expand Down
2 changes: 1 addition & 1 deletion admin/dump_pdgid_to_lhcb.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


def download_table(
url="https://gitlab.cern.ch/lhcb-conddb/DDDB/-/raw/master/param/ParticleTable.txt",
url="https://gitlab.cern.ch/lhcb-conddb/DDDB/-/raw/main/param/ParticleTable.txt",
):
r = requests.get(url)
r.raise_for_status()
Expand Down
2 changes: 1 addition & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ November 19th, 2019
- MC particle identification code converters:
- Introduced directional maps `PDG2EvtGenNameMap` and
`EvtGen2PDGNameMap` between PDG and EvtGen names.
- Conversions master file `data/conversions.csv` added.
- Conversions main file `data/conversions.csv` added.
- Content of converters CSV files are now ordered.
- Documentation:
- README updated with new package functionality.
Expand Down
2 changes: 1 addition & 1 deletion notebooks/ParticleDemo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"\n",
"### Henry Schreiner and Eduardo Rodrigues\n",
"\n",
"Some of the demos assume you have run `python -m pip install particle` or `pixi run lab`. You can [view the demo here](https://nbviewer.jupyter.org/github/scikit-hep/particle/blob/master/notebooks/ParticleDemo.ipynb) or [run it here](https://mybinder.org/v2/gh/scikit-hep/particle/master?urlpath=lab/tree/notebooks/ParticleDemo.ipynb) on Binder."
"Some of the demos assume you have run `python -m pip install particle` or `pixi run lab`. You can [view the demo here](https://nbviewer.jupyter.org/github/scikit-hep/particle/blob/main/notebooks/ParticleDemo.ipynb) or [run it here](https://mybinder.org/v2/gh/scikit-hep/particle/main?urlpath=lab/tree/notebooks/ParticleDemo.ipynb) on Binder."
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ filterwarnings = [
]

[tool.pylint]
master.py-version = "3.8"
py-version = "3.8"
reports.output-format = "colorized"
similarities.ignore-imports = "yes"
master.jobs = "0"
jobs = "0"
messages_control.enable = [
"useless-suppression",
]
Expand Down
4 changes: 2 additions & 2 deletions src/particle/particle/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ def version_header(filename: str, version_number: str) -> str:

def main(version: str, year: str) -> None:
"Regenerate output files - run directly inside the package"
master_dir = os.path.dirname(FILE_DIR)
data_dir = os.path.join(master_dir, "data")
main_dir = os.path.dirname(FILE_DIR)
data_dir = os.path.join(main_dir, "data")
particle2008 = os.path.join(data_dir, "particle2008.csv")
particlenew = os.path.join(data_dir, "particle" + year + ".csv")

Expand Down

0 comments on commit 3c6045d

Please sign in to comment.