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.

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

Import pyepics 3.4.3 #6

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9aead57
Improve/document caget_multi method, add ability for caget to accept …
mattgibbs Oct 26, 2017
b635782
Doc formatting tweak.
mattgibbs Oct 26, 2017
963e335
Move caget_many documentation further down to indicate its relative u…
mattgibbs Oct 26, 2017
2c367d0
Add missing comma.
mattgibbs Oct 26, 2017
98d3528
Accept tuples of PV names in caget_many as well.
mattgibbs Oct 26, 2017
f2b8396
Add a basic unit test for caget_many.
mattgibbs Oct 26, 2017
3cb2401
Fix minor doc typo ('of' -> 'or').
mattgibbs Oct 26, 2017
eb7e319
Add a caput_many function, with documentation and a unit test.
mattgibbs Oct 26, 2017
48b17f6
Implement waiting for each PV in a caput_many, or waiting for all PVs.
mattgibbs Oct 31, 2017
bcad06f
Update docs for caput_many changes.
mattgibbs Oct 31, 2017
1870756
Remove caget calling caget_many if handed a collection of PVs.
mattgibbs Nov 14, 2017
58dc860
Simplify caput_many by re-implementing with PV objects.
mattgibbs Nov 14, 2017
b35522e
Remove a line about auto-monitoring that didn't make any sense in cag…
mattgibbs Nov 14, 2017
964be2f
Fix MANIFEST.in to correct license file name
synapticarbors Nov 30, 2017
0dfe72c
Merge pull request #108 from synapticarbors/patch-1
newville Dec 1, 2017
3c7cebe
BUG: install all the libs
dchabot Dec 5, 2017
1d25c8b
Merge pull request #106 from mattgibbs/multi-get
newville Dec 12, 2017
a84eaba
Merge pull request #111 from dchabot/install_all_the_libs
newville Dec 12, 2017
16995b9
update docs for caget_many() and discussion of getting many PV values
newville Dec 14, 2017
aca9d14
more updates to doc for caget/caput/... interface
newville Dec 17, 2017
b9c2543
tweaks to install doc, use sphinx release directive
newville Dec 17, 2017
ff90cac
New upstream version 3.4.3
chrschroeder Aug 16, 2022
af7dc53
Update upstream source from tag 'upstream/3.4.3'
chrschroeder Aug 16, 2022
df95daa
set compat level to 10
chrschroeder Aug 16, 2022
ea04a17
refresh patch queue
chrschroeder Aug 16, 2022
9e34a4d
update build for python3
chrschroeder Aug 16, 2022
ab6b876
3.4.3-1
chrschroeder Aug 17, 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
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Description
<!--- Describe the changes your Pull Request would make, especially describing what problem it is meant to solve -->
<!--- If it fixes an open issue, please link to the issue here. -->
<!--- If it fixes a problem that has not been opened as a Github Issue, consider opening one. -->
<!--- If appropriate, provide a link to a related discussion on the Tech-Talk mailing list. -->
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ before_install:
- conda config --add channels lightsource2-tag

# MAKE THE CONDA RECIPE
- conda create -n $CONDA_ENV python=$TRAVIS_PYTHON_VERSION epics-base
- conda create -n $CONDA_ENV python=$TRAVIS_PYTHON_VERSION epics-base=3.14.12.6
- source activate $CONDA_ENV

install:
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include README.txt INSTALL MANIFEST.in Changelog license.txt setup.py publish.sh *.bat versioneer.py
include README.txt INSTALL MANIFEST.in Changelog LICENSE setup.py publish.sh *.bat versioneer.py
exclude *.pyc core.* *~ *.pdf
recursive-include epics *.py
recursive-include scripts *
Expand Down
39 changes: 39 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
pyepics (3.4.3-1) unstable; urgency=medium

[ Daron Chabot ]
* BLD: reissue version number patch

[ Matt Gibbs ]
* Improve/document caget_multi method, add ability for caget to accept lists and pass to caget_multi.
* Doc formatting tweak.
* Move caget_many documentation further down to indicate its relative unimportance.
* Add missing comma.
* Accept tuples of PV names in caget_many as well.
* Add a basic unit test for caget_many.
* Fix minor doc typo ('of' -> 'or').
* Add a caput_many function, with documentation and a unit test.
* Implement waiting for each PV in a caput_many, or waiting for all PVs.
* Update docs for caput_many changes.
* Remove caget calling caget_many if handed a collection of PVs.
* Simplify caput_many by re-implementing with PV objects.
* Remove a line about auto-monitoring that didn't make any sense in caget_many and caput_many.

[ Joshua Adelman ]
* Fix MANIFEST.in to correct license file name

[ Daron Chabot ]
* BUG: install all the libs

[ Matthew Newville ]
* update docs for caget_many() and discussion of getting many PV values
* more updates to doc for caget/caput/... interface
* tweaks to install doc, use sphinx release directive

[ Christoph Schröder ]
* New upstream version 3.4.3
* set compat level to 10
* refresh patch queue
* update build for python3

-- Christoph Schröder <[email protected]> Wed, 17 Aug 2022 19:35:05 +0200

