Fix and improve GitHub workflows

LaikaN57 · LaikaN57 · commit fe25aabd7c12 · 2021-04-09T00:14:14.000-07:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,8 +8,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
-      - name: Lint
+      - name: Lint (black)
         uses: psf/black@stable
         with:
-          black_args: "./ally --check"
+          args: "./ally --check"
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,23 @@
+name: Publish Python Package
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Install tools
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install --upgrade twine
+      - name: Build
+        run: python setup.py sdist bdist_wheel
+      - name: Publish
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: twine upload dist/*
diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@ After setting up API keys, PyAlly can provide the basic/essential Ally brokerage
 
 Make sure to [read the docs](https://alienbrett.github.io/PyAlly)!
 
-
 ## Version 1.1.2
 
 The lastest redesign preserves many features of the old interface, and incorporates a few new ones.
@@ -68,6 +67,7 @@ If your dev environment gets hosed, exit it, remove the `venv` directory, and ru
 * [Tianyu](https://github.com/Tianyu00)
 * [Salient](https://github.com/Salient)
 * [Matt Margolin](https://github.com/mm0)
+* [Alex Kennedy](https://github.com/LaikaN57)
 
 Message me on Github or [send an email](mailto:alienbrett648@gmail.com) if you enjoyed the project or thought it could be improved. I do my best to code with quality but sometimes it is easier said than done. Anyone with an interest with an eye for detail is welcome to contribute.
 
diff --git a/ally/Account/accounts.py b/ally/Account/accounts.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .utils import _dot_flatten
 from ..Api import AccountEndpoint, RequestType
+from .utils import _dot_flatten
 
 
 class Accounts(AccountEndpoint):
diff --git a/ally/Account/balances.py b/ally/Account/balances.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .utils import _dot_flatten
 from ..Api import AccountEndpoint, RequestType
+from .utils import _dot_flatten
 
 
 class Balances(AccountEndpoint):
diff --git a/ally/Ally.py b/ally/Ally.py
@@ -30,9 +30,8 @@
 
 from .Api import setTimeout
 from .Auth import Auth
-from .Watchlist import Watchlist
 from .exception import ApiKeyException
-
+from .Watchlist import Watchlist
 
 _all_params = (
     "ALLY_OAUTH_SECRET",
diff --git a/ally/Api.py b/ally/Api.py
@@ -33,13 +33,15 @@
 
 """
 
+import datetime
+import json
+
 from requests import Request, Session
 from requests.exceptions import HTTPError, Timeout
+
 from . import RateLimit
-from .utils import JSONStreamParser, pretty_print_POST
 from .classes import RequestType
-import datetime
-import json
+from .utils import JSONStreamParser, pretty_print_POST
 
 # Global timeout variable
 _timeout = 1.0
@@ -190,7 +192,7 @@ def request(self=None):
                 except StopIteration:
                     pass
                 else:
-                    if 'quote' in row or 'trade' in row:
+                    if "quote" in row or "trade" in row:
                         yield row
                 finally:
                     del it
diff --git a/ally/Order/Outstanding.py b/ally/Order/Outstanding.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .order import Order
 from ..Api import AccountEndpoint, RequestType
+from .order import Order
 
 
 class OutstandingOrders(AccountEndpoint):
diff --git a/ally/Order/__init__.py b/ally/Order/__init__.py
@@ -26,7 +26,7 @@
 
 """
 
-from .Outstanding import orders
-from .Submit import submit
 from .classes import *
 from .order import Order
+from .Outstanding import orders
+from .Submit import submit
diff --git a/ally/Order/order.py b/ally/Order/order.py
@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from ..utils import option_callput, option_maturity, option_strike, option_symbol
 from .classes import *
 from .utils import parseTree, transposeTree
-from ..utils import option_callput, option_maturity, option_strike, option_symbol
 
 
 class Order:
diff --git a/ally/Order/tests/InstrumentConstruction.py b/ally/Order/tests/InstrumentConstruction.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .classes import *
 from ..classes import *
+from .classes import *
 
 
 class TestInstrumentConstruction(unittest.TestCase):
diff --git a/ally/Order/tests/OrderConstruction.py b/ally/Order/tests/OrderConstruction.py
@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .classes import *
 from ..classes import *
 from ..order import Order
+from .classes import *
 
 
 class TestOrderConstruction(XMLTestCase):
diff --git a/ally/Order/tests/OrderParse.py b/ally/Order/tests/OrderParse.py
@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .classes import *
 from ..classes import *
 from ..order import Order
+from .classes import *
 
 
 class TestOrderParse(XMLTestCase):
diff --git a/ally/Order/tests/OrderSubmition.py b/ally/Order/tests/OrderSubmition.py
@@ -20,14 +20,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import warnings
 import unittest
+import warnings
 
-
-from .classes import *
+from ...Ally import Ally
 from ..classes import *
 from ..order import Order
-from ...Ally import Ally
+from .classes import *
 
 
 class TestOrderSubmition(XMLTestCase):
diff --git a/ally/Order/tests/PricingConstruction.py b/ally/Order/tests/PricingConstruction.py
@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .classes import *
 from ..classes import *
+from .classes import *
 
 
 class TestPricingConstruction(unittest.TestCase):
diff --git a/ally/Order/tests/classes.py b/ally/Order/tests/classes.py
@@ -20,16 +20,19 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import logging
 import unittest
 import xml.etree.ElementTree as ET
 
+logger = logging.getLogger(__name__)
+
 
 class XMLTestCase(unittest.TestCase):
-    def assertEqualXML(self, s1, s2, msg, verbose=False):
+    def assertEqualXML(self, s1: str, s2: str, msg: str) -> None:
         s1 = ET.tostring(ET.fromstring(s1))
         s2 = ET.tostring(ET.fromstring(s2))
-        if verbose:
-            print()
-            print(s1)
-            print(s2)
+
+        logger.debug(s1)
+        logger.debug(s2)
+
         self.assertEqual(s1, s2, msg)
diff --git a/ally/Watchlist/methods.py b/ally/Watchlist/methods.py
@@ -20,8 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import logging
+
 from ..Api import AuthenticatedEndpoint, Endpoint, RequestType
 
+logger = logging.getLogger(__name__)
+
 
 class WatchlistEndpoint(AuthenticatedEndpoint):
     """Also automatically resolve url to include account number"""
@@ -89,7 +93,7 @@ class GetWatchlist(WatchlistEndpoint):
     def resolve(self, **kwargs):
         """Inject the account number into the call"""
         watchlist_name = kwargs.get("watchlist_name").replace("/", r"%2F")
-        # print(watchlist_name)
+        logger.debug(watchlist_name)
         return self.url().format(
             watchlist_name,
         )
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
     long_description_content_type="text/markdown",
     url="https://github.com/alienbrett/PyAlly",
     packages=setuptools.find_packages(),
-    install_requires=["requests-oauthlib", "requests", "pytz"],
+    install_requires=["pandas", "pytz", "requests", "requests-oauthlib"],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
diff --git a/sphinx/conf.py b/sphinx/conf.py
@@ -23,7 +23,7 @@
 author = "Brett Graves"
 
 # The full version, including alpha/beta/rc tags
-release = "1.1.1"
+release = "1.1.2"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/test.py b/test.py
@@ -1,25 +1,24 @@
 import concurrent.futures
+import logging
 
 import ally
 
+logger = logging.getLogger(__name__)
+
 a = ally.Ally()
 
-# print(h)
+
 def job():
-    print("Submitting job")
+    logger.info("Submitting job")
     return a.timesales("spy", startdate="2020-06-19", enddate="2020-06-19", block=False)
 
 
 with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-
-    print("Submitting requests")
+    logger.info("Submitting requests")
     # Submit all our orders
     futures = {executor.submit(job): i for i in range(200)}
-    print("Submitted!")
+    logger.info("Submitted!")
 
-    print("Getting results...")
+    logger.info("Getting results...")
     for future in concurrent.futures.as_completed(futures):
-        try:
-            print(future.result(), "#{}".format(futures[future]))
-        except:
-            raise
+        logger.info("%s #%s", future.result(), futures[future])
