satkit 0.2.4__tar.gz → 0.2.6__tar.gz

{satkit-0.2.4 → satkit-0.2.6}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "satkit"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 description = "Satellite Toolkit"
 readme = "README.md"

{satkit-0.2.4/python/satkit.egg-info → satkit-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satkit
-Version: 0.2.4
+Version: 0.2.6
 Summary: Satellite Orbital Dynamics Toolkit
 Author-email: Steven Michael <ssmichael@gmail.com>
 Maintainer-email: Steven Michael <ssmichael@gmail.com>
@@ -19,16 +19,33 @@ Requires-Dist: numpy>=1.20.0
 
 # Satellite Toolkit with Rust
 
+An accurate, high-performance satellite orbital kinematics toolkit, written in Rust with a sensible interface.
+<br/>
+
+### Github
+
 ![Build Passing?](https://github.com/ssmichael1/satkit/actions/workflows/build.yml/badge.svg)
 ![Wheel Passing?](https://github.com/ssmichael1/satkit/actions/workflows/wheels.yml/badge.svg)
 ![GitHub License](https://img.shields.io/github/license/ssmichael1/satkit)
-<br/>
-An accurate, high-performance satellite orbital kinematics toolkit, written in Rust with a sensible interface.
+
+### Crates.io
+
+![Crates.io Version](https://img.shields.io/crates/v/satkit)
+![Crates.io Downloads (recent)](https://img.shields.io/crates/dr/satkit)
+
+### PyPi
+
+![PyPI - Version](https://img.shields.io/pypi/v/satkit)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satkit)
+![PyPI - Implementation](https://img.shields.io/pypi/implementation/satkit)
+![PyPI - Status](https://img.shields.io/pypi/status/satkit)
 
 ## Language Bindings
 
 - **Native Rust** bindings
-- **Python bindings** for compiled rust code ... speed of Rust with convenience of Python
+- **Python bindings** for compiled rust code ... speed of Rust with convenience of Python<br/>
+  Install with `pip install satkit`<br/>
+  PyPi includes binaries for windows, macos (Intel & arm), and linux
 
 ## Features
 

{satkit-0.2.4 → satkit-0.2.6}/README.md

@@ -1,15 +1,32 @@
 # Satellite Toolkit with Rust
 
+An accurate, high-performance satellite orbital kinematics toolkit, written in Rust with a sensible interface.
+<br/>
+
+### Github
+
 ![Build Passing?](https://github.com/ssmichael1/satkit/actions/workflows/build.yml/badge.svg)
 ![Wheel Passing?](https://github.com/ssmichael1/satkit/actions/workflows/wheels.yml/badge.svg)
 ![GitHub License](https://img.shields.io/github/license/ssmichael1/satkit)
-<br/>
-An accurate, high-performance satellite orbital kinematics toolkit, written in Rust with a sensible interface.
+
+### Crates.io
+
+![Crates.io Version](https://img.shields.io/crates/v/satkit)
+![Crates.io Downloads (recent)](https://img.shields.io/crates/dr/satkit)
+
+### PyPi
+
+![PyPI - Version](https://img.shields.io/pypi/v/satkit)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satkit)
+![PyPI - Implementation](https://img.shields.io/pypi/implementation/satkit)
+![PyPI - Status](https://img.shields.io/pypi/status/satkit)
 
 ## Language Bindings
 
 - **Native Rust** bindings
-- **Python bindings** for compiled rust code ... speed of Rust with convenience of Python
+- **Python bindings** for compiled rust code ... speed of Rust with convenience of Python<br/>
+  Install with `pip install satkit`<br/>
+  PyPi includes binaries for windows, macos (Intel & arm), and linux
 
 ## Features
 

{satkit-0.2.4 → satkit-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "satkit"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = ["numpy>=1.20.0"]
 requires-python = ">= 3.8"
 authors = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
@@ -43,6 +43,9 @@ find = { where = ["python"] }
 
 [tool.cibuildwheel]
 build = ["cp312-*", "cp311-* cp310-* cp39-* cp38-*"]
+test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
+skip = ["pp*", "*_i686", "*_s390x", "*_aarch64", "*_ppc64le", "*-musllinux*"]
+
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]
@@ -54,17 +57,15 @@ before-build = [
 ]
 environment = { PATH = "$PATH:$HOME/.cargo/bin" }
 # Skip trying to test arm64 builds on Intel Macs
-test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
 test-requires = "pytest"
 test-command = [
-    "ASTRO_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
+    "SATKIT_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
 ]
 
 
 [tool.cibuildwheel.linux]
 environment = { PATH = "$PATH:$HOME/.cargo/bin" }
 archs = ["x86_64"]
-skip = ["pp*", "*_i686", "*_s390x", "*_aarch64", "*_ppc64le", "*-musllinux*"]
 before-build = [
     "pip install -U setuptools-rust",
     "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y",
@@ -72,7 +73,7 @@ before-build = [
 ]
 test-requires = "pytest"
 test-command = [
-    "ASTRO_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
+    "SATKIT_DATA={package}/astro-data SATKIT_TESTVEC_ROOT={package}/satkit-testvecs pytest {project}/python/test/test.py",
 ]
 
 [tool.cibuildwheel.windows]
@@ -85,14 +86,13 @@ before-build = [
     "rustup show",
 ]
 archs = ["AMD64"]
-skip = ["pp*"]
 test-requires = "pytest"
 before-test = [
-    "set ASTRO_DATA={package}\\astro-data",
+    "set SATKIT_DATA={package}\\astro-data",
     "set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs",
 ]
 test-command = [
-    "set ASTRO_DATA={package}\\astro-data&&set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs&&pytest {project}\\python\\test\\test.py",
+    "set SATKIT_DATA={package}\\astro-data&&set SATKIT_TESTVEC_ROOT={package}\\satkit-testvecs&&pytest {project}\\python\\test\\test.py",
 ]
 
 

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/__init__.pyi

@@ -176,7 +176,7 @@ def sgp4(
     tle: satkit.TLE | list[satkit.tle],
     tm: satkit.time | list[satkit.time] | npt.ArrayLike[satkit.time],
     **kwargs,
-) -> (npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]):
+) -> tuple[npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]]:
     """
     Run Simplified General Perturbations (SGP)-4 propagator on
     Two-Line Element Set to
@@ -369,7 +369,7 @@ def gravity(
 
 def gravity_and_partials(
     pos: satkit.itrfcoord | npt.ArrayLike[np.float], **kwargs
-) -> (npt.ArrayLike[np.float], np.arrayLike[np.float]):
+) -> typing.Tuple[npt.ArrayLike[np.float], np.arrayLike[np.float]]:
     """
     gravity_and_partials(pos)
     --
@@ -537,8 +537,18 @@ class timescale:
     are needed to compute precise rotations between various inertial and
     Earth-fixed coordinate frames
 
-    For details, see:
-    https://stjarnhimlen.se/comp/time.html
+    For an excellent overview, see:
+    https://spsweb.fltops.jpl.nasa.gov/portaldataops/mpg/MPG_Docs/MPG%20Book/Release/Chapter2-TimeScales.pdf
+
+    # Options:
+
+    * Invalid: Invalid time scale
+    * UTC: Universal Time Coordinate
+    * TT: Terrestrial Time
+    * UT1: UT1
+    * TAI: International Atomic Time
+    * GPS: Global Positioning System (GPS) time
+    * TDB: Barycentric Dynamical Time    
     """
 
     @property
@@ -587,6 +597,31 @@ class time:
     the ability to convert to an from the "datetime" object.  However, a separate
     time representation is needed as the "datetime" object does not allow for
     conversion between various time epochs (GPS, TAI, UTC, UT1, etc...)
+
+    Initialization arguments:
+
+    If no arguments are passed in, the created object represents
+    the current time, i.e. the time at which the function was called
+
+
+    If 3 integers are passed in, they represent a UTC date specified
+    by the standard Gregorian year, month (1-based), and day of month
+    (1-based)
+
+    if 5 integers and a float are passed in, they represent a UTC
+    date and time.  The 1st 3 numbers represent the standard
+    Gregorian year, month, and day as above.  The last 3 represent the
+    hour of the day [0,23], the minute of the hour [0,59], and the
+    second (including fractional component) of the minute
+
+    Example 1:
+    print(satkit.time(2023, 3, 5, 11, 3,45.453))
+    2023-03-05 11:03:45.453Z
+
+    Example 2:
+    print(satkit.time(2023, 3, 5))
+    2023-03-05 00:00:00.000Z
+
     """
 
     def __init__(self, *args):
@@ -645,7 +680,7 @@ class time:
         Return a time object representing input modified Julian date and time scale
         """
 
-    def to_date(self) -> (int, int, int):
+    def to_date(self) -> typing.Tuple[int, int, int]:
         """
         Return tuple representing as UTC Gegorian date of the
         time object.  Tuple has 6 elements:
@@ -687,7 +722,7 @@ class time:
 
     def to_gregorian(
         self, scale=satkit.timescale.UTC
-    ) -> (int, int, int, int, int, float):
+    ) -> typing.Tuple[int, int, int, int, int, float]:
         """
         Return tuple representing as UTC Gegorian date and time of the
         time object.  Tuple has 6 elements:
@@ -730,16 +765,20 @@ class time:
         2023-06-03 02:19:34
         """
 
-    def to_mjd(self, scale: satkit.timescale) -> float:
+    def to_mjd(self, scale: satkit.timescale = satkit.timescale.UTC) -> float:
         """
         Represent time instance as a Modified Julian Date
         with the provided time scale
+
+        If no time scale is provided, default is satkit.timescale.UTC
         """
 
-    def to_jd(self, scale: satkit.timescale) -> float:
+    def to_jd(self, scale: satkit.timescale = satkit.timescale.UTC) -> float:
         """
         Represent time instance as Julian Date with
         the provided time scale
+
+        If no time scale is provided, default is satkit.timescale.UTC
         """
 
     def to_unixtime(self) -> float:
@@ -765,15 +804,15 @@ class time:
         Return an satkit.time object or nunpy array of satkit.time objects
         representing the input "added to" the current object
 
-        Possible inputs and corresponding outputs:
+        # Possible inputs and corresponding outputs:
 
-        1. float: return satkit.time object incremented by input number of days
-        2. satkit.duration: return satkit.time object incremented by duration
-        3. list[float]: return numpy array of satkit.time objects, representing
+        *  `float` - return satkit.time object incremented by input number of days
+        * `satkit.duration` - return satkit.time object incremented by duration
+        * `list[float]`  - return numpy array of satkit.time objects, representing
            an element-wise addition of days to the "self"
-        4. list[duration]: reuturn numpy array of satkit.time objects, with each
+        * `list[duration]` -  reuturn numpy array of satkit.time objects, with each
            object representing an element-wise addition of "duration" to the "self"
-        5. numpy.array(float): return numpy array of satkit.time objects, with each
+        * `numpy.array(float)` - return numpy array of satkit.time objects, with each
            object representing an element-wise addition of days to the "self"
         """
 
@@ -791,17 +830,17 @@ class time:
         Return an satkit.time object or numpy array of satkit.time objects
         representing the input "subtracted from" the current object
 
-        Possible inputs and corresponding outputs:
+        # Possible inputs and corresponding outputs:
 
-        1. satkit.time: output is duration representing the difference
+        * `satkit.time` - output is duration representing the difference
            between the "other" time and "self"
-        2. satkit.duration: output is satkit.time object representing time minus
+        * `satkit.duration` - output is satkit.time object representing time minus
            the input duration
-        3. list[float]: return numpy array of satkit.time objects, representing
+        * `list[float]` - return numpy array of satkit.time objects, representing
            an element-wise subtraction of days to the "self"
-        4. list[duration]: return numpy array of satkit.time objects, representing
+        * `list[duration]` - return numpy array of satkit.time objects, representing
            an element-wise subtraction of "duration" from the "self"
-        5. numpy.array(float): return numpy array of satkit.time objects, with
+        * `numpy.array(float)` - return numpy array of satkit.time objects, with
            each object representing an element-wise subtraction of days from
            the "self".
 
@@ -847,11 +886,13 @@ class duration:
         if "other" is a time, output is a time representing the input
         time plus the duration
 
-        Example 1:
+        # Example 1:
+        
         print(duration.from_hours(1) + duration.from_minutes(1))
         Duration: 1 hours, 1 minutes, 0.000 seconds
 
-        Example 2:
+        # Example 2:
+        
         print(duration.from_hours(1) + satkit.time(2023, 6, 4, 11,30,0))
         2023-06-04 13:30:00.000Z
 
@@ -936,6 +977,15 @@ class quaternion:
         have to be normalized.
         """
 
+    @staticmethod
+    def from_rotation_matrix(
+        mat: npt.ArrayLike[np.float64],
+    ) -> satkit.quaternion:
+        """
+        Return quaternion representing right-handed rotation
+        represented by input 3x3 rotation matrix
+        """
+
     @staticmethod
     def rotx(theta) -> satkit.quaternion:
         """
@@ -994,7 +1044,7 @@ class quaternion:
         Return 3x3 rotation matrix representing equivalent rotation
         """
 
-    def to_euler(self) -> (float, float, float):
+    def to_euler(self) -> typing.Tuple[float, float, float]:
         """
         Return equivalent rotation angle represented as rotation angles:
         ("roll", "pitch", "yaw") in radians:
@@ -1009,7 +1059,7 @@ class quaternion:
         Return the angle in radians of the rotation
         """
 
-    def axis(self) -> npt.ArrayLike(np.float64):
+    def axis(self) -> npt.ArrayLike[np.float64]:
         """
         Return the axis of rotation as a unit vector
         """
@@ -1196,13 +1246,13 @@ class itrfcoord:
         """
 
     @property
-    def geodetic_rad(self) -> (float, float, float):
+    def geodetic_rad(self) -> typing.Tuple[float, float, float]:
         """
         Tuple with: (latitude_rad, longitude_rad, altitude)
         """
 
     @property
-    def geodetic_deg(self) -> (float, float, float):
+    def geodetic_deg(self) -> typing.Tuple[float, float, float]:
         """
         Tuple with (latitude_deg, longitude_deg, altitude)
         """
@@ -1227,7 +1277,7 @@ class itrfcoord:
         to ITRF at this location
         """
 
-    def geodesic_distance(self, other: itrfcoord) -> (float, float, float):
+    def geodesic_distance(self, other: itrfcoord) -> typing.Tuple[float, float, float]:
         """
         Use Vincenty formula to compute geodesic distance:
         https://en.wikipedia.org/wiki/Vincenty%27s_formulae

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/density/__init__.pyi

@@ -13,7 +13,7 @@ import satkit
 
 
 @typing.overload
-def nrlmsise(itrf: satkit.itrfcoord, time: satkit.time | None) -> (float, float):
+def nrlmsise(itrf: satkit.itrfcoord, time: satkit.time | None) -> typing.Tuple[float, float]:
     """
     NRL MSISE-00 Atmosphere Density Model
     
@@ -44,7 +44,7 @@ def nrlmsise(itrf: satkit.itrfcoord, time: satkit.time | None) -> (float, float)
 def nrlmsise(altitude_meters: float,
              latitude_rad: float,
              longitude_rad: float,
-             time: satkit.time | None) -> (float, float):
+             time: satkit.time | None) -> typing.Tuple[float, float]:
     """
     NRL MSISE-00 Atmosphere Density Model
     

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/frametransform/__init__.pyi

@@ -19,80 +19,125 @@ import satkit
 import datetime
 
 def gmst(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
     Greenwich Mean Sidereal Time
-
+    
     Vallado algorithm 15:
-
-    GMST = 67310.5481 + (876600h + 8640184.812866) * tᵤₜ₁ * (0.983104 + tᵤₜ₁ * -6.2e-6)
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with GMST in radians matched element-wise
-    to the input times.
+    
+    GMST = 67310.5481 + (876600h + 8640184.812866) * tᵤₜ₁ * (0.983104 + tᵤₜ₁ * −6.2e−6)
+    
+    
+    # Arguments
+    
+      * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+              representing time at which to calculate output
+    
+    # Returns
+    
+    * Greenwich Mean Sideral Time, radians, at intput time(s)
+    
     """
 
 def gast(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
-    Greenwich Apparent Sidereal Time
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with GAST in radians matched element-wise
-    to the input times.
+    Greenwich apparant sidereal time, radians
+    
+    # Arguments:
+    
+      * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+              representing time at which to calculate output
+    
+    # Returns:
+    
+     * Greenwich apparant sidereal time, radians, at input time(s)
+    
     """
 
 def earth_rotation_angle(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> float | npt.ArrayLike[np.float]:
     """
-    Earth rotation angle
-
-    See:
-    https://www.iers.org/SharedDocs/Publikationen/EN/IERS/Publications/tn/TechnNote36/tn36_043.pdf?__blob=publicationFile&v=1
-
+    Earth Rotation Angle
+    
+    See
+    [IERS Technical Note 36, Chapter 5](https://www.iers.org/SharedDocs/Publikationen/EN/IERS/Publications/tn/TechnNote36/tn36_043.pdf?__blob=publicationFile&v=1)
     Equation 5.15
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is float or numpy array of floats with Earth Rotation Angle in radians
-    matched element-wise to the input times.
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Earth rotation angle, in radians, at input time(s)
+    
+    # Calculation Details
+    
+    * Let t be UT1 Julian date
+    * let f be fractional component of t (fraction of day)
+    * ERA = 2𝜋 ((0.7790572732640 + f + 0.00273781191135448 * (t − 2451545.0))
+    
     """
 
 def qitrf2tirs(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
-    Rotation from International Terrestrial Reference Frame
-    (ITRF) to the Terrestrial Intermediate Reference System (TIRS)
-    represented as satkit.quaterinion object
-
-    Input is satkit.time object or list or numpy array of satkit.time objects.
-
-    Output is satkit.quaternion or numpy array of satkit.quaternion representiong
-    rotations from itrf to tirs matched element-wise to the input times
+    Rotation from Terrestrial Intermediate Reference System to
+    Celestial Intermediate Reference Systems
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from TIRS to CIRS at input time(s)
+    
     """
 
 @typing.overload
-def qcirs2gcrf(tm: satkit.time) -> satkit.quaternion:
-    """
-    Rotate from Celestial Intermediate Reference System
+def qcirs2gcrf(tm: satkit.time | datetime.datetime) -> satkit.quaternion:
+    """  
+    Rotation from Celestial Intermediate Reference System
     to Geocentric Celestial Reference Frame
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from CIRS to GCRF at input time(s)
+    
     """
 
 @typing.overload
-def qcirs2gcrf(tm: npt.ArrayLike[satkit.time]) -> npt.ArrayLike[satkit.quaternion]:
+def qcirs2gcrf(tm: npt.ArrayLike[satkit.time] | npt.ArrayLike[datetime.datetime]) -> npt.ArrayLike[satkit.quaternion]:
     """
-    Rotate from Celestial Intermediate Reference System
+    Rotation from Celestial Intermediate Reference System
     to Geocentric Celestial Reference Frame
+    
+    # Arguments:
+    
+     * `tm`: scalar, list, or numpy array of astro.time or datetime.datetime 
+             representing time at which to calculate output
+    
+    # Returns:
+    
+     * Quaternion representing rotation from CIRS to GCRF at input time(s)
+    
     """
 
 def qtirs2cirs(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Rotation from Terrestrial Intermediate Reference System (TIRS)
@@ -106,7 +151,7 @@ def qtirs2cirs(
     """
 
 def qgcrf2itrf_approx(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing approximate rotation from the
@@ -128,7 +173,7 @@ def qgcrf2itrf_approx(
     """
 
 def qitrf2gcrf_approx(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing approximate rotation from the
@@ -175,7 +220,7 @@ def qgcrf2itrf(
     """
 
 def qitrf2gcrf(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing rotation from the
@@ -200,7 +245,7 @@ def qitrf2gcrf(
     """
 
 def qteme2itrf(
-    tm: satkit.time | npt.ArrayLike[satkit.time],
+    tm: satkit.time | npt.ArrayLike[satkit.time] | datetime.datetime | npt.ArrayLike[datetime.datetime],
 ) -> satkit.quaternion | npt.ArrayLike[satkit.quaternion]:
     """
     Quaternion representing rotation from the

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/jplephem/__init__.pyi

@@ -60,7 +60,7 @@ def barycentric_pos(body: satkit.solarsystem, tm: satkit.time|list[satkit.time]|
     """    
 
 def geocentric_state(body: satkit.solarsystem, 
-                     tm: satkit.time|list[satkit.time]|npt.ArrayLike[satkit.time]) -> (npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]):
+                     tm: satkit.time|list[satkit.time]|npt.ArrayLike[satkit.time]) -> typing.Tuple[npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]]:
     """
     Return geocentric (Earth-centered) state (position and velocity) for a given solar-system body
     at the given time or times in the GCRF frame 
@@ -88,7 +88,7 @@ def geocentric_state(body: satkit.solarsystem,
     """
     
 def barycentric_state(body: satkit.solarsystem, 
-                     tm: satkit.time|list[satkit.time]|npt.ArrayLike[satkit.time]) -> (npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]):
+                     tm: satkit.time|list[satkit.time]|npt.ArrayLike[satkit.time]) -> typing.Tuple[npt.ArrayLike[np.float64], npt.ArrayLike[np.float64]]:
     """
     Return barycentric position and velocity for a given solar-system body
     at the given time or times.  The barycentric coordinate system origin 

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/satprop/__init__.pyi

@@ -234,8 +234,8 @@ class propsettings:
         """
 
 def propagate(
-    pos: npt.ArrayLike(np.float64),
-    vel: npt.ArrayLike(np.float64),
+    pos: npt.ArrayLike[float],
+    vel: npt.ArrayLike[float],
     start: satkit.time,
     **kwargs,
 ) -> PropResult:

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/sun/__init__.pyi

@@ -125,7 +125,7 @@ def pos_mod(
 def rise_set(time: satkit.time,
              coord: satkit.itrfcoord,
              sigma: float = 90.0 + 50.0/60.0
-             ) -> (satkit.time, satkit.time):
+             ) -> typing.Tuple[satkit.time, satkit.time]:
     """
     Sunrise and sunset times on the day given by input time
     and at the given location.  

{satkit-0.2.4 → satkit-0.2.6}/python/satkit/utils/__init__.pyi

@@ -52,7 +52,7 @@ def datadir() -> str:
 
     MacOS:
 
-    1. Directory pointed to by "ASTRO_DATA" environment variable
+    1. Directory pointed to by "SATKIT_DATA" environment variable
     2. $HOME/LIBRARY/Application\ Support/astro-data
     3. $HOME/.astro-data
     4. $HOME