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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ omit =
*/.venv/*
disable_warnings = couldnt-parse
source =
py_ballisticcalc
py_ballisticcalc_exts
py_ballisticcalc.exts
pyballistic
pyballistic_exts
pyballistic.exts

[report]
exclude_lines =
Expand All @@ -21,9 +21,9 @@ omit =
# Alias Cython-reported file paths to the real source tree locations
source =
.
py_ballisticcalc_exts
py_ballisticcalc.exts
py_ballisticcalc.exts/py_ballisticcalc_exts
pyballistic_exts
pyballistic.exts
pyballistic.exts/pyballistic_exts

[run:plugins]
# Ensure the Cython plugin claims .pyx files for reporting
Expand Down
7 changes: 0 additions & 7 deletions .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Pull Request Guidelines for py-ballisticcalc
Pull Request Guidelines for pyballistic
---------------------------------

Before you submit a pull request, check that it meets these guidelines:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cibuildwheel_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- name: Build binary python package
run: |
cd ./py_ballisticcalc.exts
cd ./pyballistic.exts
uv build --sdist --out-dir ../dist
uv run cibuildwheel --output-dir ../dist
cd ..
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: uv pip install -e .[dev]

- name: Run coverage
run: pytest tests --cov=py_ballisticcalc --cov-report=html
run: pytest tests --cov=pyballistic --cov-report=html

# - name: Install "coverage-badge"
# run: uv pip install coverage-badge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:

- name: Analysing the code with pylint
run: |
pylint ./py_ballisticcalc
pylint ./pyballistic
5 changes: 2 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@ jobs:

- name: Install dependencies
run: |
python -m pip install build cibuildwheel==2.20.0 twine
# Hardcoded cibuildwheel version here to overcome macos build failures on v2.2.0b6. Can probably remove after Python3.9 sunset.
python -m pip install build cibuildwheel twine

- name: Build pure python package
run: python -m build

- name: Build binary python package
run: |
cd ./py_ballisticcalc.exts
cd ./pyballistic.exts
python -m build --sdist --outdir ../dist
cibuildwheel --output-dir ../dist
cd ..
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Build binary python package
run: |
cd ./py_ballisticcalc.exts
cd ./pyballistic.exts
python -m build --sdist --outdir ../dist
cibuildwheel --output-dir ../dist
cd ..
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
fail-fast: false # Set to 'false' so that if one job in the matrix fails, the others will still complete.
matrix: # Define all the combinations for the 'full' test suite
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ] # Operating systems to test on
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] # Python versions to test
python-version: [ "3.10", "3.11", "3.12", "3.13" ] # Python versions to test
# The 'engine' variable for this matrix. Make sure the name matches what you pass in 'with:' below.
engine: [ "euler_engine", "rk4_engine", "cythonized_euler_engine", "cythonized_rk4_engine" ]

Expand All @@ -47,7 +47,7 @@ jobs:
fail-fast: false # Ensure all jobs in this minimal matrix complete even if one fails.
matrix: # Define the combinations for the 'minimal' test suite
os: [ ubuntu-latest ] # Fixed to one OS for minimal testing
python-version: [ "3.9" ] # Fixed to one Python version for minimal testing
python-version: [ "3.10" ] # Fixed to one Python version for minimal testing
# The 'engine-entry' variable as defined in your original minimal matrix.
engine-entry: [ "euler_engine", "rk4_engine", "cythonized_euler_engine", "cythonized_rk4_engine" ]

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-cythonized-euler-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]
engine: [ "cythonized_euler_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand All @@ -41,7 +41,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.9" ]
python-version: [ "3.10" ]
engine: [ "cythonized_euler_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-cythonized-rk4-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]
engine: [ "cythonized_rk4_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand All @@ -41,7 +41,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.9" ]
python-version: [ "3.10" ]
engine: [ "cythonized_rk4_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-euler-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]
engine: [ "euler_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand All @@ -38,7 +38,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.9" ]
python-version: [ "3.10" ]
engine: [ "euler_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
if: startsWith(inputs.engine_name, 'cythonized_')
run: |
echo "Detected Cythonized engine. Building extensions..."
uv pip install -e ./py_ballisticcalc.exts
uv pip install -e ./pyballistic.exts
shell: bash # Ensure this command runs in a bash shell environment

- name: Run tests with ${{ inputs.engine_name }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-rk4-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]
engine: [ "rk4_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand All @@ -40,7 +40,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.9" ]
python-version: [ "3.10" ]
engine: [ "rk4_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest-scipy-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
python-version: [ "3.10", "3.11", "3.12", "3.13" ]
engine: [ "scipy_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand All @@ -38,7 +38,7 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.9" ]
python-version: [ "3.10" ]
engine: [ "scipy_engine" ]

uses: ./.github/workflows/pytest-reusable.yml
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
.coverage
htmlcov
debug
site
/site/
.env
.testall
compile_flags.txt
# Mirror of Cython sources for coverage lookup:
/py_ballisticcalc_exts/*
/pyballistic_exts/*
4 changes: 2 additions & 2 deletions .pybc.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Config template for py_ballisticcalc
# Config template for pyballistic

title = "standard py_ballisticcalc config template"
title = "standard pyballistic config template"
version = "2.2.0"

[pybc.preferred_units]
Expand Down
2 changes: 1 addition & 1 deletion Manifest.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prune py_ballisticcalc_exts
prune pyballistic_exts
prune tests
include py.typed
include Example.ipynb
Expand Down
Loading
Loading