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

support APS proposal & ESAF systems to provide useful metadata #334

Merged
merged 49 commits into from
Jul 11, 2020
Merged

support APS proposal & ESAF systems to provide useful metadata #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
4e53932
ENH #333 initial commit
prjemian Jun 26, 2020
606bfb0
MNT #333 permissions
prjemian Jun 26, 2020
509a699
DOC #333
prjemian Jun 26, 2020
b73e1a5
MNT #333
prjemian Jun 26, 2020
e7c05cb
Merge branch 'master' into 333-metadata-proposal-ESAF
prjemian Jul 6, 2020
b803527
MNT #334 Codacy
prjemian Jul 6, 2020
f544e8d
MNT #334 Codacy
prjemian Jul 6, 2020
62b25fa
TST #333 start on unit tests
prjemian Jul 6, 2020
aebaac4
TST #333 tests not at APS
prjemian Jul 6, 2020
27e7595
TST #333
prjemian Jul 6, 2020
7050844
TST #333 WIP
prjemian Jul 6, 2020
b25fdc3
TST #333
prjemian Jul 6, 2020
4d25731
TST #333 LGTM review
prjemian Jul 6, 2020
09f9d2d
TST #333 refactor so testable
prjemian Jul 7, 2020
d745be5
TST #333
prjemian Jul 7, 2020
1c07e03
MNT #333 Codacy
prjemian Jul 7, 2020
83cacfd
TST #333 Codacy
prjemian Jul 7, 2020
b3de524
MNT #333 randmize the IOC prefix for testing
prjemian Jul 7, 2020
3020fff
MNT #333 remove unused code
prjemian Jul 7, 2020
7e37769
MNT #333 remove eclipse config
prjemian Jul 7, 2020
a402c75
TST #333 let travis-ci find aps-dm-api
prjemian Jul 7, 2020
14716e6
TST #333 aps-dm-api not on PyPI
prjemian Jul 7, 2020
5ab3aa9
CI #333 for travis-ci
prjemian Jul 7, 2020
88dcf3e
CI #333 adjust travis-ci requirements
prjemian Jul 7, 2020
4123322
TST #333 for py38
prjemian Jul 7, 2020
872e391
MNT #333 Codacy
prjemian Jul 7, 2020
4b50275
MNT #333 refactor name
prjemian Jul 7, 2020
a4868d2
ENH #333 shell script
prjemian Jul 8, 2020
3485238
TST #333 refactor
prjemian Jul 8, 2020
e420034
TST #333 Codacy
prjemian Jul 8, 2020
c8ba056
TST #333 Codacy
prjemian Jul 8, 2020
fc33050
TST #333
prjemian Jul 8, 2020
8ffa164
DOC #333
prjemian Jul 8, 2020
9444299
DOC #333 WIP
prjemian Jul 9, 2020
53d516d
DOC #333 WIP
prjemian Jul 9, 2020
b2a2034
DOC #333 WIP
prjemian Jul 9, 2020
d6a4f5d
fixes #341
prjemian Jul 10, 2020
45e56a2
MNT #341 Codacy
prjemian Jul 10, 2020
e13e955
MNT #341 Codacy
prjemian Jul 10, 2020
1f6fc83
Merge pull request #342 from BCDA-APS/341-databroker-metrics
prjemian Jul 10, 2020
2884762
DOC #333
prjemian Jul 10, 2020
94368b7
DOC #333
prjemian Jul 10, 2020
16a3331
ENH #333 add PV report
prjemian Jul 10, 2020
b560f0f
DOC #333 PV report
prjemian Jul 10, 2020
1796479
ENH #333 commands on GUI
prjemian Jul 11, 2020
ffe7c67
ENH #333 add version option
prjemian Jul 11, 2020
fb96aca
MNT #333
prjemian Jul 11, 2020
c739f83
TST #333 Codacy
prjemian Jul 11, 2020
e3e3205
MNT #343
prjemian Jul 11, 2020
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@ build_log.txt
.logs/
.vscode/
20*.dat

# bird droppings from IT
.log
.loglogin
17 changes: 0 additions & 17 deletions .project
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .pydevproject
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ python:
- "3.8"
# - "nightly"


# see https://github.com/BCDA-APS/apstools/issues/137#ref-commit-5c7baa2
# install:
# - pip install -r requirements.txt
Expand All @@ -24,7 +25,9 @@ before_script:
- bash miniconda.sh -b -p $HOME/miniconda
- export PATH=$HOME/miniconda/bin:$PATH
- export PY_ENV=travis-$TRAVIS_PYTHON_VERSION
- conda create -y -n $PY_ENV -c apsu -c conda-forge -c nsls2forge -c defaults python=$TRAVIS_PYTHON_VERSION bluesky coverage databroker docopt epics-base numpy "ophyd>=1.4.0rc3" "pyepics>=3.4.1" pandas requests xlrd
- export MY_CONDA_CHANNELS="-c apsu -c conda-forge -c nsls2forge -c defaults -c aps-anl-tag"
- export MY_CONDA_PACKAGES="aps-dm-api bluesky>=1.6.2 coverage databroker>=1.0.6 docopt epics-base numpy ophyd>=1.5.1 pyepics>=3.4.2 pandas requests xlrd"
- conda create -y -n $PY_ENV $MY_CONDA_CHANNELS python=$TRAVIS_PYTHON_VERSION $MY_CONDA_PACKAGES
- source activate $PY_ENV
- which pip
- which python
Expand Down
Empty file added apstools/beamtime/__init__.py
View file
Open in desktop
Empty file.
Loading