NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit2fb42ec

v.shepard

committed

Merge master

2 parents86ef2fb +ceb1ee9 commit2fb42ecCopy full SHA for 2fb42ec

File tree

17 files changed

+165

-141

lines changed

17 files changed

+165

-141

lines changed

`‎.travis.yml`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-sudo:required`
	`1`	`+os:linux`
	`2`	`+`
	`3`	`+dist:bionic`
`2`	`4`
`3`	`5`	`language:python`
`4`	`6`
`@@ -18,14 +20,15 @@ notifications:`
`18`	`20`	`on_failure:always`
`19`	`21`
`20`	`22`	`env:`
`21`		`- -PYTHON_VERSION=2 PG_VERSION=10`
`22`		`- -PYTHON_VERSION=2 PG_VERSION=9.6`
`23`		`- -PYTHON_VERSION=2 PG_VERSION=9.5`
`24`		`- -PYTHON_VERSION=2 PG_VERSION=9.4`
	`23`	`+ -PYTHON_VERSION=3 PG_VERSION=14`
`25`	`24`	`-PYTHON_VERSION=3 PG_VERSION=13`
`26`	`25`	`-PYTHON_VERSION=3 PG_VERSION=12`
`27`	`26`	`-PYTHON_VERSION=3 PG_VERSION=11`
`28`	`27`	`-PYTHON_VERSION=3 PG_VERSION=10`
`29`		`- -PYTHON_VERSION=3 PG_VERSION=9.6`
`30`		`- -PYTHON_VERSION=3 PG_VERSION=9.5`
`31`		`- -PYTHON_VERSION=3 PG_VERSION=9.4`
	`28`	`+# - PYTHON_VERSION=3 PG_VERSION=9.6`
	`29`	`+# - PYTHON_VERSION=3 PG_VERSION=9.5`
	`30`	`+# - PYTHON_VERSION=3 PG_VERSION=9.4`
	`31`	`+# - PYTHON_VERSION=2 PG_VERSION=10`
	`32`	`+# - PYTHON_VERSION=2 PG_VERSION=9.6`
	`33`	`+# - PYTHON_VERSION=2 PG_VERSION=9.5`
	`34`	`+# - PYTHON_VERSION=2 PG_VERSION=9.4`

