Merge pull request #18 from Sparks29032/CI

sbillinge · web-flow · commit 185c129bbdd1 · 2023-07-24T19:00:18.000+02:00
merging to test workflows
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - CI
   pull_request:
   workflow_dispatch:
 
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+testpaths= src/diffpy/utils/tests
+python_files = test*.py
diff --git a/requirements/build.txt b/requirements/build.txt
@@ -0,0 +1,2 @@
+python
+setuptools
diff --git a/src/diffpy/utils/tests/t_helpers.py b/src/diffpy/utils/tests/t_helpers.py
diff --git a/src/diffpy/utils/tests/test_loaddata.py b/src/diffpy/utils/tests/test_loaddata.py
@@ -6,7 +6,7 @@
 import unittest
 import numpy
 from diffpy.utils.parsers import loadData
-from diffpy.utils.tests.testhelpers import datafile
+from diffpy.utils.tests.t_helpers import datafile
 
 loaddata01 = datafile('loaddata01.txt')
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[pytest]`
	`2`	`+testpaths= src/diffpy/utils/tests`
	`3`	`+python_files = test*.py`