Skip to content
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
133 changes: 0 additions & 133 deletions CODE_OF_CONDUCT.rst

This file was deleted.

23 changes: 23 additions & 0 deletions news/clean-file.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* No News Added: clean duplicated `Code-Of-Conduct.rst`

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
12 changes: 6 additions & 6 deletions tests/integration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ def setUp(self):
# set up test data
self.test_sofq = h5py.File("tests/testdata/sofq.h5")["data"]
self.test_sofq_cut_10to40px = h5py.File(
"tests/testdata/sofq_cut_10to40px.h5"
"tests/testdata/sofq-cut-10to40px.h5"
)["data"]
self.test_sofq_cut_15to35px = h5py.File(
"tests/testdata/sofq_cut_15to35px.h5"
"tests/testdata/sofq-cut-15to35px.h5"
)["data"]
self.test_gofr = h5py.File("tests/testdata/gofr.h5")["data"]
self.test_gofr_cut_10to40px = h5py.File(
"tests/testdata/gofr_from_sofq_cut_10to40px.h5"
"tests/testdata/gofr-from-sofq-cut-10to40px.h5"
)["data"]
self.test_gofr_cut_15to35px = h5py.File(
"tests/testdata/gofr_from_sofq_cut_15to35px.h5"
"tests/testdata/gofr-from-sofq-cut-15to35px.h5"
)["data"]

def test_load_cube_testdataset1(self):
Expand All @@ -43,7 +43,7 @@ def test_load_cube_testdataset2(self):
# given
self.test_gui.filename_entry.delete(0, "end")
self.test_gui.filename_entry.insert(
0, "tests/testdata/sofq_cut_10to40px.h5"
0, "tests/testdata/sofq-cut-10to40px.h5"
)

# when
Expand All @@ -62,7 +62,7 @@ def test_load_cube_testdataset3(self):
# given
self.test_gui.filename_entry.delete(0, "end")
self.test_gui.filename_entry.insert(
0, "tests/testdata/sofq_cut_15to35px.h5"
0, "tests/testdata/sofq-cut-15to35px.h5"
)

# when
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions tests/testdata/make_testdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ def dummydata(fname="dummydata.h5"):
f.close()


# cutcube("sofq.h5", "sofq_cut_10to40px.h5", 10, 40)
# cutcube("sofq.h5", "sofq_cut_15to35px.h5", 15, 35)
# cutcube("sofq.h5", "sofq-cut-10to40px.h5", 10, 40)
# cutcube("sofq.h5", "sofq-cut-15to35px.h5", 15, 35)
# fftcube("sofq.h5", "gofr.h5")
# fftcube("sofq_cut_10to40px.h5", "gofr_from_sofq_cut_10to40px.h5")
# fftcube("sofq_cut_15to35px.h5", "gofr_from_sofq_cut_15to35px.h5")
# fftcube("sofq-cut-10to40px.h5", "gofr-from-sofq-cut-10to40px.h5")
# fftcube("sofq-cut-15to35px.h5", "gofr-from-sofq-cut-15to35px.h5")
dummydata()
Loading