Release v0.5.2

.github/workflows/python-package.yml

@@ -28,13 +28,17 @@ jobs:
  flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
  # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
  flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- test-django-lts:
- name: Test against Django long term support (LTS) version
+ test:
+ name: Test (Python, Django)
  runs-on: ubuntu-latest
  needs: lint
  strategy:
  matrix:
  python-version: [ 3.6, 3.7, 3.8, 3.9 ]
+ django-version: [ "2.2", "3.0", "3.1" ]
+ env:
+ PYTHON: ${{ matrix.python-version }}
+ DJANGO: ${{ matrix.django-version }}
  steps:
  - uses: actions/checkout@v2
  - name: Set up Python ${{ matrix.python-version }}
@@ -44,54 +48,18 @@ jobs:
  - name: Install dependencies
  run: |
  python -m pip install --upgrade pip
- python -m pip install --upgrade tox
+ python -m pip install --upgrade django~=${{ matrix.django-version }}
  if [ -f requirements/local.txt ]; then pip install -r requirements/local.txt; fi
- - name: Run Tox and update coverage
- # Run tox using the version of Python in `PATH`
- run: tox -e django-lts
- - name: Upload coverage data to coveralls.io
- run: coveralls --service=github
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- COVERALLS_FLAG_NAME: ${{ matrix.python-version }}-django-lts
- COVERALLS_PARALLEL: true
- test-django-latest:
- name: Test against the latest version of Django
- needs: lint
- runs-on: ubuntu-latest
- strategy:
- matrix:
- python-version: [ 3.6, 3.7, 3.8, 3.9 ]
- steps:
- - uses: actions/checkout@v2
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v2
- with:
- python-version: ${{ matrix.python-version }}
- - name: Install dependencies
- run: |
- python -m pip install --upgrade pip
- python -m pip install --upgrade tox
- if [ -f requirements/local.txt ]; then pip install -r requirements/local.txt; fi
- - name: Run Tox and update coverage
- # Run tox using the version of Python in `PATH`
- run: tox -e django-latest
- - name: Upload coverage data to coveralls.io
- run: coveralls --service=github
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- COVERALLS_FLAG_NAME: ${{ matrix.python-version }}-django-latest
- COVERALLS_PARALLEL: true
- coveralls:
- name: Indicate completion to coveralls.io
- needs: [ test-django-lts, test-django-latest ]
- runs-on: ubuntu-latest
- container: python:3-slim
- steps:
- - name: Finished
+ - name: Test with pytest and update coverage
  run: |
- python -m pip install coveralls
- coveralls --finish
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+ coverage run -m pytest
+ coverage xml
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v1
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: coverage.xml
+ flags: unittests
+ env_vars: PYTHON, DJANGO
+ fail_ci_if_error: true
+ verbose: true

.github/workflows/python-publish.yml

@@ -0,0 +1,29 @@
+# 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/*

README.md

@@ -1,12 +1,12 @@
 Django APScheduler
 ==================
 
