Skip to content

Commit

Permalink
github: stop testing pg 9.6
Browse files Browse the repository at this point in the history
PGHoard should still work with PG 9.3+, but since 9.6 is out of support
there's not much point in testing it for every PR anymore.

Also updated Python version references where applicable as we only test with
3.6 and newer.
  • Loading branch information
saaros committed Mar 11, 2022
1 parent 2a3b04d commit 226aba1
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
pg-version: [9.6, 10, 11, 12, 13, 14]
pg-version: [10, 11, 12, 13, 14]

steps:
- id: checkout-code
Expand Down
8 changes: 5 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ if the host running PGHoard is incapacitated.
Requirements
============

PGHoard can backup and restore PostgreSQL versions 9.3 and above. The
daemon is implemented in Python and works with CPython version 3.5 or newer.
The following Python modules are required:
PGHoard can backup and restore PostgreSQL versions 9.3 and above, but is
only tested and actively developed with version 10 and above.

The daemon is implemented in Python and is tested and developed with version
3.6 and above. The following Python modules are required:

* psycopg2_ to look up transaction log metadata
* requests_ for the internal client-server architecture
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Vagrant.configure("2") do |config|
sed -i "s/^#create_main_cluster.*/create_main_cluster=false/g" /etc/postgresql-common/createcluster.conf
apt-get install -y python3.6 python3.6-dev python3.6-venv python3.7 python3.7-dev python3.7-venv python3.8 python3.8-dev python3.8-venv python3.9 python3.9-dev python3.9-venv
apt-get install -y postgresql-{9.6,10,11,12,13,14} postgresql-server-dev-{9.6,10,11,12,13,14}
apt-get install -y postgresql-{10,11,12,13,14} postgresql-server-dev-{10,11,12,13,14}
username="$(< /dev/urandom tr -dc a-z | head -c${1:-32};echo;)"
password=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;)
Expand Down
18 changes: 7 additions & 11 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ Development
Requirements
------------

PGHoard can backup and restore PostgreSQL versions 9.3 and above. The
daemon is implemented in Python and works with CPython version 3.5 or newer.
PGHoard can backup and restore PostgreSQL versions 9.3 and above, but is
only tested and actively developed with version 10 and above.

The daemon is implemented in Python and is tested and developed with version
3.6 and above. The following Python modules are required:

The following Python modules are required:

* psycopg2_ to look up transaction log metadata
Expand Down Expand Up @@ -50,25 +54,17 @@ Vagrant
=======

The Vagrantfile can be used to setup a vagrant development environment. The vagrant environment has
python 3.6, 3.7, 3.8 and 3.9 virtual environments and installations of postgresql 9.6, 10, 11 and 12.
python 3.6, 3.7, 3.8 and 3.9 virtual environments and installations of postgresql 10 and newer.

By default vagrant up will start a Virtualbox environment. The Vagrantfile will also work for libvirt, just prefix
VAGRANT_DEFAULT_PROVIDER=libvirt to the vagrant up command.

Any combination of Python (3.6, 3.7 and 3.8) and Postgresql (9.6, 10, 11 and 12)

Bring up vagrant instance and connect via ssh::

vagrant up
vagrant ssh
vagrant@ubuntu2004:~$ cd /vagrant

Test with Python 3.6 and Postgresql 9.6

vagrant@ubuntu2004:~$ source ~/venv3.6/bin/activate
vagrant@ubuntu2004:~$ PG_VERSION=9.6 make unittest
vagrant@ubuntu2004:~$ deactivate

Test with Python 3.7 and Postgresql 10

vagrant@ubuntu2004:~$ source ~/venv3.7/bin/activate
Expand Down
18 changes: 14 additions & 4 deletions pghoard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,21 @@ Url: http://github.com/aiven/pghoard
Summary: PostgreSQL streaming backup service
License: ASL 2.0
Source0: pghoard-rpm-src.tar
Requires: python3-botocore
Requires: python3-cryptography >= 0.8
Requires: python3-dateutil
Requires: python3-psycopg2
Requires: python3-pydantic
Requires: python3-requests
Requires: python3-snappy
Requires: python3-zstandard
Requires: systemd
Requires: python3-botocore, python3-cryptography >= 0.8, python3-dateutil
Requires: python3-psycopg2, python3-requests, python3-snappy, python3-zstandard, python3-pydantic,
Conflicts: pgespresso92 < 1.2, pgespresso93 < 1.2, pgespresso94 < 1.2, pgespresso95 < 1.2
BuildRequires: python3-flake8, python3-pytest, python3-pylint, python3-devel, golang
Conflicts: pgespresso93 < 1.2, pgespresso94 < 1.2, pgespresso95 < 1.2
BuildRequires: golang
BuildRequires: python3-devel
BuildRequires: python3-flake8
BuildRequires: python3-pylint
BuildRequires: python3-pytest

%undefine _missing_build_ids_terminate_build
%define debug_package %{nil}
Expand Down

0 comments on commit 226aba1

Please sign in to comment.