Skip to content

Commit

Permalink
Merge pull request #125 from a-detiste/master
Browse files Browse the repository at this point in the history
remove Python2 crumbs
  • Loading branch information
e-koch authored Apr 19, 2024
2 parents 1eb0216 + 3a67670 commit df2db3c
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@
# continue
# dtype, target = line.split(None, 1)
# target = target.strip()
# nitpick_ignore.append((dtype, six.u(target)))
# nitpick_ignore.append((dtype, str(target)))
3 changes: 1 addition & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ Requirements

This package has the following dependencies:

* `Python <http://www.python.org>`_ 3.6 or later (Python 3.x is supported)
* `Python <http://www.python.org>`_ 3.6 or later
* `Numpy <http://www.numpy.org>`_ 1.8 or later
* `Astropy <http://www.astropy.org>`__ 1.0 or later
* `six <http://pypi.python.org/pypi/six/>`__

Installation
------------
Expand Down
3 changes: 1 addition & 2 deletions radio_beam/beam.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import six
from astropy import units as u
from astropy.io import fits
from astropy import constants
Expand Down Expand Up @@ -165,7 +164,7 @@ def from_fits_header(cls, hdr, unit=u.deg):
# ... given a file try to make a fits header
# assume a string refers to a filename on disk
if not isinstance(hdr,fits.Header):
if isinstance(hdr, six.string_types):
if isinstance(hdr, str):
if hdr.lower().endswith(('.fits', '.fits.gz', '.fit',
'.fit.gz', '.fits.Z', '.fit.Z')):
hdr = fits.getheader(hdr)
Expand Down
2 changes: 0 additions & 2 deletions radio_beam/conftest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# this contains imports plugins that configure py.test for astropy tests.
# by importing them here in conftest.py they are discoverable by py.test
# no matter how it is invoked within the source tree.
from __future__ import print_function, absolute_import, division

import os
from setuptools._distutils.version import LooseVersion

Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ packages = find:
install_requires =
astropy
numpy>=1.8.0
six
scipy

[options.extras_require]
Expand Down

0 comments on commit df2db3c

Please sign in to comment.