pyepics (3.3.0-1) unstable; urgency=low

[ Daron Chabot ]
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
10
36 changes: 28 additions & 8 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ Source: pyepics
Maintainer: Daron Chabot <[email protected]>
Section: python
Priority: optional
Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7)
XS-Python-Version: >= 2.7
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 10), dh-python, python3-all, python3-setuptools
Build-Depends-Indep: python3-sphinx, python3-docutils, python3-numpydoc
XS-Python3-Version: >= 3.5
Standards-Version: 3.9.8
Homepage: http://pyepics.github.io/pyepics/
Vcs-Git: https://github.com/pyepics/pyepics.git
Vcs-Browser: https://github.com/pyepics/pyepics


Package: python-pyepics
Package: python3-pyepics
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
python-numpy, epics-dev
Description: Epics Channel Access for Python
Depends: ${misc:Depends}, ${python3:Depends},
python3-numpy, python3-pyparsing, epics-dev
Suggests: python3-pyepics-doc
Description: Epics Channel Access for Python 3
Python Interface to the Epics Channel Access protocol
of the Epics control system. PyEpics provides 3 layers of access to
Channel Access (CA):
Expand All @@ -31,3 +33,21 @@ Description: Epics Channel Access for Python
Devices -- collections of PVs that might represent an Epics Record
or physical device (say, a camera, amplifier, or power supply), and
to help write GUIs for CA.
.
This package contains pyepics for Python 3.

Package: python3-pyepics-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: PyEpics documentation
PyEpics is an interface for the Channel Access (CA) library of the Epics
Control System to the Python Programming language. The pyepics package
provides a base epics module to python, with methods for reading from and
writing to Epics Process Variables (PVs) via the CA protocol.
The package includes a thin and fairly complete layer over the low-level
Channel Access library in the ca module, and higher level abstractions built
on top of this basic functionality.
.
This package contains documentation for pyepics.

13 changes: 3 additions & 10 deletions debian/patches/0001-MNT-hardcode-version.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,19 @@ Subject: [PATCH] MNT: hardcode version
setup.py | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/epics/__init__.py b/epics/__init__.py
index c6fc313..a2b65d9 100644
--- a/epics/__init__.py
+++ b/epics/__init__.py
@@ -1,6 +1,4 @@
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
+__version__ = '3.3.0'
+__version__ = '3.4.3'

__doc__ = """
epics channel access python module
diff --git a/setup.py b/setup.py
index cbd4ae0..00adb3e 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ import sys
@@ -7,7 +7,7 @@
import epics
import shutil

Expand All @@ -33,7 +29,7 @@ index cbd4ae0..00adb3e 100644

long_desc = '''Python Interface to the Epics Channel Access protocol
of the Epics control system. PyEpics provides 3 layers of access to
@@ -57,8 +57,7 @@ if PY_MAJOR == 2 and PY_MINOR < 6:
@@ -58,8 +58,7 @@
pjoin('epics', 'utils3.py'))

setup(name = 'pyepics',
Expand All @@ -43,6 +39,3 @@ index cbd4ae0..00adb3e 100644
author = 'Matthew Newville',
author_email = '[email protected]',
url = 'http://pyepics.github.io/pyepics/',
--
2.1.4

1 change: 0 additions & 1 deletion debian/python-pyepics.lintian-overrides

This file was deleted.

15 changes: 15 additions & 0 deletions debian/python3-pyepics-doc.doc-base
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Document: python3-pyepics-doc
Title: pyepics Manual
Author: Matt Newville <[email protected]>
Abstract: PyEpics is an interface for the Channel Access (CA) library of the
Epics Control System to the Python Programming language. The pyepics package
provides a base epics module to python, with methods for reading from and
writing to Epics Process Variables (PVs) via the CA protocol.
The package includes a thin and fairly complete layer over the low-level
Channel Access library in the ca module, and higher level abstractions built
on top of this basic functionality.
Section: Programming/Python

Format: HTML
Index: /usr/share/doc/python3-pyepics-doc/html/index.html
Files: /usr/share/doc/python3-pyepics-doc/html/*
1 change: 1 addition & 0 deletions debian/python3-pyepics-doc.docs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build/sphinx/html
18 changes: 14 additions & 4 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
#!/usr/bin/make -f

# This file was automatically generated by stdeb 0.8.5 at
# Wed, 17 May 2017 17:11:54 -0400

#export DH_VERBOSE = 1
#export PYBUILD_VERBOSE = 1
export NOLIBCA=1
export PYBUILD_NAME=pyepics
export PYBUILD_DISABLE=test

%:
dh $@ --with python2 --buildsystem=python_distutils
dh $@ --with python3,sphinxdoc --buildsystem=pybuild

override_dh_auto_build: export http_proxy=127.0.0.1:9
override_dh_auto_build: export https_proxy=127.0.0.1:9
override_dh_auto_build:
dh_auto_build
PYTHONPATH=. python3 -m sphinx -N -bhtml doc/ build/sphinx/html # HTML generator

override_dh_auto_clean:
dh_auto_clean
rm -rf pyepics.egg-info

override_dh_python3:
dh_python3 --shebang=/usr/bin/python3
Loading