Skip to content

Commit

Permalink
updated copyright, made change to import paths that shouldn't break a…
Browse files Browse the repository at this point in the history
…nything...
  • Loading branch information
AndrewAnnex committed Aug 26, 2018
1 parent e563efe commit 4211791
Show file tree
Hide file tree
Showing 20 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -285,7 +285,7 @@ def __getattr__(cls, name):
epub_title = 'SpiceyPy'
epub_author = 'Andrew Annex'
epub_publisher = 'Andrew Annex'
epub_copyright = '2014-2017, Andrew Annex'
epub_copyright = '2014-2018, Andrew Annex'

# The basename for the epub file. It defaults to the project name.
#epub_basename = 'SpiceyPy'
Expand Down
2 changes: 1 addition & 1 deletion docs/event_finding.rst
Expand Up @@ -567,7 +567,7 @@ Execute the program. The output is:
Visibility or window stop time: 2004 MAY 06 00:00:00.000 (TDB)

Find Times when Target is Visible
------------------------------
----------------------------------

.. _task-statement-1:

Expand Down
34 changes: 17 additions & 17 deletions docs/other_stuff.rst
Expand Up @@ -413,7 +413,7 @@ and
\begindata

to mark information blocks within the text kernel. The
:raw-latex:`\begintext `tag specifies all text following the tag as
`\\begintext` tag specifies all text following the tag as
comment information to be ignored by the subsystem.

Things to know:
Expand Down Expand Up @@ -501,7 +501,7 @@ Please refer to the kernels required reading, kernel.req, for additional
information.

Lesson 1: Kernel Management with the Kernel Subsystem
------------------------------
-----------------------------------------------------

Task Statement
--------------
Expand Down Expand Up @@ -687,7 +687,7 @@ direct load of the kernel with a spiceypy.furnsh call.
Lesson 2: The Kernel Pool
------------------------------

.. _task-statement-1:
.. _task-statement-os-1:

Task Statement
--------------
Expand All @@ -696,7 +696,7 @@ Write a program to retrieve particular string and numeric text kernel
variables, both scalars and arrays. Interrogate the kernel pool for
assigned variable names.

.. _learning-goals-1:
.. _learning-goals-os-1:

Learning Goals
--------------
Expand Down Expand Up @@ -995,9 +995,9 @@ Related Routines
subsystem.

Lesson 3: Coordinate Conversions
------------------------------
---------------------------------

.. _task-statement-2:
.. _task-statement-os-2:

Task Statement
--------------
Expand All @@ -1007,7 +1007,7 @@ location to the other coordinate representations. Use the position of
the Moon with respect to Earth in an inertial and non-inertial reference
frame as the example vector.

.. _learning-goals-2:
.. _learning-goals-os-2:

Learning Goals
--------------
Expand Down Expand Up @@ -1287,9 +1287,9 @@ Related Routines
-- spiceypy.georec, geodetic to rectangular

Lesson 4: Advanced Time Manipulation Routines
------------------------------
----------------------------------------------

.. _task-statement-3:
.. _task-statement-os-3:

Task Statement
--------------
Expand All @@ -1299,7 +1299,7 @@ formatting of time strings for output. Formatting options include
altering calendar representations of the time strings. Convert time-date
strings between different SpiceyPy-supported formats.

.. _learning-goals-3:
.. _learning-goals-os-3:

Learning Goals
--------------
Expand Down Expand Up @@ -1444,7 +1444,7 @@ Run the code example
Lesson 5: Error Handling
------------------------------

.. _task-statement-4:
.. _task-statement-os-4:

Task Statement
--------------
Expand All @@ -1453,7 +1453,7 @@ Write an interactive program to return a state vector based on a user's
input. Code the program with the capability to recover from user input
mistakes, inform the user of the mistake, then continue to run.

.. _learning-goals-4:
.. _learning-goals-os-4:

Learning Goals
--------------
Expand Down Expand Up @@ -1677,7 +1677,7 @@ Given the times of line-of-sight for a vehicle from a ground station and
the times for an acceptable Sun-station-vehicle phase angle, write a
program to determine the time intervals common to both configurations.

.. _learning-goals-5:
.. _learning-goals-os-5:

Learning Goals
--------------
Expand Down Expand Up @@ -1936,9 +1936,9 @@ Related Routines
-- spiceypy.wnunid calculates the union of two windows.

