Skip to content

Commit 6f76d11

Browse files
committed
Changes to prepare for packaging and deployment
1 parent 6b831f2 commit 6f76d11

30 files changed

+106
-57
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,6 @@ cython_debug/
159159
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
160160
#.idea/
161161
.vscode/
162-
.DS_Store
162+
.DS_Store
163+
164+
_version.py

lix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
QWidget,
2121
)
2222

23-
from microscope.microscope import Microscope
23+
from qmicroscope.microscope import Microscope
2424

2525

2626
class Form(QMainWindow):

main.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
QWidget,
2020
)
2121

22-
from microscope.microscope import Microscope
23-
from microscope.container import Container
24-
from microscope.settings import Settings
25-
from microscope.plugins.record_plugin import RecordPlugin
22+
from qmicroscope.microscope import Microscope
23+
from qmicroscope.container import Container
24+
from qmicroscope.settings import Settings
25+
from qmicroscope.plugins.record_plugin import RecordPlugin
2626

2727

2828
class Form(QMainWindow):

monitor.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
QWidget,
1717
QSplitter,
1818
)
19-
from microscope.microscope import Microscope
20-
from microscope.container import Container
21-
from microscope.settings import Settings
22-
from microscope.plugins import (
19+
from qmicroscope.microscope import Microscope
20+
from qmicroscope.container import Container
21+
from qmicroscope.settings import Settings
22+
from qmicroscope.plugins import (
2323
ZoomPlugin,
2424
GridPlugin,
2525
PresetPlugin,
2626
ScalePlugin,
2727
TogglePlugin,
2828
CrossHairPlugin,
2929
RecordPlugin,
30+
SquareGridPlugin,
3031
)
3132

3233

@@ -47,6 +48,7 @@ def __init__(self, parent=None):
4748
PresetPlugin,
4849
ScalePlugin,
4950
RecordPlugin,
51+
SquareGridPlugin,
5052
]
5153
self.main_microscope = Microscope(self, viewport=False, plugins=plugins)
5254
self.main_microscope.scale = [0, 500]

pyproject.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[build-system]
2+
requires = ["hatchling", "hatch-vcs"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "qmicroscope"
7+
description = "A camera widget for qt GUIs using qtpy"
8+
readme = "README.md"
9+
authors = [
10+
{ name = "Venkateswaran (Shekar) Shekar", email = "[email protected]" },
11+
]
12+
requires-python = ">=3.8"
13+
14+
dependencies = ["qtpy", "opencv-python", "Pillow"]
15+
16+
classifiers = [
17+
"Development Status :: 4 - Beta",
18+
"Programming Language :: Python :: 3 :: Only",
19+
"Programming Language :: Python :: 3.8",
20+
"Programming Language :: Python :: 3.9",
21+
"Programming Language :: Python :: 3.10",
22+
"Programming Language :: Python :: 3.11",
23+
"Programming Language :: Python :: 3.12",
24+
"Topic :: Scientific/Engineering :: Physics",
25+
]
26+
dynamic = ["version"]
27+
28+
[tool.hatch]
29+
version.source = "vcs"
30+
build.hooks.vcs.version-file = "qmicroscope/_version.py"
31+
32+
[tool.hatch.build.targets.wheel]
33+
packages = ["qmicroscope"]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from qtpy.QtWidgets import QWidget, QGridLayout
22
from qtpy.QtGui import QPaintEvent
33
from qtpy.QtCore import QSettings
4-
from microscope.microscope import Microscope
4+
from qmicroscope.microscope import Microscope
55
from typing import List
66

77
""" A widget that contains one or more microscope widgets in a grid. """
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
QGroupBox,
99
)
1010
from typing import Dict, Optional
11-
from microscope.plugins.base_plugin import BasePlugin
11+
from qmicroscope.plugins.base_plugin import BasePlugin
1212

1313

1414
class PluginSettingsDialog(QDialog):

0 commit comments

Comments
 (0)