`‎README.md`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Build Status](https://travis-ci.org/postgrespro/testgres.svg?branch=master)](https://travis-ci.org/postgrespro/testgres)`
	`1`	`+[![Build Status](https://travis-ci.com/postgrespro/testgres.svg?branch=master)](https://app.travis-ci.com/github/postgrespro/testgres/branches)`
`2`	`2`	`[![codecov](https://codecov.io/gh/postgrespro/testgres/branch/master/graph/badge.svg)](https://codecov.io/gh/postgrespro/testgres)`
`3`	`3`	`[![PyPI version](https://badge.fury.io/py/testgres.svg)](https://badge.fury.io/py/testgres)`
`4`	`4`

`‎docs/README.md`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#Building the documentation`
`2`	`2`
`3`		-Make sure you have`Sphinx`and`sphinxcontrib-napoleon` packages installed:
	`3`	+Make sure you have`Sphinx`package installed:
`4`	`4`
`5`	`5`	```
`6`		`-pip install Sphinx sphinxcontrib-napoleon`
	`6`	`+pip install Sphinx`
`7`	`7`	```
`8`	`8`
`9`	`9`	`Then just run`
`@@ -12,4 +12,4 @@ Then just run`
`12`	`12`	`make html`
`13`	`13`	```
`14`	`14`
`15`		-Documentation will be built in`build/html` directory. Other output formats are also available; run`make` without arguments to see the options.
	`15`	+Documentation will be built in`build/html` directory. Other output formats are also available; run`make` without arguments to see the options.

`‎docs/source/conf.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`# -- Project information -----------------------------------------------------`
`20`	`20`
`21`	`21`	`project=u'testgres'`
`22`		`-copyright=u'2016-2018, Postgres Professional'`
	`22`	`+copyright=u'2016-2022, Postgres Professional'`
`23`	`23`	`author=u'Postgres Professional'`
`24`	`24`
`25`	`25`	`# The short X.Y version`
`@@ -36,7 +36,7 @@`
`36`	`36`	`# Add any Sphinx extension module names here, as strings. They can be`
`37`	`37`	`# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom`
`38`	`38`	`# ones.`
`39`		`-extensions= ['sphinx.ext.autodoc','sphinxcontrib.napoleon']`
	`39`	`+extensions= ['sphinx.ext.autodoc','sphinx.ext.napoleon']`
`40`	`40`
`41`	`41`	`# Add any paths that contain templates here, relative to this directory.`
`42`	`42`	`templates_path= ['_templates']`

`‎run_tests.sh`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`
`3`		`-# Copyright (c) 2017, Postgres Professional`
	`3`	`+# Copyright (c) 2017-2022 Postgres Professional`
`4`	`4`
`5`	`5`	`set -eux`
`6`	`6`
`@@ -22,7 +22,7 @@ export VIRTUAL_ENV_DISABLE_PROMPT=1`
`22`	`22`	`source$VENV_PATH/bin/activate`
`23`	`23`
`24`	`24`	`# install utilities`
`25`		`-$PIP install coverage flake8 psutil Sphinx sphinxcontrib-napoleon`
	`25`	`+$PIP install coverage flake8 psutil Sphinx`
`26`	`26`
`27`	`27`	`# install testgres' dependencies`
`28`	`28`	`export PYTHONPATH=$(pwd)`

`‎testgres/init.py`

Lines changed: 29 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,23 @@`
`15`	`15`	`ProgrammingError, \`
`16`	`16`	`OperationalError`
`17`	`17`
`18`		`-from .exceptionsimport*`
`19`		`-from .enumsimport*`
	`18`	`+from .exceptionsimport \`
	`19`	`+TestgresException, \`
	`20`	`+ExecUtilException, \`
	`21`	`+QueryException, \`
	`22`	`+TimeoutException, \`
	`23`	`+CatchUpException, \`
	`24`	`+StartNodeException, \`
	`25`	`+InitNodeException, \`
	`26`	`+BackupException`
	`27`	`+`
	`28`	`+from .enumsimport \`
	`29`	`+XLogMethod, \`
	`30`	`+IsolationLevel, \`
	`31`	`+NodeStatus, \`
	`32`	`+ProcessType, \`
	`33`	`+DumpFormat`
	`34`	`+`
`20`	`35`	`from .nodeimportPostgresNode`
`21`	`36`
`22`	`37`	`from .utilsimport \`
`@@ -30,3 +45,15 @@`
`30`	`45`	`from .standbyimport \`
`31`	`46`	`First, \`
`32`	`47`	`Any`
	`48`	`+`
	`49`	`+__all__= [`
	`50`	`+"get_new_node",`
	`51`	`+"NodeBackup",`
	`52`	`+"TestgresConfig","configure_testgres","scoped_config","push_config","pop_config",`
	`53`	`+"NodeConnection","DatabaseError","InternalError","ProgrammingError","OperationalError",`
	`54`	`+"TestgresException","ExecUtilException","QueryException","TimeoutException","CatchUpException","StartNodeException","InitNodeException","BackupException",`
	`55`	`+"XLogMethod","IsolationLevel","NodeStatus","ProcessType","DumpFormat",`
	`56`	`+"PostgresNode",`
	`57`	`+"reserve_port","release_port","bound_ports","get_bin_path","get_pg_config","get_pg_version",`
	`58`	`+"First","Any",`
	`59`	`+]`

`‎testgres/backup.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ class NodeBackup(object):`
`29`	`29`	`"""`
`30`	`30`	`Smart object responsible for backups`
`31`	`31`	`"""`
`32`		`-`
`33`	`32`	`@property`
`34`	`33`	`deflog_file(self):`
`35`	`34`	`returnos.path.join(self.base_dir,BACKUP_LOG_FILE)`

`‎testgres/cache.py`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,8 @@`
`24`	`24`	`defcached_initdb(data_dir,logfile=None,hostname='localhost',ssh_key=None,params=None):`
`25`	`25`	`"""`
`26`	`26`	`Perform initdb or use cached node files.`
`27`		`-`
`28`		`- DDD return`
`29`	`27`	`"""`
`30`		`-`
	`28`	`+`
`31`	`29`	`defcall_initdb(initdb_dir,log=None):`
`32`	`30`	`try:`
`33`	`31`	`_params= [get_bin_path("initdb"),"-D",initdb_dir,"-N"]`

`‎testgres/config.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ class GlobalConfig(object):`
`43`	`43`
`44`	`44`	`_cached_initdb_dir=None`
`45`	`45`	`""" underlying class attribute for cached_initdb_dir property """`
`46`		`-`
`47`	`46`	`@property`
`48`	`47`	`defcached_initdb_dir(self):`
`49`	`48`	`""" path to a temp directory for cached initdb. """`

`‎testgres/connection.py`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ class NodeConnection(object):`
`28`	`28`	`"""`
`29`	`29`	`Transaction wrapper returned by Node`
`30`	`30`	`"""`
`31`		`-`
`32`	`31`	`def__init__(self,`
`33`	`32`	`node,`
`34`	`33`	`dbname=None,`
`@@ -42,12 +41,11 @@ def __init__(self,`
`42`	`41`
`43`	`42`	`self._node=node`
`44`	`43`
`45`		`-self._connection=pglib.connect(`
`46`		`-database=dbname,`
`47`		`-user=username,`
`48`		`-password=password,`
`49`		`-host=node.host,`
`50`		`-port=node.port)`
	`44`	`+self._connection=pglib.connect(database=dbname,`
	`45`	`+user=username,`
	`46`	`+password=password,`
	`47`	`+host=node.host,`
	`48`	`+port=node.port)`
`51`	`49`
`52`	`50`	`self._connection.autocommit=autocommit`
`53`	`51`	`self._cursor=self.connection.cursor()`

`‎testgres/decorators.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ def method_decorator(decorator):`
`50`	`50`	`"""`
`51`	`51`	`Convert a function decorator into a method decorator.`
`52`	`52`	`"""`
`53`		`-`
`54`	`53`	`def_dec(func):`
`55`	`54`	`def_wrapper(self,args,*kwargs):`
`56`	`55`	`@decorator`

`‎testgres/logger.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ class TestgresLogger(threading.Thread):`
`24`	`24`	`"""`
`25`	`25`	`Helper class to implement reading from log files.`
`26`	`26`	`"""`
`27`		`-`
`28`	`27`	`def__init__(self,node_name,log_file_name):`
`29`	`28`	`threading.Thread.__init__(self)`
`30`	`29`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2fb42ec

File tree

17 files changed

17 files changed

`‎.travis.yml`

`‎README.md`

`‎docs/README.md`

`‎docs/source/conf.py`

`‎run_tests.sh`

`‎testgres/init.py`

`‎testgres/backup.py`

`‎testgres/cache.py`

`‎testgres/config.py`

`‎testgres/connection.py`

`‎testgres/decorators.py`

`‎testgres/logger.py`

0 commit comments