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

DM-13339: shebang needs to be changed in several places in bin.src directories #200

Merged
merged 3 commits into from
May 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.pyc
pytest_session.txt
.cache
.pytest_cache
/*.fits
*_wrap.cc
*Lib.py
Expand Down
2 changes: 1 addition & 1 deletion examples/exampleCmdLineTask.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python
#
# LSST Data Management System
# Copyright 2014 LSST Corporation.
Expand Down
3 changes: 1 addition & 2 deletions python/lsst/pipe/tasks/ingest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from past.builtins import basestring
import os
import shutil
import tempfile
Expand Down Expand Up @@ -115,7 +114,7 @@ def getInfoFromMetadata(self, md, info=None):
for p, h in self.config.translation.items():
if md.exists(h):
value = md.get(h)
if isinstance(value, basestring):
if isinstance(value, str):
value = value.strip()
info[p] = value
elif p in self.config.defaults:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ max-line-length = 110
ignore = E133, E226, E228, E266, N802, N803, N806
# TODO: remove E266 when Task documentation is converted to rst in DM-14207.
exclude =
__init__.py,
__init__.py
tests/data/*
tests/.tests/*
tests/astrometry_net_data/*
Expand Down
4 changes: 2 additions & 2 deletions tests/nopytest_test_coadds.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
this data will be created for every sub-process, leading to excessive disk
usage, excessive test execution times and possible failure.
"""
from past.builtins import basestring

import unittest
import shutil
import os
import numbers
from collections import Iterable

import numpy as np

import lsst.utils.tests
Expand Down Expand Up @@ -480,7 +480,7 @@ def testAlgMetadataOutput(self):
# case the value can properly be extracted and compared.

def ensureIterable(x):
if isinstance(x, Iterable) and not isinstance(x, basestring):
if isinstance(x, Iterable) and not isinstance(x, str):
return x
return [x]
for nOffset in ensureIterable(meta.get('NOISE_OFFSET')):
Expand Down
1 change: 0 additions & 1 deletion ups/pipe_tasks.table
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ setupRequired(pipe_base)
setupRequired(pex_config)
setupRequired(utils)
setupRequired(obs_base)
setupRequired(python_future)
setupOptional(meas_algorithms)
setupOptional(meas_astrom)
setupOptional(meas_extensions_astrometryNet)
Expand Down