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/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(). diff --git a/cocktaildb/__init__.py b/cocktaildb/__init__.py index 2ed9817..e317ba6 100644 --- a/cocktaildb/__init__.py +++ b/cocktaildb/__init__.py @@ -1,9 +1,5 @@ -import aiohttp -from requests import Reqs -from cocktaildb import search, categories, ingredients, glasses - -async def tequila_info(): - return await 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 0e3bba9..a90fc84 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/python b/python new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py index bc55d90..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.0', + version='1.0.4', packages=['cocktaildb'], python_requires=">= 3.6", include_package_data=True,