From 057545f5ef831e6e31980f600fe68ea0398d2d4b Mon Sep 17 00:00:00 2001 From: Heru J Date: Sun, 11 Apr 2021 21:54:18 -0400 Subject: [PATCH 1/5] typo --- Docs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs.md b/Docs.md index 95bda75..5fa4b37 100644 --- a/Docs.md +++ b/Docs.md @@ -14,7 +14,7 @@ import cocktaildb # This is in literally a list, not in the form of a dict or string async def list_of_categories(): - return await cocktaildb.categories() + return await cocktaildb.categories() ``` There are more functions such as glasses() and ingredients(). From 8fd16e67506d81af6fae882f39c02b0a134b9833 Mon Sep 17 00:00:00 2001 From: Heru J Date: Sun, 11 Apr 2021 22:55:14 -0400 Subject: [PATCH 2/5] Rename requests file' --- cocktaildb/__init__.py | 6 ++---- cocktaildb/cocktaildb.py | 2 +- cocktaildb/{requests.py => reqs.py} | 0 setup.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) rename cocktaildb/{requests.py => reqs.py} (100%) diff --git a/cocktaildb/__init__.py b/cocktaildb/__init__.py index 2ed9817..1e4183e 100644 --- a/cocktaildb/__init__.py +++ b/cocktaildb/__init__.py @@ -1,9 +1,7 @@ -import aiohttp -from requests import Reqs -from cocktaildb import search, categories, ingredients, glasses +import cocktaildb async def tequila_info(): - return await search(query='tequila') + return await cocktaildb.search(query='tequila') async def list_of_categories(): return await cocktaildb.categories() diff --git a/cocktaildb/cocktaildb.py b/cocktaildb/cocktaildb.py index 0e3bba9..260f742 100644 --- a/cocktaildb/cocktaildb.py +++ b/cocktaildb/cocktaildb.py @@ -1,4 +1,4 @@ -from requests import Reqs +from reqs import Reqs """Function responsible for getting data from https://www.thecocktaildb.com/api.php""" diff --git a/cocktaildb/requests.py b/cocktaildb/reqs.py similarity index 100% rename from cocktaildb/requests.py rename to cocktaildb/reqs.py diff --git a/setup.py b/setup.py index bc55d90..de09362 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ author='clvrk', author_email="herufromstatefarm@gmail.com", url="https://github.com/clvrk/cocktail-wrapper", - version='1.0.0', + version='1.0.3', packages=['cocktaildb'], python_requires=">= 3.6", include_package_data=True, From 8aab69091ac6c39ed975554deeee30e33ef6ede1 Mon Sep 17 00:00:00 2001 From: Heru J Date: Sun, 11 Apr 2021 23:14:36 -0400 Subject: [PATCH 3/5] Trying to fix __init__ once again --- cocktaildb/__init__.py | 12 +++++------- cocktaildb/cocktaildb.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cocktaildb/__init__.py b/cocktaildb/__init__.py index 1e4183e..e317ba6 100644 --- a/cocktaildb/__init__.py +++ b/cocktaildb/__init__.py @@ -1,7 +1,5 @@ -import cocktaildb - -async def tequila_info(): - return await cocktaildb.search(query='tequila') - -async def list_of_categories(): - return await cocktaildb.categories() +from .reqs import Reqs +from .cocktaildb import search +from .cocktaildb import ingredients +from .cocktaildb import glasses +from .cocktaildb import categories diff --git a/cocktaildb/cocktaildb.py b/cocktaildb/cocktaildb.py index 260f742..a90fc84 100644 --- a/cocktaildb/cocktaildb.py +++ b/cocktaildb/cocktaildb.py @@ -1,4 +1,4 @@ -from reqs import Reqs +from .reqs import Reqs """Function responsible for getting data from https://www.thecocktaildb.com/api.php""" From cd181c5f1fddb076c3cc92fd42d6be61c2540494 Mon Sep 17 00:00:00 2001 From: Heru J Date: Sun, 11 Apr 2021 23:20:04 -0400 Subject: [PATCH 4/5] New version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index de09362..740270f 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ author='clvrk', author_email="herufromstatefarm@gmail.com", url="https://github.com/clvrk/cocktail-wrapper", - version='1.0.3', + version='1.0.5', packages=['cocktaildb'], python_requires=">= 3.6", include_package_data=True, From f6367b0429ce6415e190978de97760983ddbf48f Mon Sep 17 00:00:00 2001 From: Heru J Date: Sun, 11 Apr 2021 23:27:29 -0400 Subject: [PATCH 5/5] Took off workflows + fully fixed init file --- .github/workflows/python-publish.yml | 31 ---------------------------- python | 0 setup.py | 2 +- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .github/workflows/python-publish.yml create mode 100644 python diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml deleted file mode 100644 index 1a03a7b..0000000 --- a/.github/workflows/python-publish.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This workflow will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries - -name: Upload Python Package - -on: - release: - types: [created] - -jobs: - deploy: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install setuptools wheel twine - - name: Build and publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - python setup.py sdist bdist_wheel - twine upload dist/* diff --git a/python b/python new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py index 740270f..d49e724 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ author='clvrk', author_email="herufromstatefarm@gmail.com", url="https://github.com/clvrk/cocktail-wrapper", - version='1.0.5', + version='1.0.4', packages=['cocktaildb'], python_requires=">= 3.6", include_package_data=True,