diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfbfecfd..8fc661dc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,24 +1,50 @@ -name: Upload Python Package +# https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/ +name: Publish Python distribution to PyPI on: release: types: [created] jobs: - deploy: + build: + name: Build distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - pip install setuptools wheel twine - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI }} - run: | - python3 setup.py sdist bdist_wheel - twine upload dist/* + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.x" + - name: Install pypa/build + run: >- + python3 -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Store the distribution packages + uses: actions/upload-artifact@v3 + with: + name: python-package-distributions + path: dist/ + publish-to-pypi: + name: >- + Publish Python distribution to PyPI + needs: + - build + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/thera-py + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + steps: + - name: Download all the dists + uses: actions/download-artifact@v3 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/Makefile b/Makefile deleted file mode 100644 index 819034e3..00000000 --- a/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -.PHONY: clean, run - -run: - uvicorn therapy.main:app --reload --port=$(or $(port), 8000) - -reqs: Pipfile - pipenv lock --requirements > requirements.txt - pipenv lock --dev --requirements > requirements-dev.txt - -clean: - @find . -type f -name '*.pyc' -delete - @find . -type d -name '__pycache__' | xargs rm -rf - @rm -rf build/ - @rm -rf dist/ - @rm -f src/*.egg* diff --git a/therapy/etl/drugsatfda.py b/therapy/etl/drugsatfda.py index 7b0ec272..b54bde1e 100644 --- a/therapy/etl/drugsatfda.py +++ b/therapy/etl/drugsatfda.py @@ -36,7 +36,9 @@ def get_latest_version(self) -> str: raise DownloadException(msg) return date else: - raise requests.HTTPError("Unable to retrieve version from FDA API") + raise requests.HTTPError( + "Unable to retrieve version from FDA API", response=requests.Response() + ) def _load_meta(self) -> None: """Add Drugs@FDA metadata."""