From 2d4b89cd6243bca051680f3ff50b8b311bf51ccf Mon Sep 17 00:00:00 2001
From: mborsetti <mike@borsetti.com>
Date: Sun, 18 Oct 2020 18:28:33 +0800
Subject: [PATCH] Final cleanup to remove unneeded dependencies

---
 .github/workflows/testpackage.yml | 2 +-
 CONTRIBUTORS.markdown             | 1 +
 pysolar/solar.py                  | 3 +--
 python3-pysolar.spec              | 4 +---
 requirements.txt                  | 2 --
 setup.py                          | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/testpackage.yml b/.github/workflows/testpackage.yml
index 5c565ad..f68c910 100644
--- a/.github/workflows/testpackage.yml
+++ b/.github/workflows/testpackage.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 pytest
+        pip install flake8 pytest nose
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Lint with flake8
       run: |
diff --git a/CONTRIBUTORS.markdown b/CONTRIBUTORS.markdown
index 27d09b1..ffc54d8 100644
--- a/CONTRIBUTORS.markdown
+++ b/CONTRIBUTORS.markdown
@@ -27,6 +27,7 @@ Thanks to:
 * Robin Wilson
 * Pietro Zambelli
 * Holger Zebner
+* Mike Borsetti
 
 for their contributions of code, bugfixes, documentation, and general encouragement.
 
diff --git a/pysolar/solar.py b/pysolar/solar.py
index 5782d80..447160f 100644
--- a/pysolar/solar.py
+++ b/pysolar/solar.py
@@ -26,13 +26,12 @@
 from . import solartime as stime
 from . import radiation
 from .tzinfo_check import check_aware_dt
-import pytz
 
 
 def solar_test():
     latitude_deg = 42.364908
     longitude_deg = -71.112828
-    d = datetime.datetime.now(tz=pytz.UTC)
+    d = datetime.datetime.now(tz=datetime.timezone.utc)
     thirty_minutes = datetime.timedelta(hours = 0.5)
     for _ in range(48):
         timestamp = d.ctime()
diff --git a/python3-pysolar.spec b/python3-pysolar.spec
index ef4236f..6a0f038 100644
--- a/python3-pysolar.spec
+++ b/python3-pysolar.spec
@@ -25,9 +25,7 @@ BuildRequires:  make
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
-BuildRequires:  python3-nose
 BuildRequires:  python3-numpy
-BuildRequires:  python3-pytz
 
 Provides:       python3-%{srcname} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{pkgname}}
@@ -64,7 +62,7 @@ popd
 %changelog
 * Fri Jun 19 2020 Johan Heikkila <johan.heikkila@gmail.com> - 0.8-2
 - Removed python2
-- Added BuildRequires python3-nose, python3-numpy
+- Added BuildRequires python3-numpy
 
 * Mon Sep 16 2019 Elliot Lee <sopwith@gmail.com> - 0.8-1
 - Initial version
diff --git a/requirements.txt b/requirements.txt
index 849e333..24ce15a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1 @@
-pytz
 numpy
-nose
diff --git a/setup.py b/setup.py
index 2cb9c6d..cc46ae4 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@
     url='http://pysolar.org',
     packages=['pysolar'],
     package_data = {"pysolar": ["*.pyi"]},  # *.py is included in any case
-    requires = ['numpy', 'pytz'],
+    requires = ['numpy'],
     )