Skip to content

Commit 476cc51

Browse files
authored
Merge pull request #17 from wright-group/conda-forge
add conda-forge as installation source
2 parents 03ceb79 + d3ff517 commit 476cc51

7 files changed

Lines changed: 22 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
55

66
## [Unreleased]
77

8+
### Added
9+
- conda-forge as installation source
10+
811
### Fixed
912
- rerendered avprs based on recent traits change
1013
- avoid byte order problems in the InGaAs array

yaqd_wright/wright-aerotech.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ bugtracker = "https://github.com/wright-group/yaqd-wright/issues"
88

99
[installation]
1010
PyPI = "https://pypi.org/project/yaqd-wright"
11+
conda-forge = "https://anaconda.org/conda-forge/yaqd-wright"
1112

1213
[config]
1314

yaqd_wright/wright-filter-wheel.avpr

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
},
8989
"doc": "Expose a filter wheel as a yaq daemon.\n",
9090
"installation": {
91-
"PyPI": "https://pypi.org/project/yaqd-wright"
91+
"PyPI": "https://pypi.org/project/yaqd-wright",
92+
"conda-forge": "https://anaconda.org/conda-forge/yaqd-wright"
9293
},
9394
"links": {
9495
"bugtracker": "https://github.com/wright-group/yaqd-wright/issues",
@@ -286,13 +287,13 @@
286287
}
287288
},
288289
"traits": [
289-
"uses-serial",
290-
"has-position",
290+
"is-discrete",
291+
"is-homeable",
291292
"has-limits",
293+
"uses-serial",
292294
"is-daemon",
293-
"is-homeable",
294-
"is-discrete",
295-
"uses-uart"
295+
"uses-uart",
296+
"has-position"
296297
],
297298
"types": [
298299
{
@@ -322,4 +323,4 @@
322323
"type": "record"
323324
}
324325
]
325-
}
326+
}

yaqd_wright/wright-filter-wheel.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ bugtracker = "https://github.com/wright-group/yaqd-wright/issues"
1010

1111
[installation]
1212
PyPI = "https://pypi.org/project/yaqd-wright"
13+
conda-forge = "https://anaconda.org/conda-forge/yaqd-wright"
1314

1415
[config]
1516
motor.type = "int"
@@ -24,4 +25,4 @@ units.doc = "Units of angle the filter wheel uses to set position"
2425

2526
microstep.type = "int"
2627
microstep.default = 1
27-
microstep.doc = "Increases angle resolution of filter wheel; valid integers are 1, 2, 4, 8, 16, 32"
28+
microstep.doc = "Increases angle resolution of filter wheel; valid integers are 1, 2, 4, 8, 16, 32"

yaqd_wright/wright-ingaas.avpr

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
},
8282
"doc": "",
8383
"installation": {
84-
"PyPI": "https://pypi.org/project/yaqd-wright"
84+
"PyPI": "https://pypi.org/project/yaqd-wright",
85+
"conda-forge": "https://anaconda.org/conda-forge/yaqd-wright"
8586
},
8687
"links": {
8788
"bugtracker": "https://github.com/wright-group/yaqd-wright/issues",
@@ -225,10 +226,10 @@
225226
"requires": [],
226227
"state": {},
227228
"traits": [
228-
"is-daemon",
229-
"uses-serial",
230-
"has-measure-trigger",
231229
"is-sensor",
230+
"has-measure-trigger",
231+
"uses-serial",
232+
"is-daemon",
232233
"uses-uart"
233234
],
234235
"types": [
@@ -259,4 +260,4 @@
259260
"type": "record"
260261
}
261262
]
262-
}
263+
}

yaqd_wright/wright-ingaas.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ bugtracker = "https://github.com/wright-group/yaqd-wright/issues"
88

99
[installation]
1010
PyPI = "https://pypi.org/project/yaqd-wright"
11+
conda-forge = "https://anaconda.org/conda-forge/yaqd-wright"
1112

1213
[config]
1314

yaqd_wright/wright-wl-motor.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ bugtracker = "https://github.com/wright-group/yaqd-wright/issues"
88

99
[installation]
1010
PyPI = "https://pypi.org/project/yaqd-wright"
11+
conda-forge = "https://anaconda.org/conda-forge/yaqd-wright"
1112

1213
[config]
1314

0 commit comments

Comments
 (0)