Skip to content

Commit 7c149b7

Browse files
authored
Merge pull request #34 from madelinespark/madeline
converting to pyproject.toml
2 parents e81e9c9 + 76dc71d commit 7c149b7

File tree

14 files changed

+319
-2845
lines changed

14 files changed

+319
-2845
lines changed

.codecov.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,3 @@ coverage:
88
target: 50%
99
fixes:
1010
- "/home/runner/work/phoebusgen/phoebusgen/::"
11-
ignore:
12-
- "phoebusgen/_version.py"

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
*.html linguist-detectable=false
22
*.js linguist-detectable=false
33
*.css linguist-detectable=false
4-
phoebusgen/_version.py export-subst

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ local/
2323
.docbuild/_build
2424
.docbuild/source
2525
docs
26+
27+
phoebusgen/_version.py

CHANGELOG.md

Lines changed: 258 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## [Unreleased]
9+
10+
### Added
11+
12+
- Full property support for image widget
13+
- Full property support for strip chart widget
14+
- Full property support for XY plot widget
15+
- This CHANGELOG file to hopefully serve as an evolving example of a
16+
standardized open source project CHANGELOG.
17+
18+
### Changed
19+
20+
- Widget base class now inherits from a shared Generic class which is also
21+
used for new classes StripChartTrace, XYPlotTrace, StripChartYAxis, etc.
22+
- Switched from versioneer to setuptools_scm for package versioning
23+
24+
### Removed
25+
26+
- setup.py and setup.cfg files in favor of pyproject.toml
27+
28+
### Fixed
29+
30+
- Bug in symbols property, only could have one symbol previously
31+
- Missing line_color support for group widget since phoebus v4.7.3
32+
33+
## [2.7.0] - 2023-09-18
34+
35+
### Added
36+
37+
- Ability to use color as value in rules
38+
39+
### Fixed
40+
41+
- Bug in items property, only could have one item previously
42+
43+
## [2.6.2] - 2023-08-01
44+
45+
### Fixed
46+
47+
- Bug in confirmation dialog for action button
48+
49+
## [2.6.1] - 2023-06-07
50+
51+
### Added
52+
53+
- Execute script methods for the action button widget
54+
55+
## [2.6.0] - 2023-06-05
56+
57+
### Added
58+
59+
- Alarm border property to text update widget
60+
61+
## [2.5.1] - 2023-04-13
62+
63+
### Changed
64+
65+
- Confirmed github workflow for pip package upload
66+
67+
## [2.5.0] - 2023-04-13
68+
69+
### Fixed
70+
71+
- Version tag should be x.x.x
72+
73+
## [2.5] - 2023-04-13
74+
75+
### Added
76+
77+
- precommit to repository
78+
79+
### Changed
80+
81+
- Documentation to readthedocs
82+
83+
### Fixed
84+
85+
- Bug in rule support, convert non-string inputs to strings
86+
87+
## [2.4.5] - 2022-07-24
88+
89+
### Added
90+
91+
- Rule and script support for all widgets
92+
93+
## [2.4.4] - 2022-06-27
94+
95+
### Added
96+
97+
- Codacy checks to repository
98+
99+
### Changed
100+
101+
- Use isinstance instead of == for type checks
102+
103+
### Removed
104+
105+
- Unused test file
106+
107+
## [2.4.3] - 2022-06-10
108+
109+
### Added
110+
111+
- Alarm border to action button widget
112+
113+
## [2.4.2] - 2022-05-27
114+
115+
### Added
116+
117+
- Horizontal and vertical alignment to text entry widget
118+
119+
## [2.4.1] - 2022-05-21
120+
121+
### Added
122+
123+
- Interpolation, and cursor support to image widget
124+
- Grid color support to XY plot widget
125+
126+
## [2.4] - 2022-05-21
127+
128+
### Added
129+
130+
- title_font, scale_font, and label_font properties
131+
132+
### Changed
133+
134+
- Moved shared font functions to shared file to help with other font properties
135+
136+
### Fixed
137+
138+
- Bug in predefined font logic, removed the .lower() call on the name string
139+
140+
## [2.3.6] - 2022-05-20
141+
142+
### Added
143+
144+
- time_range property to StripChart widget
145+
146+
## [2.3.5] - 2022-05-19
147+
148+
### Fixed
149+
150+
- Github Action for publishing pip package
151+
152+
## [2.3.4] - 2022-05-19
153+
154+
### Added
155+
156+
- Build sphinx docs Github Action
157+
158+
## [2.3.3] - 2022-05-19
159+
160+
### Added
161+
162+
- Versioneer support
163+
- Github Action to publish pip package
164+
- Python 3.11 to CI
165+
166+
## [2.3.2] - 2021-10-01
167+
168+
### Fixed
169+
170+
- Fix bug in title property where it was thought to be specific to StripChart,
171+
changed class name and added to XY plot as well
172+
173+
## [2.3.1] - 2021-09-30
174+
175+
### Added
176+
177+
- More documentation
178+
179+
## [2.3.0] - 2021-09-30
180+
181+
### Added
182+
183+
- Full property support for table widget
184+
- Sphinx documentation
185+
186+
## [2.2.0] - 2021-09-28
187+
188+
### Added
189+
190+
- Full property support for LED multi state widget
191+
- Full property support for symbol widget
192+
- Full property support for text symbol widget
193+
- Full property support for scaled slider widget
194+
195+
## [2.1.0] - 2021-09-28
196+
197+
### Added
198+
199+
- Full property support for byte monitor widget
200+
- Full property support for navigation tab widget
201+
- Full property support for tab widget
202+
203+
## [2.0.0] - 2021-09-28
204+
205+
### Added
206+
207+
- Polygon widget
208+
- Polyline widget
209+
210+
### Changed
211+
212+
- Refactored the widget property classes to contain the logic for adding
213+
XML inside the properties.py file (used to be called property_stubs).
214+
215+
### Removed
216+
217+
- Removed the Property class and private classes in property_stubs.py in favor
218+
of using classes for each property that are inherited by the widgets that
219+
use them.
220+
221+
## [1.0.1] - 2021-09-23
222+
223+
### Added
224+
225+
- Macros for open display action
226+
227+
## [1.0.0] - 2021-08-25
228+
229+
### Added
230+
231+
- Support for most widgets but not all properties on all widgets
232+
233+
[unreleased]: https://github.com/als-epics/phoebusgen/compare/2.7.0...HEAD
234+
[2.7.0]: https://github.com/als-epics/phoebusgen/compare/2.6.2...2.7.0
235+
[2.6.2]: https://github.com/als-epics/phoebusgen/compare/2.6.1...2.6.2
236+
[2.6.1]: https://github.com/als-epics/phoebusgen/compare/2.6.0...2.6.1
237+
[2.6.0]: https://github.com/als-epics/phoebusgen/compare/2.5.1...2.6.0
238+
[2.5.1]: https://github.com/als-epics/phoebusgen/compare/2.5.0...2.5.1
239+
[2.5.0]: https://github.com/als-epics/phoebusgen/compare/2.5...2.5.0
240+
[2.5]: https://github.com/als-epics/phoebusgen/compare/2.4.5...2.5
241+
[2.4.5]: https://github.com/als-epics/phoebusgen/compare/2.4.4...2.4.5
242+
[2.4.4]: https://github.com/als-epics/phoebusgen/compare/2.4.3...2.4.4
243+
[2.4.3]: https://github.com/als-epics/phoebusgen/compare/2.4.2...2.4.3
244+
[2.4.2]: https://github.com/als-epics/phoebusgen/compare/2.4.1...2.4.2
245+
[2.4.1]: https://github.com/als-epics/phoebusgen/compare/2.4...2.4.1
246+
[2.4]: https://github.com/als-epics/phoebusgen/compare/2.3.6...2.4
247+
[2.3.6]: https://github.com/als-epics/phoebusgen/compare/2.3.5...2.3.6
248+
[2.3.5]: https://github.com/als-epics/phoebusgen/compare/2.3.4...2.3.5
249+
[2.3.4]: https://github.com/als-epics/phoebusgen/compare/2.3.3...2.3.4
250+
[2.3.3]: https://github.com/als-epics/phoebusgen/compare/2.3.2...2.3.3
251+
[2.3.2]: https://github.com/als-epics/phoebusgen/compare/2.3.1...2.3.2
252+
[2.3.1]: https://github.com/als-epics/phoebusgen/compare/2.3.0...2.3.1
253+
[2.3.0]: https://github.com/als-epics/phoebusgen/compare/2.2.0...2.3.0
254+
[2.2.0]: https://github.com/als-epics/phoebusgen/compare/2.1.0...2.2.0
255+
[2.1.0]: https://github.com/als-epics/phoebusgen/compare/2.0.0...2.1.0
256+
[2.0.0]: https://github.com/als-epics/phoebusgen/compare/1.0.1...2.0.0
257+
[1.0.1]: https://github.com/als-epics/phoebusgen/compare/1.0.0...1.0.1
258+
[1.0.0]: https://github.com/als-epics/phoebusgen/releases/tag/1.0.0

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ include phoebusgen/examples/*.py
44
include README.md
55
include LICENSE
66
include requirements.txt
7-
include versioneer.py
87
include phoebusgen/_version.py

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Phoebus is the next generation of Control System Studio, a graphical platform for EPICS control systems.
1111
https://github.com/ControlSystemStudio/phoebus
1212

13-
This module aims to provide a way to generate Phoebus xml through Python. See examples [here](examples).
13+
This module provides a way through Python to generate the Display Builder XML format used by Phoebus (and other tools like DBWR). See examples [here](examples).
1414

1515
API docs here: [https://als-epics.github.io/phoebusgen](https://als-epics.github.io/phoebusgen/)
1616

phoebusgen/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
88
In addition, phoebusgen.colors and phoebusgen.fonts are Enum objects that are available
99
to use to add predefined colors/fonts to widgets.
10-
Example: text_update_widget.predefined_foreground_color(phoebusgen.colors.OK)
10+
11+
Example: text_update_widget.predefined_foreground_color(phoebusgen.colors.OK)
12+
1113
A custom site specific color.def or font.def in ~/.phoebusgen/ to force phoebusgen.colors or phoebusgen.fonts
1214
to reflect your site's custom definitions.
1315
"""
@@ -108,5 +110,9 @@ def _update_font_def(file_path):
108110
_predefined_fonts = _update_font_def(_font_def)
109111
fonts = _enum('fonts', _predefined_fonts)
110112

111-
from . import _version
112-
__version__ = _version.get_versions()['version']
113+
try:
114+
from ._version import version as __version__
115+
from ._version import version_tuple as __version_tuple__
116+
except ImportError:
117+
__version__ = 'unknown version'
118+
__version_tuple__ = (0, 0, 'unknown version')

0 commit comments

Comments
 (0)