Merge pull request #74 from smason/move-tests

Move tests to root directory

Author: makeclean

.circleci/config.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.7
+          cache: 'pip'
+
+      - name: Install packages
+        run: |
+          pip install .[dev]
+
+      - name: Test with pytest
+        run: |
+          pytest --cov=csg2csg
+
+      - name: Lint with Ruff
+        run: |
+          ruff --format=github --target-version=py37 .
+        continue-on-error: true

.github/workflows/auto_format_pep8.yml

@@ -22,4 +22,6 @@ share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-MANIFEST
+MANIFEST
+
+*~

.github/workflows/ci.yaml

@@ -1,5 +1,4 @@
-
-[![CircleCI](https://circleci.com/gh/makeclean/csg2csg.svg?style=svg)](https://circleci.com/gh/makeclean/csg2csg)
+[![CI test results](https://github.com/makeclean/csg2csg/actions/workflows/ci.yaml/badge.svg)](https://github.com/makeclean/csg2csg/actions/workflows/ci.yaml)
 
 # csg2csg
 A tool to translate common Monte Carlo geometry formats between each other.

.gitignore

@@ -46,7 +46,7 @@ def find_cell(self, cell_id):
     # read the whole file into a big list for further
     # procesing
     def read(self):
-        with open(self.filename, "rU", errors="replace") as f:
+        with open(self.filename, errors="replace") as f:
             self.file_lines = f.readlines()
 
         # sometimes truely monstrous people stuff weird

README.md

@@ -93,17 +93,16 @@ class MaterialCard(Card):
     approach is taken here for maximal compability amongst codes.
     """
 
-    material_name = ""
-    material_number = 0
-    composition_dictionary = {}
-    xsid_dictionary = {}
-    density = 0
-    mat_data = 0
-    material_colour = 0
-
     # constructor
     def __init__(self, material_number=0, card_string=""):
         Card.__init__(self, card_string)
+        self.material_name = ""
+        self.material_number = 0
+        self.composition_dictionary = {}
+        self.xsid_dictionary = {}
+        self.density = 0
+        self.mat_data = 0
+        self.material_colour = 0
         self.material_number = material_number
         self.mat_data = MaterialData()