Python >= 3.7 anno, src layout

Author: scivision

.gitattributes

@@ -1,12 +1,8 @@
 [mypy]
-files = sciencedates/
+files = src/
 
 ignore_missing_imports = True
-strict_optional = False
 allow_redefinition = True
 show_error_context = False
 show_column_numbers = True
 warn_unreachable = False
-
-[mypy-xarray]
-follow_imports = skip

.mypy.ini

@@ -1,20 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 command-line utility to convert date to day of year
 """
 from argparse import ArgumentParser
 from sciencedates import date2doy
 
 
-def main():
-    p = ArgumentParser(description="convert date to day of year")
-    p.add_argument("date", help="yyyy-mm-dd")
-    P = p.parse_args()
+p = ArgumentParser(description="convert date to day of year")
+p.add_argument("date", help="yyyy-mm-dd")
+P = p.parse_args()
 
-    doy, year = date2doy(P.date)
+doy, year = date2doy(P.date)
 
-    print(doy.item())
-
-
-if __name__ == "__main__":
-    main()
+print(doy.item())

archive/.appveyor.yml

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import numpy as np
 from bisect import bisect
 import sciencedates as sd
@@ -13,11 +13,6 @@ def INCORRECTRESULT_using_bisect(x, X0):  # pragma: no cover
     return np.asanyarray(ind), x[ind]
 
 
-def main():
-    print(sd.find_nearest([10, 15, 12, 20, 14, 33], [32, 12.01]))
+print(sd.find_nearest([10, 15, 12, 20, 14, 33], [32, 12.01]))
 
-    print(INCORRECTRESULT_using_bisect([10, 15, 12, 20, 14, 33], [32, 12.01]))
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
+print(INCORRECTRESULT_using_bisect([10, 15, 12, 20, 14, 33], [32, 12.01]))

archive/.travis.yml

@@ -2,4 +2,4 @@
 requires = ["setuptools", "wheel"]
 
 [tool.black]
-line-length = 132
+line-length = 100

date2doy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 generate a random date (month and day) in a year.
 Michael Hirsch, Ph.D.
@@ -8,13 +8,8 @@
 from sciencedates import randomdate
 
 
-def main():
-    p = ArgumentParser(description="generate random date in year")
-    p.add_argument("year", type=int, nargs="?", default=date.today().year)
-    P = p.parse_args()
+p = ArgumentParser(description="generate random date in year")
+p.add_argument("year", type=int, nargs="?", default=date.today().year)
+P = p.parse_args()
 
-    print(randomdate(P.year))
-
-
-if __name__ == "__main__":
-    main()
+print(randomdate(P.year))

findnearest.py

@@ -1,6 +1,6 @@
 [metadata]
 name = sciencedates
-version = 1.5.0
+version = 1.5.1
 author = Michael Hirsch, Ph.D.
 author_email = scivision@users.noreply.github.com
 url = https://github.com/geospace-code/sciencedates
@@ -21,22 +21,25 @@ long_description = file: README.md
 long_description_content_type = text/markdown
 
 [options]
-python_requires = >= 3.5
+python_requires = >= 3.7
 packages = find:
-scripts =
-  date2doy.py
-  findnearest.py
-  randomdate.py
 install_requires =
   numpy
   python-dateutil
+package_dir=
+    =src
+
+[options.packages.find]
+where=src
 
 [options.extras_require]
 tests =
   pytest
 lint =
   flake8
   mypy
+  types-pytz
+  types-python-dateutil
 plot =
   xarray
   matplotlib