From 1816a8b6d841418d113cc8b16400b5699ababb1b Mon Sep 17 00:00:00 2001 From: Gustavo Silva Date: Thu, 27 Jul 2023 11:54:00 +0100 Subject: [PATCH 1/2] Bump version for new release. (#43) * fix: version bump (#38) * publish_develop workflow to publish -dev package to pypi * Update setup.cfg (#42) Signed-off-by: pacuraro <122358966+pacuraro@users.noreply.github.com> * misc: version bump for new release --------- Signed-off-by: pacuraro <122358966+pacuraro@users.noreply.github.com> Signed-off-by: Gustavo Silva Co-authored-by: Filipe Pina Co-authored-by: Filipe Pina <636320+fopina@users.noreply.github.com> Co-authored-by: pacuraro <122358966+pacuraro@users.noreply.github.com> --- .github/workflows/publish.yml | 2 +- .github/workflows/publish_develop.yml | 37 +++++++++++++++++++++++++++ .github/workflows/publish_test.yml | 2 +- dkron/__init__.py | 2 +- setup.cfg | 2 +- 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/publish_develop.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 600c412..ab78152 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ on: types: [created] jobs: - deploy: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish_develop.yml b/.github/workflows/publish_develop.yml new file mode 100644 index 0000000..7bda740 --- /dev/null +++ b/.github/workflows/publish_develop.yml @@ -0,0 +1,37 @@ +# This workflows 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: publish develop + +on: + push: + branches: + - develop + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine + - name: Update package name, version and README + run: | + sed -i 's/^name = django-dkron$/name = django-dkron-dev/' setup.cfg + sed -i "s/^__version__ = .*/__version__ = '0.${{ github.run_number }}'/" dkron/__init__.py + echo dev releases from https://github.com/surface-security/django-dkron > README.md + - name: Confirm package name changed + run: test -n "$(git status --porcelain setup.cfg)" + - name: Build and publish + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + run: | + python setup.py sdist bdist_wheel + twine upload dist/* diff --git a/.github/workflows/publish_test.yml b/.github/workflows/publish_test.yml index 6a61ac1..b42d30a 100644 --- a/.github/workflows/publish_test.yml +++ b/.github/workflows/publish_test.yml @@ -11,7 +11,7 @@ on: - testpypi/* jobs: - deploy: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/dkron/__init__.py b/dkron/__init__.py index 6fe52cc..1bcb85f 100644 --- a/dkron/__init__.py +++ b/dkron/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.1.1' +__version__ = '1.1.2' # set default_app_config when using django earlier than 3.2 try: diff --git a/setup.cfg b/setup.cfg index ab7763d..2e4e3e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ packages = find: # requires 3.9 due to django-notification-sender... python_requires = >=3.9 install_requires = - Django >= 3.0, < 4 + Django >= 3.0, < 5 django-logbasecommand < 1 django-notification-sender < 1 requests > 2, < 3 From b17c2780858f7cf80040ab0011d087bc004f497b Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Fri, 16 Feb 2024 14:19:59 +0000 Subject: [PATCH 2/2] Version bump to 1.2.0 (#50) Signed-off-by: Duarte Duarte --- dkron/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dkron/__init__.py b/dkron/__init__.py index 1bcb85f..2e63ddc 100644 --- a/dkron/__init__.py +++ b/dkron/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.1.2' +__version__ = '1.2.0' # set default_app_config when using django earlier than 3.2 try: