Skip to content

Commit

Permalink
Merge pull request #40 from fusion-energy/develop
Browse files Browse the repository at this point in the history
updating materials
  • Loading branch information
shimwell authored Apr 21, 2024
2 parents 89a440e + 4a9c232 commit f6153c0
Show file tree
Hide file tree
Showing 6 changed files with 3,563 additions and 3,095 deletions.
39 changes: 0 additions & 39 deletions .circleci/config.yml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/ci_with_install.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI testing

on:
pull_request:
branches:
- main
push:
branches:
- main

jobs:
testing:
name: CI (Python=${{ matrix.python-version }}, OS=${{ matrix.os }})
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -el {0}
strategy:
matrix:
os: ["ubuntu-latest"]
python-version: ["3.10"]

steps:
- name: checkout actions
uses: actions/checkout@v4
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
channels: conda-forge

- name: install dependencies
run: conda install -c conda-forge openmc -y

- name: install package
run: |
python -m pip install --upgrade pip
python -m pip install .
python -c 'import neutronics_material_maker'
python -m pip install .[density,tests]
- name: run pytest
run: python -m pytest tests -v --cov=neutronics_material_maker --cov-report term --cov-report html:htmlcov --cov-report xml --junitxml=test-reports/junit.xml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
[![CircleCI](https://circleci.com/gh/fusion-energy/neutronics_material_maker/tree/main.svg?style=svg)](https://circleci.com/gh/fusion-energy/neutronics_material_maker/tree/main)
[![CI testing](https://github.com/fusion-energy/neutronics_material_maker/actions/workflows/ci_with_install.yml/badge.svg?branch=main)](https://github.com/fusion-energy/neutronics_material_maker/actions/workflows/ci_with_install.yml)
[![codecov](https://codecov.io/gh/fusion-energy/neutronics_material_maker/branch/main/graph/badge.svg)](https://codecov.io/gh/fusion-energy/neutronics_material_maker)
[![PyPI version](https://badge.fury.io/py/neutronics-material-maker.svg)](https://badge.fury.io/py/neutronics-material-maker)
[![Documentation Status](https://readthedocs.org/projects/neutronics-material-maker/badge/?version=latest)](https://neutronics-material-maker.readthedocs.io/en/latest/?badge=latest)
Expand Down
Loading

0 comments on commit f6153c0

Please sign in to comment.