Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edits for pytest to pass #10

Merged
merged 4 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
with:
project: diffpy.fourigui
c_extension: false
headless: false
headless: true
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
with:
project: diffpy.fourigui
c_extension: false
headless: false
headless: true
23 changes: 0 additions & 23 deletions diffpy/__init__.py

This file was deleted.

24 changes: 0 additions & 24 deletions diffpy/fourigui/__init__.py

This file was deleted.

Empty file removed diffpy/fourigui/tests/__init__.py
Empty file.
19 changes: 0 additions & 19 deletions diffpy/fourigui/tests/conftest.py

This file was deleted.

35 changes: 0 additions & 35 deletions diffpy/fourigui/tests/debug.py

This file was deleted.

26 changes: 0 additions & 26 deletions diffpy/fourigui/version.py

This file was deleted.

5 changes: 5 additions & 0 deletions requirements/run.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
h5py
time
tk
matplotlib
numpy
Empty file removed src/__init__.py
Empty file.
2 changes: 1 addition & 1 deletion src/diffpy/fourigui/fourigui.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from matplotlib import pyplot as plt
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2Tk

matplotlib.use("tk.TkAgg")
matplotlib.use("tkagg")

WIDTH = 920
HEIGHT = 630
Expand Down
Empty file removed tests/__init__.py
Empty file.
2 changes: 1 addition & 1 deletion tests/integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import h5py
import numpy as np

from ..fourigui.fourigui import Gui
from diffpy.fourigui.fourigui import Gui


class TestGui(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import h5py

from ..fourigui.fourigui import Gui
from diffpy.fourigui.fourigui import Gui


class TestGui(unittest.TestCase):
Expand Down