Merge pull request #2 from mcneillj/bug-fix

Update packages to work with latest dependencies

.gitignore

@@ -38,6 +38,9 @@ docs/_build
 # virtualenv
 venv/
 
+# VS Code
+.vscode/
+
 # coverage reports
 .coverage
 .coverage.*

.travis.yml

@@ -1,9 +1,10 @@
 language: python
 python:
-  - "3.5"
   - "3.6"
   - "3.7"
-dist: xenial
+  - "3.8"
+  - "3.8-dev"
+dist: bionic
 sudo: true
 # install dev dependencies
 before_install:

README.md

@@ -24,8 +24,8 @@ pip install sitka
 ```
 
 ## Dependencies
-- [NumPy](https://www.numpy.org): 1.9.0 or higher
-- [Pandas](https://pandas.pydata.org): 0.23.0 or higher
+- [NumPy](https://www.numpy.org): 1.19.2 or higher
+- [Pandas](https://pandas.pydata.org): 1.1.2 or higher
 
 ## Features
 * **Weather** - Import a weather file in EPW format and convert to series.

requirements.txt

@@ -1,2 +1,2 @@
-numpy==1.14.3
-pandas==0.23.0
+numpy==1.19.2
+pandas==1.1.2

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='sitka',
-    version='0.1.2',
+    version='0.1.3',
     description='A built environment analysis and modeling library for Python.',
     long_description="""
     Sitka is a built environment analysis and modeling library for Python.
@@ -31,16 +31,16 @@
         'Intended Audience :: Science/Research',
         'Topic :: Scientific/Engineering',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     keywords='simulation setuptools development',
     packages=find_packages(include=['sitka', 'sitka.*']),
     include_package_data=True,
     install_requires=[
-        "numpy>=1.14.3",
-        "pandas>=0.23.0",
-        "pytest>=3.5.1",
+        "numpy>=1.19.2",
+        "pandas>=1.1.2",
+        "pytest>=6.0.2",
     ],
 )

sitka/io/time.py

@@ -37,7 +37,7 @@ class Time:
     calculate_julian_day
 
     """
-    def __init__(self, year=pd.datetime.now().year, start_hour=0, end_hour=8760, time_steps_per_hour=4):
+    def __init__(self, year=pd.Timestamp.now().year, start_hour=0, end_hour=8760, time_steps_per_hour=4):
         self.time_range = None
         self.datetime_range = None
         self.time_step = None
@@ -92,7 +92,7 @@ def calculate_time_range(self):
         start_hour = self.start_hour*3600
         end_hour = self.end_hour*3600
         dt = self.time_step
-        time_range = np.linspace(start_hour,end_hour,end_hour/dt)
+        time_range = np.linspace(start_hour,end_hour,int(end_hour/dt))
         self.time_range = time_range
         self.length = len(time_range)