diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml index b77cfb7..eb1efc6 100644 --- a/.github/workflows/build_and_release.yml +++ b/.github/workflows/build_and_release.yml @@ -15,11 +15,11 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.10.x' - - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - - name: Install Dependencies - run: poetry install + - name: Install Env + # this should be all we need because shiv will download the deps itself + run: | + pip install shiv + pip install poetry # https://stackoverflow.com/a/64195658 - name: Add SHORT_SHA env property with commit short sha run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV diff --git a/src/cli.py b/src/cli.py index 9e1a69e..d6b26a1 100644 --- a/src/cli.py +++ b/src/cli.py @@ -15,17 +15,19 @@ oooo oooo .o888oo oooo 888 oooo .o888oo oooo .ooooo. .oooo.o `V88V"V8P' "888" o888o o888o o888o "888" o888o `Y8bod8P' 8""888P' """ + def main(): parser = argparse.ArgumentParser( - description='Run a specific script by name. If no name is provided, start a REPL.' + description="Run a specific script by name. If no name is provided, start a REPL." ) parser.add_argument( - 'user_input', + "user_input", type=str, - nargs='*', - help='The name of the script that you want to run plus any arguments for that script.') + nargs="*", + help="The name of the script that you want to run plus any arguments for that script.", + ) parser.add_argument( - '--version', action='store_true', help="Print out the version string." + "--version", action="store_true", help="Print out the version string." ) args = parser.parse_args() diff --git a/src/commands/update.py b/src/commands/update.py index 052ad1d..1f6296f 100644 --- a/src/commands/update.py +++ b/src/commands/update.py @@ -5,7 +5,7 @@ import src def main(args): release_data = httpx.get( - 'https://api.github.com/repos/itsthejoker/utils/releases/latest' + "https://api.github.com/repos/itsthejoker/utils/releases/latest" ) if release_data.status_code != 200: print( @@ -15,12 +15,12 @@ def main(args): ) return json_data = release_data.json() - if json_data['name'] == src.__version__: + if json_data["name"] == src.__version__: print("Server version is the same as current version; nothing to update.") return - url = json_data['assets'][0]['browser_download_url'] - with open('utils', 'wb') as f, httpx.stream("GET", url, follow_redirects=True) as r: + url = json_data["assets"][0]["browser_download_url"] + with open("utils", "wb") as f, httpx.stream("GET", url, follow_redirects=True) as r: for line in r.iter_bytes(): f.write(line) print(f"Updated to {json_data['name']}! 🎉") diff --git a/src/poetry2setup.py b/src/poetry2setup.py index ba1dffc..eda3ffe 100644 --- a/src/poetry2setup.py +++ b/src/poetry2setup.py @@ -14,4 +14,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main()