Skip to content

Commit

Permalink
Update minor2 version number
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpitkin committed Nov 27, 2017
1 parent 1937de5 commit 3fee4f3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion psrqpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

""" A Python tool for interacting with the ATNF pulsar catalogue """

__version__ = "0.3.4"
__version__ = "0.3.5"

from .search import QueryATNF
from .pulsar import Pulsar, Pulsars
Expand Down
4 changes: 2 additions & 2 deletions psrqpy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#: the full ATNF catalogue query URL
QUERY_URL = ATNF_URL + PARAMS_QUERY + USERDEFINED_QUERY + SORT_QUERY + CONDITION_QUERY + PSRNAMES_QUERY + EPHEMERIS_QUERY + QUERY_FLUFF

# pulsar parameters (http://www.atnf.csiro.au/research/pulsar/psrcat/psrcat_help.html) that can be queried
# For each parameter there is a dictionary giving:
# pulsar parameters (http://www.atnf.csiro.au/research/pulsar/psrcat/psrcat_help.html) that can be
# queried. For each parameter there is a dictionary giving:
# - 'ref': True if the parameter can have an associated reference in the ATNF catalogue
# - 'err': True if the parameter can have an associated error value
# - 'unit': a string giving the units for the parameter (to be used if generating an astropy table)
Expand Down
2 changes: 1 addition & 1 deletion psrqpy/pulsar.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def add_pulsar(self, psr):
Args:
psr (:class:`~psrqpy.pulsar.Pulsar`, :class:`~psrqpy.pulsar.Pulsars`): a
:class:`~psrqpy.pulsar.Pulsar` object, or :class:`~psrqpy.pulsar.Pulsars`
object
object
"""

assert isinstance(psr, Pulsar) or isinstance(psr, Pulsars), 'psr is not a Pulsar type'
Expand Down
15 changes: 7 additions & 8 deletions psrqpy/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,7 @@ def generate_query(self, version='', params=None, condition='', sortorder='asc',
Args:
version (str): a string containing the ATNF version.
params (list, str): a list of `parameters <http://www.atnf.csiro.au/research/pulsar/psrcat/psrcat_help.html#par_list>`_ to
query.
params (list, str): a list of `parameters <http://www.atnf.csiro.au/research/pulsar/psrcat/psrcat_help.html#par_list>`_ to query.
condition (str): the logical `condition
<http://www.atnf.csiro.au/research/pulsar/psrcat/psrcat_help.html#condition>`_
string for the query.
Expand All @@ -196,8 +195,8 @@ def generate_query(self, version='', params=None, condition='', sortorder='asc',
a table of parameter values (only works if pulsar names are given)
Returns:
str: A string with the content of a :class:`~requests.Response` returned by
:func:`~requests.get`
str: the :attr:`~requests.Response.content` of a :class:`~requests.Response` returned
by :func:`~requests.get` for the ATNF pulsar catalogue query page.
"""

Expand Down Expand Up @@ -457,10 +456,10 @@ def get_pulsars(self):
"""
Returns:
:class:`psrqpy.pulsar.Pulsars`: the queried pulsars returned as a
:class:`~psrqpy.pulsar.Pulsars` object, which is a dictionary of
:class:`~psrqpy.pulsar.Pulsar` objects. If ``JNAME`` or ``NAME`` was not in the
original query, it will be performed again, so that a name is present, which is
required for a :class:`~psrqpy.pulsar.Pulsar` object
:class:`~psrqpy.pulsar.Pulsars` object, which is a dictionary of
:class:`~psrqpy.pulsar.Pulsar` objects. If ``JNAME`` or ``NAME`` was not in the
original query, it will be performed again, so that a name is present, which is
required for a :class:`~psrqpy.pulsar.Pulsar` object
"""

if not self._pulsars:
Expand Down

0 comments on commit 3fee4f3

Please sign in to comment.