Lesson 7: Utility and Constants Routines
------------------------------
----------------------------------------

.. _task-statement-5:
.. _task-statement-os-5:

Task Statement
--------------
Expand All @@ -1947,7 +1947,7 @@ Write an interactive program to convert values between various units.
Demonstrate the flexibility of the unit conversion routine, the string
equality function, and show the version ID function.

.. _learning-goals-6:
.. _learning-goals-os-6:

Learning Goals
--------------
Expand Down Expand Up @@ -2092,7 +2092,7 @@ in kilometers?
To Units : km
42.16481 km

.. _task-statement-6:
.. _task-statement-os-6:

Task Statement
--------------
Expand Down
16 changes: 8 additions & 8 deletions docs/remote_sensing.rst
Expand Up @@ -557,9 +557,9 @@ Solutions and answers
UTC time from spacecraft clock: 2004-06-11T19:31:59.999

Obtaining Target States and Positions (getsta)
------------------------------
----------------------------------------------

.. _task-statement-1:
.. _task-statement-rs-1:

Task Statement
--------------
Expand Down Expand Up @@ -1052,9 +1052,9 @@ Solutions and answers
Z = -510372252.747

Spacecraft Orientation and Reference Frames (xform)
------------------------------
---------------------------------------------------

.. _task-statement-2:
.. _task-statement-rs-2:

Task Statement
--------------
Expand Down Expand Up @@ -1548,9 +1548,9 @@ Solutions and answers
since the angular separation is smaller than 90 degrees.

Computing Sub-s/c and Sub-solar Points on an Ellipsoid and a DSK (subpts)
------------------------------
-------------------------------------------------------------------------

.. _task-statement-3:
.. _task-statement-rs-3:

Task Statement
--------------
Expand Down Expand Up @@ -1916,9 +1916,9 @@ Solutions and answers
for bodies with shapes modeled as triaxial ellipsoids.

Intersecting Vectors with an Ellipsoid and a DSK (fovint)
------------------------------
---------------------------------------------------------

.. _task-statement-4:
.. _task-statement-rs-4:

Task Statement
--------------
Expand Down
2 changes: 1 addition & 1 deletion getspice.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion setup.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions spiceypy/__init__.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -22,8 +22,8 @@
SOFTWARE.
"""

from .spiceypy import *
from .utils import support_types
from spiceypy.spiceypy import *
from spiceypy.utils import support_types

__author__ = 'AndrewAnnex'

Expand Down
2 changes: 1 addition & 1 deletion spiceypy/config.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions spiceypy/spiceypy.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,10 +23,10 @@
"""

import ctypes
from .utils import support_types as stypes
from .utils.libspicehelper import libspice
from . import config
from .utils.callbacks import SpiceUDFUNS, SpiceUDFUNB
from spiceypy.utils import support_types as stypes
from spiceypy.utils.libspicehelper import libspice
from spiceypy import config
from spiceypy.utils.callbacks import SpiceUDFUNS, SpiceUDFUNB
import functools
import numpy
from contextlib import contextmanager
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/__init__.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/gettestkernels.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/test_gettestkernels.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/test_spiceerrors.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/test_support_types.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/tests/test_wrapper.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion spiceypy/utils/__init__.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions spiceypy/utils/callbacks.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -24,7 +24,7 @@

import functools
from ctypes import c_int, c_double, c_char_p, POINTER, CFUNCTYPE, byref
from .support_types import SpiceCell
from spiceypy.utils.support_types import SpiceCell

UDFUNS = CFUNCTYPE(None, c_double, POINTER(c_double))
UDFUNB = CFUNCTYPE(None, UDFUNS, c_double, POINTER(c_int))
Expand Down
6 changes: 3 additions & 3 deletions spiceypy/utils/libspicehelper.py
@@ -1,7 +1,7 @@
"""
The MIT License (MIT)
Copyright (c) [2015-2017] [Andrew Annex]
Copyright (c) [2015-2018] [Andrew Annex]
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -25,8 +25,8 @@
from ctypes import CDLL, POINTER, c_int, c_double, c_char, c_char_p, c_void_p
import os
import platform
from . import support_types as stypes
from . import callbacks
from spiceypy.utils import support_types as stypes
from spiceypy.utils import callbacks

host_OS = platform.system()
sharedLib = "cspice.dll" if host_OS == "Windows" else "spice.so"
Expand Down

0 comments on commit 4211791

Please sign in to comment.