Merge branch 'dev'

docs/conf.py

@@ -15,6 +15,8 @@
 import sys
 import os
 
+import sphinx_rtd_theme
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -33,7 +35,8 @@
     'sphinx.ext.autodoc',
     'sphinx.ext.viewcode',
 	'sphinx.ext.autosummary',
-    'sphinxcontrib.napoleon',
+    'sphinx.ext.napoleon',
+    'sphinx_rtd_theme',
 #    'numpydoc',
 ]
 # Napoleon settings
@@ -113,13 +116,14 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 
-# See http://docs.readthedocs.org/en/latest/theme.html for why this code.
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+html_theme = "sphinx_rtd_theme"
 
-if not on_rtd:
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+# See http://docs.readthedocs.org/en/latest/theme.html for why this code.
+# on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+# if not on_rtd:
+#    import sphinx_rtd_theme
+#    html_theme = 'sphinx_rtd_theme'
+#    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

pyluach/hebrewcal.py

@@ -74,7 +74,7 @@ def holiday(date, israel=False):
     if date in table:
         return table[date]
     if month == 7:
-        if day in range(1, 3):
+        if day in [1, 2]:
             return 'Rosh Hashana'
         elif day == 10:
             return 'Yom Kippur'

requirements.txt

@@ -0,0 +1,45 @@
+alabaster==0.7.12
+atomicwrites==1.3.0
+attrs==19.1.0
+Babel==2.7.0
+bleach==3.1.0
+certifi==2019.6.16
+chardet==3.0.4
+colorama==0.4.1
+coverage==4.5.4
+docutils==0.15.2
+idna==2.8
+imagesize==1.1.0
+importlib-metadata==0.19
+Jinja2==2.10.1
+MarkupSafe==1.1.1
+more-itertools==7.2.0
+packaging==19.1
+pkginfo==1.5.0.1
+pluggy==0.12.0
+py==1.8.0
+Pygments==2.4.2
+-e git+https://github.com/simlist/pyluach.git@6d9a36c792b7ae33e8ffd8a0b37293ea391e25dd#egg=pyluach
+pyparsing==2.4.2
+pytest==5.0.1
+pytest-cov==2.7.1
+pytz==2019.1
+readme-renderer==24.0
+requests==2.22.0
+requests-toolbelt==0.9.1
+six==1.12.0
+snowballstemmer==1.9.0
+Sphinx==2.1.2
+sphinx-rtd-theme==0.4.3
+sphinxcontrib-applehelp==1.0.1
+sphinxcontrib-devhelp==1.0.1
+sphinxcontrib-htmlhelp==1.0.2
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.2
+sphinxcontrib-serializinghtml==1.1.3
+tqdm==4.32.2
+twine==1.13.0
+urllib3==1.25.3
+wcwidth==0.1.7
+webencodings==0.5.1
+zipp==0.5.2