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.

Sign up for GitHub

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

Jump to bottom

Include sas.qtgui.Utilities.Reports in build output #2139

Merged
merged 4 commits into from
Aug 16, 2022
Merged

Include sas.qtgui.Utilities.Reports in build output #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6990a07
Include sas.qtgui.Utilities.Reports and associated UI files in setup.…
krzywon Aug 11, 2022
817887d
Creaet proper package directory instead of bundling into existing dir…
krzywon Aug 11, 2022
eb1ebb2
Ensure the Reports .ui files are included in the installation and inc…
krzywon Aug 11, 2022
2c5abef
Include reports css file in package data
krzywon Aug 11, 2022
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/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install wheel setuptools
python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5
python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5 html2text importlib_resources

- name: Install pyopencl
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/installers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ jobs:
python -m pip install numpy scipy==1.7.3 docutils "pytest<6" sphinx unittest-xml-reporting
python -m pip install tinycc h5py sphinx pyparsing html5lib reportlab==3.6.6 pybind11 appdirs
python -m pip install six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint
python -m pip install qt5reactor periodictable uncertainties debugpy dominate
python -m pip install qt5reactor periodictable uncertainties debugpy dominate importlib_resources
python -m pip install html2text


- name: Install PyQt (Windows + Linux)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install wheel setuptools
python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5
python -m pip install numpy scipy matplotlib docutils "pytest<6" sphinx unittest-xml-reporting tinycc lxml h5py sphinx pyparsing html5lib reportlab pybind11 appdirs six numba mako ipython qtconsole xhtml2pdf unittest-xml-reporting pylint qt5reactor periodictable PyQt5 html2text importlib_resources

- name: Install pyopencl (Linux + macOS)
if: ${{ matrix.os != 'windows-latest' }}
Expand Down
13 changes: 11 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,17 @@ def run(self):
package_dir["sas.qtgui.Utilities"] = os.path.join(
"src", "sas", "qtgui", "Utilities")
packages.append("sas.qtgui.Utilities")
package_dir["sas.qtgui.UtilitiesUI"] = os.path.join(
"src", "sas", "qtgui", "Utilities","UI")
package_dir["sas.qtgui.Utilities.UI"] = os.path.join(
"src", "sas", "qtgui", "Utilities", "UI")
packages.append("sas.qtgui.Utilities.UI")

package_dir["sas.qtgui.Utilities.Reports"] = os.path.join(
"src", "sas", "qtgui", "Utilities", "Reports")
packages.append("sas.qtgui.Utilities.Reports")
package_dir["sas.qtgui.Utilities.Reports.UI"] = os.path.join(
"src", "sas", "qtgui", "Utilities", "Reports", "UI")
packages.append("sas.qtgui.Utilities.Reports.UI")

package_dir["sas.qtgui.Calculators"] = os.path.join(
"src", "sas", "qtgui", "Calculators")
package_dir["sas.qtgui.Calculators.UI"] = os.path.join(
Expand Down Expand Up @@ -273,6 +280,8 @@ def run(self):
'Perspectives/Inversion/UI/*',
'Plotting/UI/*',
'Utilities/UI/*',
'Utilities/Reports/UI/*',
'Utilities/Reports/*.css'
'UI/*',
'UI/res/*',
]
Expand Down
2 changes: 1 addition & 1 deletion src/sas/qtgui/Utilities/UnitTesting/ReportDialogTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import sas.qtgui.Utilities.GuiUtils as GuiUtils
# Local
from qtgui.Utilities.Reports.ReportDialog import ReportDialog
from sas.qtgui.Utilities.Reports.ReportDialog import ReportDialog

if not QtWidgets.QApplication.instance():
app = QtWidgets.QApplication(sys.argv)
Expand Down