-[![PyPI version](https://badge.fury.io/py/django-apscheduler.svg)](https://badge.fury.io/py/django-apscheduler)
-[![versions](https://img.shields.io/pypi/pyversions/django-apscheduler.svg)](https://pypi.org/project/django-apscheduler)
-[![Downloads](https://pepy.tech/badge/django-apscheduler)](https://pepy.tech/project/django-apscheduler)
-[![Build status](https://travis-ci.org/jcass77/django-apscheduler.svg?branch=master)](https://travis-ci.org/jcass77/django-apscheduler)
-[![codecov](https://codecov.io/gh/jcass77/django-apscheduler/branch/master/graph/badge.svg)](https://codecov.io/gh/jcass77/django-apscheduler)
-[![Code style:black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://pypi.org/project/black)
+[![PyPI](https://img.shields.io/pypi/v/django-apscheduler)](https://pypi.org/project/django-apscheduler/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/django-apscheduler)](https://pypi.org/project/django-apscheduler/)
+[![PyPI - Django Version](https://img.shields.io/pypi/djversions/django-apscheduler)](https://pypi.org/project/django-apscheduler/)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jcass77/django-apscheduler/Python%20package)](https://github.com/jcass77/django-apscheduler/actions?query=workflow%3A%22Python+package%22)
+[![Codecov](https://img.shields.io/codecov/c/github/jcass77/django-apscheduler?token=upz6ukIqMN)](https://codecov.io/gh/jcass77/django-apscheduler)
+[![Code style:black](https://img.shields.io/badge/code%20style-black-black)](https://pypi.org/project/black)
 
 [APScheduler](https://github.com/agronholm/apscheduler) for [Django](https://github.com/django/django).
 

docs/changelog.md

@@ -2,7 +2,7 @@
 
 This changelog is used to track all major changes to django-apscheduler.
 
-## v0.5.2 (UNRELEASED)
+## v0.5.2 (2021-01-28)
 
 **Enhancements**
 

docs/releasing.md

@@ -10,9 +10,27 @@ key individuals, and as a stepping stone to more automation.
 
 2. Bump the version number in `setup.py` and commit changes.
 
-3. Push to GitHub.
+3. Merge the release branch (``develop`` in the example) into ``main``:
 
-4. Create a new release on GitHub: https://github.com/jcass77/django-apscheduler/releases/new
+ ```
+ git checkout main
+ git merge --no-ff -m "Release v0.0.1" develop
+ ```
 
- - Set both tag version and release title to the semantic version number (e.g. "0.4.1")
- - Clicking "Publish" will automatically trigger a new release to get pushed to PyPi.
+4. Tag the release:
+
+ ```
+ git tag -a -m "Release v0.0.1" v0.0.1
+ ```
+
+5. Push to GitHub:
+
+ ```
+ git push --follow-tags
+ ```
+
+6. Merge ``main`` back into ``develop`` and push the branch to GitHub.
+
+7. Create a new release on GitHub: https://github.com/jcass77/django-apscheduler/releases/new
+
+8. Clicking "Publish" will automatically trigger a new release to get pushed to PyPi.

requirements/local.txt

@@ -2,12 +2,12 @@
 
 # Testing
 # ------------------------------------------------------------------------------
-tox~=3.17 # https://tox.readthedocs.io/en/latest/#
 pytest~=5.4 # https://github.com/pytest-dev/pytest
 pytest-sugar~=0.9 # https://github.com/Frozenball/pytest-sugar
 pytest-pythonpath~=0.7 # https://github.com/bigsassy/pytest-pythonpath
 
 # Django
 # ------------------------------------------------------------------------------
+django # https://www.djangoproject.com/
 django-coverage-plugin~=1.6 # https://github.com/nedbat/django_coverage_plugin
 pytest-django~=3.6 # https://github.com/pytest-dev/pytest-django

setup.py

@@ -9,7 +9,7 @@
 
 setup(
  name="django-apscheduler",
- version="0.5.1",
+ version="0.5.2",
  description="APScheduler for Django",
  long_description=long_description,
  long_description_content_type="text/markdown",
@@ -20,7 +20,6 @@
  classifiers=[
  "Development Status :: 4 - Beta",
  "Environment :: Web Environment",
- "Framework :: Django",
  "Intended Audience :: Developers",
  "License :: OSI Approved :: MIT License",
  "Operating System :: OS Independent",
@@ -31,8 +30,10 @@
  "Programming Language :: Python :: 3.7",
  "Programming Language :: Python :: 3.8",
  "Programming Language :: Python :: 3.9",
- "Topic :: Internet :: WWW/HTTP",
- "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+ "Framework :: Django",
+ "Framework :: Django :: 2.2",
+ "Framework :: Django :: 3.0",
+ "Framework :: Django :: 3.1",
  ],
  keywords="django apscheduler django-apscheduler",
  packages=find_packages(exclude=("tests",)),