diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 646f7bdb..a001b68d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,47 +1,30 @@ --- -name: Publish PyPI Release (BROKEN) +name: Publish PyPI Release on: release: types: [published] jobs: - release-package: + publish-pypi: + name: Publish PyPi Package runs-on: ubuntu-latest - + permissions: + id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: - uses: actions/checkout@v4 -# - name: Set up Python -# uses: actions/setup-python@v5 -# with: -# python-version: "3.x" - -# - name: Install dependencies -# run: | -# python -m pip install -U pip -# python -m pip install -U -r requirements/build.txt -# python -m pip install -U -r requirements.txt - -# - name: Build package -# run: | -# python -m build --sdist --wheel --outdir dist . -# twine check dist/* - -# - name: Upload packages to Jazzband -# uses: pypa/gh-action-pypi-publish@release/v1 -# with: -# user: jazzband -# password: ${{ secrets.JAZZBAND_RELEASE_KEY }} -# repository-url: https://jazzband.co/projects/django-dbbackup/upload - -# This workflopw is disabled due to the following error: -# -# ERROR HTTPError: 500 Internal Server Error from -# https://jazzband.co/projects/django-dbbackup/upload -# INTERNAL SERVER ERROR - -# Until we are transfered out of Jazzband, the workaround is releasing manually via personal PyPI accounts. -# The following steps are required to release a new version of the package: -# python -m pip install -U pip && pip install -U -r requirements/build.txt && pip install -U -r requirements.txt -# python -m build --sdist --wheel --outdir dist . && twine check dist/* -# twine upload dist/* + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + - name: Install dependencies + run: | + pip install --upgrade pip + pip install --upgrade -r requirements/build.txt + pip install --upgrade -r requirements.txt + - name: Build package + run: | + python -m build --sdist --wheel --outdir dist . + twine check dist/* + - name: Upload packages to PyPi + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/README.rst b/README.rst index 18e10812..7293a533 100644 --- a/README.rst +++ b/README.rst @@ -1,19 +1,15 @@ Django Database Backup ====================== -.. image:: https://github.com/jazzband/django-dbbackup/actions/workflows/build.yml/badge.svg - :target: https://github.com/jazzband/django-dbbackup/actions +.. image:: https://github.com/Archmonger/django-dbbackup/actions/workflows/build.yml/badge.svg + :target: https://github.com/Archmonger/django-dbbackup/actions .. image:: https://readthedocs.org/projects/django-dbbackup/badge/?version=stable :target: https://django-dbbackup.readthedocs.io/ :alt: Documentation Status -.. image:: https://codecov.io/gh/jazzband/django-dbbackup/branch/master/graph/badge.svg?token=zaYmStcsuX - :target: https://codecov.io/gh/jazzband/django-dbbackup - -.. image:: https://jazzband.co/static/img/badge.svg - :target: https://jazzband.co/ - :alt: Jazzband +.. image:: https://codecov.io/gh/Archmonger/django-dbbackup/branch/master/graph/badge.svg?token=zaYmStcsuX + :target: https://codecov.io/gh/Archmonger/django-dbbackup This Django application provides management commands to help backup and restore your project database and media files with various storages such as @@ -46,14 +42,6 @@ files. Contributing ============ -.. image:: https://jazzband.co/static/img/jazzband.svg - :target: https://jazzband.co/ - :alt: Jazzband - -This is a `Jazzband `_ project. By contributing you agree -to abide by the `Contributor Code of Conduct `_ -and follow the `guidelines `_. - All contribution are very welcomed, propositions, problems, bugs and enhancement are tracked with `GitHub issues`_ system and patches are submitted via `pull requests`_. @@ -61,6 +49,6 @@ via `pull requests`_. We use GitHub Actions as continuous integration tools. .. _`Read The Docs`: https://django-dbbackup.readthedocs.org/ -.. _`GitHub issues`: https://github.com/jazzband/django-dbbackup/issues -.. _`pull requests`: https://github.com/jazzband/django-dbbackup/pulls -.. _Coveralls: https://coveralls.io/github/jazzband/django-dbbackup +.. _`GitHub issues`: https://github.com/Archmonger/django-dbbackup/issues +.. _`pull requests`: https://github.com/Archmonger/django-dbbackup/pulls +.. _Coveralls: https://coveralls.io/github/Archmonger/django-dbbackup diff --git a/contributing.md b/contributing.md deleted file mode 100644 index ad78220b..00000000 --- a/contributing.md +++ /dev/null @@ -1,3 +0,0 @@ -[![Jazzband](https://jazzband.co/static/img/jazzband.svg)](https://jazzband.co/) - -This is a [Jazzband](https://jazzband.co/) project. By contributing you agree to abide by the [Contributor Code of Conduct](https://jazzband.co/about/conduct) and follow the [guidelines](https://jazzband.co/about/guidelines). diff --git a/dbbackup/tests/test_connectors/test_postgresql.py b/dbbackup/tests/test_connectors/test_postgresql.py index 081eae9b..e2d979ce 100644 --- a/dbbackup/tests/test_connectors/test_postgresql.py +++ b/dbbackup/tests/test_connectors/test_postgresql.py @@ -36,7 +36,7 @@ def test_create_dump(self, mock_dump_cmd): self.assertTrue(mock_dump_cmd.called) def test_create_dump_without_host(self, mock_dump_cmd): - # this is allowed now: https://github.com/jazzband/django-dbbackup/issues/520 + # this is allowed now: https://github.com/Archmonger/django-dbbackup/issues/520 self.connector.settings.pop("HOST", None) self.connector.create_dump() diff --git a/docs/changelog.rst b/docs/changelog.rst index b7881229..5e38a25d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,7 @@ Unreleased ---------- * Use environment variable for PostgreSQL password to prevent password leakage in logs/emails +* This repository has been transferred out of Jazzband due to logistical concerns. 4.3.0 (2025-05-09) ---------- diff --git a/docs/contributing.rst b/docs/contributing.rst index 30823b0e..04e96ebd 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -16,7 +16,7 @@ issue if: - You've got a question - More generally something seems wrong for you -.. _`GitHub issues`: https://github.com/jazzband/django-dbbackup/issues +.. _`GitHub issues`: https://github.com/Archmonger/django-dbbackup/issues Make a patch ------------ @@ -36,7 +36,7 @@ of requests we advise you to: Travis. DBBackup uses a lot of file operations, so breaks between Python versions are easy. -.. _`GitHub pull requests`: https://github.com/jazzband/django-dbbackup/pulls +.. _`GitHub pull requests`: https://github.com/Archmonger/django-dbbackup/pulls Test environment ---------------- @@ -124,20 +124,20 @@ Online CI We use `Travis`_ which tests Dbbackup with a matrix of components' versions: Several versions of Django and several versions of Python including 2, 3 and PyPy. -.. image:: https://api.travis-ci.org/jazzband/django-dbbackup.svg - :target: https://travis-ci.org/jazzband/django-dbbackup +.. image:: https://api.travis-ci.org/Archmonger/django-dbbackup.svg + :target: https://travis-ci.org/Archmonger/django-dbbackup Code coverage is ensured with `Coveralls`_ and the project has not yet reached a minimum coverage limit. -.. image:: https://coveralls.io/repos/jazzband/django-dbbackup/badge.svg?branch=master&service=github - :target: https://coveralls.io/github/jazzband/django-dbbackup?branch=master +.. image:: https://coveralls.io/repos/Archmonger/django-dbbackup/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/Archmonger/django-dbbackup?branch=master Code health is checked with `Landscape`_ -.. image:: https://landscape.io/github/jazzband/django-dbbackup/master/landscape.svg?style=flat - :target: https://landscape.io/github/jazzband/django-dbbackup/master +.. image:: https://landscape.io/github/Archmonger/django-dbbackup/master/landscape.svg?style=flat + :target: https://landscape.io/github/Archmonger/django-dbbackup/master :alt: Code Health -.. _Travis: https://travis-ci.org/jazzband/django-dbbackup -.. _Coveralls: https://coveralls.io/github/jazzband/django-dbbackup -.. _Landscape: https://landscape.io/github/jazzband/django-dbbackup/ +.. _Travis: https://travis-ci.org/Archmonger/django-dbbackup +.. _Coveralls: https://coveralls.io/github/Archmonger/django-dbbackup +.. _Landscape: https://landscape.io/github/Archmonger/django-dbbackup/ diff --git a/docs/index.rst b/docs/index.rst index a392bace..61123cd3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -46,12 +46,12 @@ Other Resources * `GitHub pull requests`_ * `Coveralls`_ -.. _`GitHub repository`: https://github.com/jazzband/django-dbbackup +.. _`GitHub repository`: https://github.com/Archmonger/django-dbbackup .. _`PyPI project`: https://pypi.python.org/pypi/django-dbbackup/ .. _`Read The Docs`: https://django-dbbackup.readthedocs.org/ -.. _`GitHub issues`: https://github.com/jazzband/django-dbbackup/issues -.. _`GitHub pull requests`: https://github.com/jazzband/django-dbbackup/pulls -.. _`Coveralls`: https://coveralls.io/github/jazzband/django-dbbackup +.. _`GitHub issues`: https://github.com/Archmonger/django-dbbackup/issues +.. _`GitHub pull requests`: https://github.com/Archmonger/django-dbbackup/pulls +.. _`Coveralls`: https://coveralls.io/github/Archmonger/django-dbbackup Indices and tables ================== diff --git a/docs/installation.rst b/docs/installation.rst index e26c5015..c5a183a9 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -24,7 +24,7 @@ that are at least present when using PyPi repositories. :: - pip install -e git+https://github.com/jazzband/django-dbbackup.git#egg=django-dbbackup + pip install -e git+https://github.com/Archmonger/django-dbbackup.git#egg=django-dbbackup Add it in your project diff --git a/setup.py b/setup.py index b115ddd0..4535007c 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def get_test_requirements(): include_package_data=True, zip_safe=False, license="BSD", - url="https://github.com/jazzband/django-dbbackup", + url="https://github.com/Archmonger/django-dbbackup", keywords=[ "django", "database",