From 7843dcf44d368c4f6a0e0047d6d0a2d3e6834574 Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:14:13 -0500 Subject: [PATCH 1/6] try a publish workflow --- .github/workflows/publish.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..3bd7b6b --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,33 @@ +on: [push, pull_request] + +jobs: + publish: + name: build and publish to pypi + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: 3.9 + + - name: install dependencies & build + run: | + pip3 install setuptools build wheel + python3 setup.py sdist bdist_wheel + + - name: publish to Test PyPi + uses: pypa/gh-action-pypi-publish@release/v1 + with: + skip_existing: true + user: __token__ + password: ${{ secrets.TEST_PYPI_TOKEN }} + repository_url: https://test.pypi.org/legacy/ + + - name: publish to PyPi + if: startsWith(github.ref, 'refs/tags') + uses: pypa/gh-action-pypi-publish@release/v1 + with: + user: __token__ + password: ${{ secrets.PYPI_TOKEN }} \ No newline at end of file From 8143b61331e2a30db21fdcfef17abcc9be3f0cd3 Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:18:48 -0500 Subject: [PATCH 2/6] tweak script --- .github/workflows/publish.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3bd7b6b..7a1892e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,14 +7,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v1 - with: - python-version: 3.9 - - name: install dependencies & build run: | - pip3 install setuptools build wheel + python3 -m pip install setuptools build wheel python3 setup.py sdist bdist_wheel - name: publish to Test PyPi From 20a7b0cde753a017ca6a67504602ca2b5a409b3e Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:25:27 -0500 Subject: [PATCH 3/6] tweak again --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7a1892e..3cf7200 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ jobs: - name: install dependencies & build run: | - python3 -m pip install setuptools build wheel + pip3 install setuptools wheel python3 setup.py sdist bdist_wheel - name: publish to Test PyPi From 0d7abe8a8d79e9cc727b2e53b9c53aa6b991882d Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:31:10 -0500 Subject: [PATCH 4/6] use setuptools --- setup.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index fbb49a1..dbe1f08 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,8 @@ import os -from distutils.core import setup - -about = {} -here = os.path.abspath(os.path.dirname(__file__)) -with open(os.path.join(here,'gwh', '__version__.py'), encoding='utf-8') as f: - exec(f.read(), about) +from setuptools import setup setup( - name=about['__title__'], - version=about['__version__'], + name="Gitlab Webook Handler", author='Andy Hebrank', author_email='ahebrank@gmail.com', packages=['gwh'], From bed2e7353e5d90989e894e305ac513b7e91ab1df Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:33:01 -0500 Subject: [PATCH 5/6] specify md readme --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index dbe1f08..a71025f 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ description='Webhook Handler for GitLab', license='Apache License, Version 2.0', long_description=open('README.md', encoding='utf-8').read(), + long_description_content_type='text/markdown', install_requires=[ 'Flask>=1.0', 'requests>=2.19.0' From 36990ddd36435c6ac9fe01d399d5ee9708cc160e Mon Sep 17 00:00:00 2001 From: Andy Hebrank Date: Tue, 17 Jan 2023 16:35:32 -0500 Subject: [PATCH 6/6] rename --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a71025f..09afb73 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( - name="Gitlab Webook Handler", + name="gwh", author='Andy Hebrank', author_email='ahebrank@gmail.com', packages=['gwh'],