Skip to content

Commit e57883c

Browse files
authored
Merge pull request #10 from cadenmyers13/pytest
Edits for pytest to pass
2 parents 1d5ea71 + 9cd0a7b commit e57883c

File tree

14 files changed

+10
-132
lines changed

14 files changed

+10
-132
lines changed

Diff for: .github/workflows/matrix-and-codecov-on-merge-to-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
with:
1717
project: diffpy.fourigui
1818
c_extension: false
19-
headless: false
19+
headless: true
2020
secrets:
2121
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Diff for: .github/workflows/tests-on-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ jobs:
1313
with:
1414
project: diffpy.fourigui
1515
c_extension: false
16-
headless: false
16+
headless: true

Diff for: diffpy/__init__.py

-23
This file was deleted.

Diff for: diffpy/fourigui/__init__.py

-24
This file was deleted.

Diff for: diffpy/fourigui/tests/__init__.py

Whitespace-only changes.

Diff for: diffpy/fourigui/tests/conftest.py

-19
This file was deleted.

Diff for: diffpy/fourigui/tests/debug.py

-35
This file was deleted.

Diff for: diffpy/fourigui/version.py

-26
This file was deleted.

Diff for: requirements/run.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
h5py
2+
time
3+
tk
4+
matplotlib
5+
numpy

Diff for: src/__init__.py

Whitespace-only changes.

Diff for: src/diffpy/fourigui/fourigui.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from matplotlib import pyplot as plt
99
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk
1010

11-
matplotlib.use("tk.TkAgg")
11+
matplotlib.use("tkagg")
1212

1313
WIDTH = 920
1414
HEIGHT = 630

Diff for: tests/__init__.py

Whitespace-only changes.

Diff for: tests/integration_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import h5py
44
import numpy as np
55

6-
from ..fourigui.fourigui import Gui
6+
from diffpy.fourigui.fourigui import Gui
77

88

99
class TestGui(unittest.TestCase):

Diff for: tests/unit_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import h5py
44

5-
from ..fourigui.fourigui import Gui
5+
from diffpy.fourigui.fourigui import Gui
66

77

88
class TestGui(unittest.TestCase):

0 commit comments

Comments
 (0)