Skip to content

Commit

Permalink
Merge pull request #36 from lsst/tickets/DM-13222
Browse files Browse the repository at this point in the history
DM-13222: Add getScalar and getArray methods to PropertySet and PropertyList and prefer them
  • Loading branch information
r-owen committed Jun 13, 2018
2 parents f60f3cf + 2b1e65c commit 94bc79c
Show file tree
Hide file tree
Showing 15 changed files with 515 additions and 167 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.cache
.pytest_cache
.coverage
pytest_session.txt
.sconsign.dblite
config.log
Expand Down
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
sudo: false
language: python
matrix:
include:
- python: '3.6'
install:
- pip install flake8
script: flake8
1 change: 0 additions & 1 deletion python/lsst/daf/base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import absolute_import

from .version import *
from .citizen import *
Expand Down
1 change: 0 additions & 1 deletion python/lsst/daf/base/citizen/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import absolute_import

from .citizen import *
from .citizenContinued import *
2 changes: 0 additions & 2 deletions python/lsst/daf/base/citizen/citizenContinued.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
# see <http://www.lsstcorp.org/LegalNotices/>.
#

from __future__ import absolute_import, division, print_function

__all__ = ["setCallbacks", "mortal"]

from builtins import range
import re

from .citizen import Citizen
Expand Down
1 change: 0 additions & 1 deletion python/lsst/daf/base/dateTime/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import absolute_import

from .dateTime import *
from .dateTimeContinued import *
1 change: 0 additions & 1 deletion python/lsst/daf/base/dateTime/dateTimeContinued.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
# see <http://www.lsstcorp.org/LegalNotices/>.
#

from __future__ import absolute_import, division, print_function

__all__ = []

Expand Down
1 change: 0 additions & 1 deletion python/lsst/daf/base/propertyContainer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.
#
from __future__ import absolute_import

from .propertySet import *
from .propertyList import *
Expand Down

0 comments on commit 94bc79c

Please sign in to comment.