Merge pull request #38 from EtWnn/develop

Develop
EtWnn · Apr 6, 2022 · 5e2ff63 · 5e2ff63
2 parents 65c8540 + 7fae0c6
commit 5e2ff63
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 113 deletions.
diff --git a/CryptoPrice/__about__.py b/CryptoPrice/__about__.py
@@ -1,2 +1,2 @@
-__version__ = "0.1.3"
-__author__ = "EtWnn"
+__version__ = "0.2.0"
+__author__ = "EtWnn"
diff --git a/CryptoPrice/__init__.py b/CryptoPrice/__init__.py
@@ -2,16 +2,15 @@
 
 from CryptoPrice.retrievers.BinanceRetriever import BinanceRetriever
 from CryptoPrice.retrievers.KucoinRetriever import KucoinRetriever
-from CryptoPrice.retrievers.CoinbaseRetriever import CoinbaseRetriever
 from CryptoPrice.retrievers.MetaRetriever import MetaRetriever
 
 
 def get_default_retriever() -> MetaRetriever:
     """
-    Provides a hands on price retriever made from the default BinanceRetriever, the default KucoinRetriever
-    and the default CoinbaseRetriever
+    Provides a hands on price retriever made from the default BinanceRetriever and the default KucoinRetriever
+
 
     :return: the meta retriever constructed
     :rtype: MetaRetriever
     """
-    return MetaRetriever([BinanceRetriever(), KucoinRetriever(), CoinbaseRetriever()])
+    return MetaRetriever([BinanceRetriever(), KucoinRetriever()])
diff --git a/CryptoPrice/retrievers/CoinbaseRetriever.py b/CryptoPrice/retrievers/CoinbaseRetriever.py
diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
 ===============================
-Welcome to CryptoPrice 0.1.3
+Welcome to CryptoPrice 0.2.0
 ===============================
 
 
@@ -26,7 +26,6 @@ amount of different tokens or to compare the price difference between exchanges.
 It currently includes:
     - Binance API
     - Kucoin API
-    - Coinbase API
     - Cross-API logic
 
 Quick Tour
@@ -38,10 +37,8 @@ Quick Tour
 
 .. code:: bash
 
-    pip install --no-deps python-CryptoPrice
     pip install python-CryptoPrice
 
-*Note*: `--no-deps` is needed as one of the dependencies is not hosted one PYPI, simply on git.
 
 You can also install the latest developments (not stable):
 
@@ -95,7 +92,7 @@ than the one above as several API calls (or database requests) may be needed.
 
 .. code-block:: bash
 
-    >>LTC = 420.76841 XRP, source: {'binance', 'kucoin', 'coinbase'}
+    >>LTC = 420.76841 XRP, source: {'binance', 'kucoin'}
 
 
 Donation

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -24,7 +24,7 @@
 # The full version, including alpha/beta/rc tags
 this_directory = os.path.abspath(os.path.dirname(__file__))
 about = {}
-with open(os.path.join(this_directory, f'../../{project}/__init__.py'), encoding='utf-8') as f:
+with open(os.path.join(this_directory, f'../../{project}/__about__.py'), encoding='utf-8') as f:
     exec(f.read(), about)
 release = about['__version__']
 

diff --git a/docs/source/overview.rst b/docs/source/overview.rst
@@ -8,11 +8,8 @@ Installation
 
 .. code:: bash
 
-    pip install --no-deps python-CryptoPrice
     pip install python-CryptoPrice
 
-*Note*: `--no-deps` is needed as one of the dependencies is not hosted one PYPI, simply on git.
-
 You can also install the latest developments (not stable):
 
 .. code:: bash
@@ -29,7 +26,7 @@ Get a retriever
 ---------------
 
 To fetch some prices, you will need to use a retriever, there are several kinds and instances of retrievers in this
-library so we made a default one for you:
+library so a default one is ready for you:
 
 .. code:: python
 
@@ -85,4 +82,4 @@ than the one above as several API calls (or database requests) have to be made.
 
 .. code-block:: bash
 
-    >>LTC = 420.76841 XRP, source: {'binance', 'kucoin', 'coinbase'}
+    >>LTC = 420.76841 XRP, source: {'binance', 'kucoin'}
diff --git a/docs/source/retrievers.rst b/docs/source/retrievers.rst
@@ -31,11 +31,6 @@ Implemented Retrievers
 
 Below are the retrievers implemented in this library.
 
-.. automodule:: CryptoPrice.retrievers.CoinbaseRetriever
-    :special-members: __init__
-    :members:
-    :undoc-members:
-
 .. automodule:: CryptoPrice.retrievers.BinanceRetriever
     :special-members: __init__
     :members:

diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,4 @@ appdirs
 sphinx
 sphinx_rtd_theme
 python-binance
-kucoin-python
-git+https://github.com/teleprint-me/[email protected]#egg=cbpro
+kucoin-python
diff --git a/setup.py b/setup.py
@@ -28,8 +28,7 @@
     install_requires=['requests',
                       'appdirs',
                       'python-binance',
-                      'kucoin-python',
-                      'cbpro@git+https://github.com/teleprint-me/[email protected]'],
+                      'kucoin-python'],
     keywords='eth bsc price ohlc candle history API Binance Kucoin',
     classifiers=[
         'Intended Audience :: Developers',