Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pifpaf for openSUSE:Factory checked in at 2021-06-19 23:03:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pifpaf (Old) and /work/SRC/openSUSE:Factory/.python-pifpaf.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pifpaf" Sat Jun 19 23:03:07 2021 rev:11 rq:900661 version:3.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pifpaf/python-pifpaf.changes 2020-03-24 22:38:29.249268599 +0100 +++ /work/SRC/openSUSE:Factory/.python-pifpaf.new.2625/python-pifpaf.changes 2021-06-19 23:03:38.135726388 +0200 @@ -1,0 +2,33 @@ +Thu Jun 17 21:13:02 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 3.1.5: + * fix: do not block when process exits not correctly + * fix: typo in stdout handling + * fix: typo in stdout handling + * fix: remove universal tag since Python 2 is not supported anymore + * fix: close devnull + * fix: do not leave zombie process + * Fix broken Ceph config formatting + * chore: compress image + * Add Ceph Nautilus and later support + * ceph: set limit for max open fds + * Add TLS\_ENABLED environment var for memcached + * Add Python 3.7 and 3.8 to classifier + * Fix import ordering + * Remove Python 2.x support and six + * Fix zookeeper driver + * Disable aodh for py27 too + * Tidy up tox.ini and update kafka + * Fix tests and add recent Python releases + * Try to fix PEP8 again + * Various fixes + * Add a driver for httpbin + * Update README.rst : Fix typo access + * fix: log info, not error when command is ready + * Fixes flake8 warning and adds missing comma + * Apply suggestions from code review + * Add TLS params to memcached + * Add ceph-manager support + * Add Ceph config options for small disks + +------------------------------------------------------------------- Old: ---- pifpaf-2.4.0.tar.gz New: ---- pifpaf-3.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pifpaf.spec ++++++ --- /var/tmp/diff_new_pack.V5tj4i/_old 2021-06-19 23:03:38.591727091 +0200 +++ /var/tmp/diff_new_pack.V5tj4i/_new 2021-06-19 23:03:38.591727091 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pifpaf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pifpaf -Version: 2.4.0 +Version: 3.1.5 Release: 0 Summary: Suite of tools and fixtures to manage daemons for testing License: Apache-2.0 @@ -41,7 +41,7 @@ Requires: python-xattr BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch %python_subpackages ++++++ pifpaf-2.4.0.tar.gz -> pifpaf-3.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/.travis.yml new/pifpaf-3.1.5/.travis.yml --- old/pifpaf-2.4.0/.travis.yml 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/.travis.yml 2020-08-20 12:48:44.000000000 +0200 @@ -1,30 +1,29 @@ language: python -dist: trusty +dist: bionic sudo: required cache: - pip python: - - 2.7 - 3.6 + - 3.7 + - 3.8 before_install: # Always redownload tarball - find ~/.cache/pip -name '*.dev*' -delete - - wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add - - - echo deb https://download.ceph.com/debian-luminous/ trusty main | sudo tee /etc/apt/sources.list.d/ceph.list - sudo apt-get -qq update - - sudo apt-get purge -y mysql-server-5.6 mysql-server-core-5.6 mysql-client-core-5.6 mysql-client-5.6 postgresql* libpq* + - sudo apt-get purge -y postgresql* libpq* - sudo rm -rf /var/lib/mysql # FIXME(sileht): readd rabbitmq-server when https://github.com/travis-ci/travis-cookbooks/issues/964 and https://github.com/travis-ci/travis-ci/issues/8906 are fixed - - sudo apt-get install -y mongodb-server mysql-server-5.5 redis-server zookeeper mongodb couchdb couchdb-bin nodejs npm ceph librados-dev python-dev gcc liberasurecode-dev liberasurecode1 postgresql libpq-dev + - sudo apt-get install -y mongodb-server mysql-server-5.7 redis-server zookeeper mongodb couchdb nodejs npm ceph librados-dev python-dev gcc liberasurecode-dev liberasurecode1 postgresql libpq-dev # - sudo gem install fakes3 # NOTE(sileht): fakes3 looks not installed correctly # - sudo npm install s3rver -g - wget https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb - sudo dpkg -i influxdb_0.13.0_amd64.deb # zkEnv.sh can't be overriden with the deb version of zookeeper, this workaround that - sudo chmod 777 /var/log/zookeeper - - wget https://archive.apache.org/dist/kafka/1.0.2/kafka_2.12-1.0.2.tgz -O /opt/kafka.tar.gz + - wget https://archive.apache.org/dist/kafka/2.6.0/kafka_2.12-2.6.0.tgz -O /opt/kafka.tar.gz - tar -xzf /opt/kafka.tar.gz -C /opt - - ln -s /opt/kafka_2.12-1.0.2 /opt/kafka + - ln -s /opt/kafka_2.12-2.6.0 /opt/kafka install: # The install requirements in travis virtualenv that will be cached - pip install tox-travis .[test,ceph] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/AUTHORS new/pifpaf-3.1.5/AUTHORS --- old/pifpaf-2.4.0/AUTHORS 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/AUTHORS 2021-02-01 18:12:43.000000000 +0100 @@ -1,9 +1,20 @@ Andy Smith <ansm...@redhat.com> +Davanum Srinivas <dava...@gmail.com> David Douard <david.dou...@sdfa3.org> +Elancheran Subramanian <esubraman...@godaddy.com> +Felix Yan <felixonm...@archlinux.org> +Joshua Harlow <harlo...@gmail.com> Julien Danjou <jul...@danjou.info> Kenneth Giusti <kgiu...@redhat.com> Matt Wheeler <m...@funkyhat.org> +Mehdi ABAAKOUK <sil...@sileht.net> Mehdi Abaakouk <sil...@sileht.net> +Mois??s Guimar??es de Medeiros <guimar...@pm.me> +Mois??s Guimar??es de Medeiros <moisesguimar...@users.noreply.github.com> +Omar Trigui <omar.trigui...@gmail.com> +R??my HUBSCHER <rhubsc...@mozilla.com> +Sam Morrison <sorri...@gmail.com> +Tobias Urdin <tobias.ur...@binero.se> ajssmith <ansm...@redhat.com> gord chung <g...@live.ca> mergify[bot] <mergify[bot]@users.noreply.github.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/ChangeLog new/pifpaf-3.1.5/ChangeLog --- old/pifpaf-2.4.0/ChangeLog 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/ChangeLog 2021-02-01 18:12:43.000000000 +0100 @@ -1,6 +1,70 @@ CHANGES ======= +3.1.5 +----- + +* fix: do not block when process exits not correctly + +3.1.4 +----- + +* fix: typo in stdout handling + +3.1.3 +----- + +* fix: typo in stdout handling +* fix: remove universal tag since Python 2 is not supported anymore + +3.1.2 +----- + +* fix: close devnull +* fix: do not leave zombie process + +3.1.1 +----- + +* Fix broken Ceph config formatting +* chore: compress image + +3.1.0 +----- + +* Add Ceph Nautilus and later support +* ceph: set limit for max open fds +* Add TLS\_ENABLED environment var for memcached + +3.0.0 +----- + +* Add Python 3.7 and 3.8 to classifier +* Fix import ordering +* Remove Python 2.x support and six +* Fix zookeeper driver +* Disable aodh for py27 too +* Tidy up tox.ini and update kafka +* Fix tests and add recent Python releases + +2.6.0 +----- + +* Try to fix PEP8 again +* Various fixes +* Add a driver for httpbin +* Update README.rst : Fix typo access +* fix: log info, not error when command is ready + +2.5.0 +----- + +* Fixes flake8 warning and adds missing comma +* Apply suggestions from code review +* Add TLS params to memcached +* Add ceph-manager support +* Add Ceph config options for small disks + 2.4.0 ----- @@ -162,3 +226,588 @@ * Handle terminate lookup error * tests: call setUp to init cleanups * postgresql: do not call \_exec in \_\_init\_\_ +* Install mock for tests +* Remove not used oslotest dependency + +1.10.1 +------ + +* Fix process cleanup + +1.10.0 +------ + +* Ensure pifpaf kill all processes +* Fix compatibility with Redis 4.0 + +1.9.2 +----- + +* Revert "Ensure pifpaf kill all processes" + +1.9.1 +----- + +* Ensure pifpaf kill all processes + +1.9.0 +----- + +* Add a new driver for Vault + +1.8.1 +----- + +* Fix logging in \_kill + +1.8.0 +----- + +* memcached: don't read stdout +* swift: fix configuration typo + +1.7.0 +----- + +* swiftclient default auth to 2.0 +* swift: start a dedicated memcached + +1.6.0 +----- + +* Disable elastic search tests +* Ensure xattr are available for swift +* swift: check we can upload file +* Use subprocess to kill process + +1.5.2 +----- + +* Fix decorator order + +1.5.1 +----- + +* Simplify retry logic +* Fix retry error catching + +1.5.0 +----- + +* Wait 10 seconds processes to end, them kill them + +1.4.11 +------ + +* Revert "gnocchi: use --reuse-port" + +1.4.10 +------ + +* gnocchi: use --reuse-port +* Do not use concurrency to run tests +* Fix conflicting port in Gnocchi test +* Use another port for test\_gnocchi\_with\_redis\_coordinator +* Fix pep8 error + +1.4.9 +----- + +* Revert "gnocchi: remove deprecated uwsgi option die-on-term" + +1.4.8 +----- + +* gnocchi: ensure client don't use keepalive + +1.4.7 +----- + +* gnocchi: add --no-orphans to uwsgi +* gnocchi: remove deprecated uwsgi option die-on-term + +1.4.6 +----- + +* gnocchi: only run 1 metricd + +1.4.5 +----- + +* gnocchi: add missing backslash in re + +1.4.4 +----- + +* gnocchi: chdir to tempdir in uwsgi + +1.4.3 +----- + +* Fix uwsgi wait for line + +1.4.2 +----- + +* Revert "Make uwsgi loading module within a virtualenv" +* gnocchi: remove --plugin options + +1.4.1 +----- + +* Make uwsgi loading module within a virtualenv +* Remove Python 3.4 support + +1.4.0 +----- + +* Switch to uwsgi to run gnocchi-api +* elasticsearch: fix new versions option passing +* Add npm to Travis install + +1.3.1 +----- + +* Fix logging being done on stdout instead of stderr + +1.3.0 +----- + +* Stop using stevedore to load plugins + +1.2.0 +----- + +* gnocchi: set verbose in config file to be sure info are printed +* Revert "gnocchi: pass --verbose to daemon to be sure they're in INFO mode" +* gnocchi: pass --verbose to daemon to be sure they're in INFO mode +* Use daiquiri to setup logging +* Fix error reporting in Python 3 +* Move Ceph requirements to an extra entry +* Don't install xattr on win32 systems +* Revert "aodh: use database-url for gnocchi indexer" +* Set the actual dist for Travis +* aodh: use database-url for gnocchi indexer + +1.1.0 +----- + +* aodh: add database-url + +1.0.1 +----- + +* fix DEFAULT\_PORT\_COORDINATOR variable name + +1.0.0 +----- + +* gnocchi: allow to use redis coordinator +* gnocchi: remove legacy resource types support + +0.27.1 +------ + +* etcd: fix http url + +0.27.0 +------ + +* gnocchi: enable debug mode when --debug is passed to pifpaf +* Pass debug option to drivers + +0.26.0 +------ + +* gnocchi: allow to use redis as storage +* gnocchi: switch to basic auth as noauth is deprecated + +0.25.1 +------ + +* fix s3/swift with username/password are None + +0.25.0 +------ + +* Add link to Swift in README +* gnocchi: unquote credentials for s3 backend +* Allow Swift as Gnocchi storage backend +* Add swift driver +* Fix tox-travis deprecated warning +* fix npm in travis + +0.24.1 +------ + +* gnocchi: Set statd old vars + +0.24.0 +------ + +* cli: fully segment all environ vars +* gnocchi: Add support to s3 backend +* tests: Fix a python3 bug +* travis: remove tarball from cache +* gnocchi: Reduce the metricd delays +* tests: fix env variable parsing +* Set a proper PS1 when invoked via eval +* Clean variables on exit +* gnocchi: stop setting old statsd conf var + +0.23.0 +------ + +* aodh: auth with basic against Gnocchi +* Revert "gnocchi: set auth\_mode = noauth" + +0.22.0 +------ + +* gnocchi: set auth\_mode = noauth + +0.21.0 +------ + +* Add support for Python 3.6 +* aodh: fix authentication disabling with newer Aodh + +0.20.0 +------ + +* Revert "mysql: fix timezone" + +0.19.0 +------ + +* mysql: fix timezone + +0.18.1 +------ + +* Gnocchi >= 3.1 will not ship any config by default + +0.18.0 +------ + +* rabbit: use process group +* rabbit: put password for all hosts in the url +* Fix mysql gate +* travis: fix mysql install + +0.17.0 +------ + +* Implements the Kafka driver + +0.16.0 +------ + +* correctly decode application stdout + +0.15.1 +------ + +* doc: rabbitmq cluster is supported +* gnocchi: fix statds waiting line for gnocchi <3.0 + +0.15.0 +------ + +* tests: allow to find zookeeper bins +* tests: fix s3rver tests +* tests: Don't run them in // +* ceph: don't use /dev/shm +* tests: Capture logging and print it on failure +* rabbitmq: fix waiting line +* ceph: last jewel point release have lowered object max len +* Revert "Partial revert for debug output" +* Make travis-ci happy again + +0.14.0 +------ + +* Bump hacking to 0.12 +* Update influxdb.py +* gnocchi: start statsd daemon +* ceph: use shm and try to not really write data + +0.13.0 +------ + +* gnocchi: allow to run with an existing storage URL +* gnocchi: allow to run with an existing indexer URL +* ceph: increase rados object name limit for ext4 fs +* Fix a typo in README: gobal -> global +* Add MongoDB to README +* Set storage engine to mmapv1 when wiredtiger is not present + +0.12.0 +------ + +* Add support for s3rver + +0.11.1 +------ + +* fakes3: export HTTP url + +0.11.0 +------ + +* Mention CouchDB support in README +* Add support for CouchDB + +0.10.5 +------ + +* gnocchi: Catch a working line for metricd +* Fix virtualenv handling + +0.10.4 +------ + +* Revert "mysql: add --basedir=/usr" + +0.10.3 +------ + +* mysql: fix typo +* tests: fix mysqld database name +* mysql: use pifpaf as the name of the database +* mysql: add --basedir=/usr + +0.10.2 +------ + +* mysql: use mysql\_install\_db if mysqld --initialize-insecure fails + +0.10.1 +------ + +* mysql: add --no-defaults and --tmpdir to mysqld + +0.10.0 +------ + +* Indicate we support etcd clustering +* Support etcdctl +* etcd: add clustering support +* etcd: change default port to IANA and allow to change peer port +* Print PID of process when logging output + +0.9.0 +----- + +* Support for Aodh 3 + +0.8.2 +----- + +* Better reporting on wait\_for\_line + +0.8.1 +----- + +* Print actual output when we don't find the expected line + +0.8.0 +----- + +* tests: fix a port collision +* tests: fix Popen usage with Python 3 +* Fix Python 3 +* Fix pep8 errors +* influxdb: fix wait\_for\_line with re +* ceph: fix output matching with re +* Gnocchi: bugfix on wait\_for\_line on API +* gnocchi: fix URL in waiting +* keystone: disable tests +* zookeeper: wait for ZooKeeper to start before returning +* Fix Redis driver with Redis 3.2.1 +* drivers: support regexp for wait\_for\_line + +0.7.0 +----- + +* gnocchi: support latest master/2.2 changes on gnocchi-api + +0.6.0 +----- + +* aodh: run aodh-evaluator + +0.5.0 +----- + +* Install software via tox +* keystone: simplify wait for line for admin +* drivers: translate OSError to a more readable error +* keystone: simplify wait\_for\_line +* keystone: fix pep8 error in test +* Add a Keystone driver +* Better debugging on errors +* Add a pifpaf\_stop function to stop pifpaf +* Fix typo in InfluxDB driver + +0.4.0 +----- + +* influxdb: fix Python >= 3.0 & < 3.5 +* travis: Remove missing etcd from install +* travis: install InfluxDB with wget +* Add PyPI version badge + +0.3.0 +----- + +* postgresql: allow to configure host, set to none by default +* aodh: set AODH\_ENDPOINT for aodh client + +0.2.1 +----- + +* gnocchi: fix a regression on variable names + +0.2.0 +----- + +* mysql: add URL as an attribute +* Add consul daemon support +* Rework exceptions formatting using logging +* drivers: raise a RuntimeError rather than an AssertionError +* Report a correct error when unable to start a command + +0.1.0 +----- + +* Partial revert for debug output +* Export chain of connection strings in PIFPAF\_URLS +* Remove spurious line in README +* Allow to change environment variable prefix + +0.0.11 +------ + +* mongodb: add database name in URL + +0.0.10 +------ + +* The pbr name is home-page rather than url +* check into virtualenv first for configuration file +* Improve exception handling + +0.0.9 +----- + +* ceph: fix config for last jewel +* Fix typo +* Fix a few typos in README +* Add some docs +* Add support for fakes3 + +0.0.8 +----- + +* Enable testing of Gnocchi legacy +* postgres: replace template1 by postgres + +0.0.7 +----- + +* Export Gnocchi client variables +* Make RabbitMQ tests work on OS X +* rabbitmq: Allow to use rabbitmqctl and kill node +* ceph: git url have moved +* Add RabbitMQ in README +* Enable mongodb tests +* Add rabbitmq drivers +* Enhance travis build +* Allow to print debug during tests +* Fix pep8 error + +0.0.6 +----- + +* aodh: add support for gnocchi --create-legacy-resource-types +* gnocchi: support --create-legacy-resource-types +* mysql: add /usr/libexec to PATH + +0.0.5 +----- + +* Add ceph driver +* Fix test\_cli when memcached is absent +* Fix travis + +0.0.4 +----- + +* Export all variables even in eval mode +* aodh: randomize Gnocchi user/project and export them +* Don't call cleanup twice if \_setUp fail + +0.0.3 +----- + +* Fix Aodh and Gnocchi ports + +0.0.2 +----- + +* Provide better debug info + +0.0.1 +----- + +* No notify for now +* Fix return value on command failure +* Do not use shell mode in command +* Fix return code +* Run tox in verbose mode +* Aodh 2.0 only +* Install gnocchi and aodh as part as tox for testing +* Do not use feature yet on Aodh +* Install aodh on Travis +* Remove unused variable +* Add Aodh support +* Add Gnocchi entry +* Look for config files in ~/.local/etc +* Install the right flavor for Gnocchi +* Add TRAVIS in passenv +* Set TRAVIS=1 +* Set TRAVIS=1 +* Install Gnocchi for testing in travis +* Gnocchi support +* Fix ES condition +* Document eval based usage +* Fix py3 +* Fix test\_cli on Py3 +* Disable pypy +* Fix test\_cli on some Python +* Remove broken ES version check +* Skip ES on Travis +* Fix test\_eval +* Fix pep8 +* Fix var export format +* travis: install ES +* Print ES version in Travis +* elasticsearch: disable tests on travis +* Fix bytes format on Python 3.4 +* tests: fix putenv +* tests: set PATH for drivers tests +* elasticsearch: fix path +* elasticsearch: include path for Ubuntu +* redis: make stdin bytes +* Fix pep8 +* Check for executables +* Kill pifpaf after test +* Revert "travis: use apt-get install since some packages are blacklisted by apt addons" +* travis: use apt-get install since some packages are blacklisted by apt addons +* Install etcd +* Install missing packages for Travis +* Add os-testr for subunit-trace +* Add build status +* Add Travis +* Import diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/PKG-INFO new/pifpaf-3.1.5/PKG-INFO --- old/pifpaf-2.4.0/PKG-INFO 2020-01-09 11:14:44.000000000 +0100 +++ new/pifpaf-3.1.5/PKG-INFO 2021-02-01 18:12:44.135843000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pifpaf -Version: 2.4.0 +Version: 3.1.5 Summary: Suite of tools and fixtures to manage daemons for testing Home-page: https://github.com/jd/pifpaf Author: Julien Danjou @@ -50,6 +50,7 @@ * `MongoDB`_ * `OpenStack Swift`_ * `Vault`_ + * `HttpBin`_ .. _Consul: https://www.consul.io/ .. _PostgreSQL: http://postgresql.org @@ -71,12 +72,13 @@ .. _MongoDB: https://www.mongodb.com .. _OpenStack Swift: https://docs.openstack.org/developer/swift/ .. _Vault: https://www.vaultproject.io/ + .. _HttpBin: https://httpbin.org/ Usage ===== To use Pifpaf, simply call the `pifpaf run $daemon <command>` program that you need. It will setup the temporary environment and export a few environment - variable for you to accesss it:: + variable for you to access it:: $ pifpaf run postgresql psql template1 Expanded display is used automatically. @@ -174,10 +176,10 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Topic :: Software Development :: Testing Provides-Extra: test Provides-Extra: gnocchi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/README.rst new/pifpaf-3.1.5/README.rst --- old/pifpaf-2.4.0/README.rst 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/README.rst 2020-08-07 11:20:53.000000000 +0200 @@ -42,6 +42,7 @@ * `MongoDB`_ * `OpenStack Swift`_ * `Vault`_ +* `HttpBin`_ .. _Consul: https://www.consul.io/ .. _PostgreSQL: http://postgresql.org @@ -63,12 +64,13 @@ .. _MongoDB: https://www.mongodb.com .. _OpenStack Swift: https://docs.openstack.org/developer/swift/ .. _Vault: https://www.vaultproject.io/ +.. _HttpBin: https://httpbin.org/ Usage ===== To use Pifpaf, simply call the `pifpaf run $daemon <command>` program that you need. It will setup the temporary environment and export a few environment -variable for you to accesss it:: +variable for you to access it:: $ pifpaf run postgresql psql template1 Expanded display is used automatically. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/__main__.py new/pifpaf-3.1.5/pifpaf/__main__.py --- old/pifpaf-2.4.0/pifpaf/__main__.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/__main__.py 2020-08-20 12:48:44.000000000 +0200 @@ -32,8 +32,6 @@ import psutil -import six - from pifpaf import util LOG = daiquiri.getLogger("pifpaf") @@ -198,8 +196,8 @@ driver.cleanUp() raise RuntimeError("Unable to start command: %s" % " ".join(command)) - LOG.error( - "Command `%s` (pid %s) is ready:", + LOG.info( + "Command `%s` (pid %s) is ready", " ".join(command), c.pid ) @@ -267,7 +265,7 @@ "PS1": "(pifpaf/" + daemon + ") " + os.getenv("PS1", ""), }) - for k, v in six.iteritems(driver.env): + for k, v in driver.env.items(): print("export %s=\"%s\";" % (k, v)) print("%(prefix_lower)s_stop () { " "if test -z \"$%(prefix)s_PID\"; then " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/__init__.py new/pifpaf-3.1.5/pifpaf/drivers/__init__.py --- old/pifpaf-2.4.0/pifpaf/drivers/__init__.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/__init__.py 2021-02-01 18:12:19.000000000 +0100 @@ -29,8 +29,6 @@ import psutil -import six - from pifpaf import util @@ -39,21 +37,9 @@ except ImportError: xattr = None -if six.PY3: - fsdecode = os.fsdecode -else: - def fsdecode(s): - if isinstance(s, unicode): # noqa - return s - return s.decode(sys.getfilesystemencoding()) - LOG = logging.getLogger(__name__) -if six.PY2: - # This is defined only on Python 3 - ProcessLookupError = None # noqa - class Driver(fixtures.Fixture): def __init__(self, env_prefix="PIFPAF", templatedir=".", debug=False, @@ -145,7 +131,7 @@ @staticmethod def _log_output(appname, pid, data): - data = fsdecode(data) + data = os.fsdecode(data) LOG.debug("%s[%d] output: %s", appname, pid, data.rstrip()) def _exec(self, command, stdout=False, ignore_failure=False, @@ -162,14 +148,12 @@ if stdout or wait_for_line or debug: stdout_fd = subprocess.PIPE else: - # TODO(jd) Need to close at some point - stdout_fd = open(os.devnull, 'w') + stdout_fd = subprocess.DEVNULL if stdin: stdin_fd = subprocess.PIPE else: - # TODO(jd) Need to close at some point - stdin_fd = open(os.devnull, 'r') + stdin_fd = subprocess.DEVNULL if path or env: complete_env = dict(os.environ) @@ -215,7 +199,7 @@ "Program did not print: `%s'\nOutput: %s" % (wait_for_line, b"".join(lines))) break - decoded_line = fsdecode(line) + decoded_line = os.fsdecode(line) if wait_for_line and re.search(wait_for_line, decoded_line): @@ -237,7 +221,7 @@ line = c.stdout.readline() self._log_output(app, c.pid, line) lines.append(line) - if line and re.search(forbidden_output, fsdecode(line)): + if line and re.search(forbidden_output, os.fsdecode(line)): raise RuntimeError( "Program print a forbidden line: `%s'\nOutput: %s" % (forbidden_output, b"".join(lines))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/ceph.py new/pifpaf-3.1.5/pifpaf/drivers/ceph.py --- old/pifpaf-2.4.0/pifpaf/drivers/ceph.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/ceph.py 2020-12-09 16:35:33.000000000 +0100 @@ -65,6 +65,14 @@ mon_allow_pool_delete = true """ + # Enable msgrv2 protocol if Nautilus or later. + if version >= pkg_resources.parse_version("14.0.0"): + msgrv2_extra = """ +mon_host = v2:127.0.0.1:%(port)d/0 +""" % dict(port=self.port) + else: + msgrv2_extra = "" + # FIXME(sileht): check availible space on /dev/shm # if os.path.exists("/dev/shm") and os.access('/dev/shm', os.W_OK): # journal_path = "/dev/shm/$cluster-$id-journal" @@ -74,6 +82,7 @@ with open(conffile, "w") as f: f.write("""[global] fsid = %(fsid)s +%(msgrv2_extra)s # no auth for now auth cluster required = none @@ -88,6 +97,7 @@ ## some default path change run dir = %(tempdir)s pid file = %(tempdir)s/$type.$id.pid +max open files = 1024 admin socket = %(tempdir)s/$cluster-$name.asok mon data = %(tempdir)s/mon/$cluster-$id osd data = %(tempdir)s/osd/$cluster-$id @@ -115,14 +125,20 @@ # run as file owner setuser match path = %(tempdir)s/$type/$cluster-$id +[mon] +mon pg warn min per osd = 0 +mon data avail warn = 2 +mon data avail crit = 1 + [mon.a] host = localhost mon addr = 127.0.0.1:%(port)d -""" % dict(fsid=fsid, tempdir=self.tempdir, port=self.port, - journal_path=journal_path, extra=extra)) # noqa +""" % dict(fsid=fsid, msgrv2_extra=msgrv2_extra, tempdir=self.tempdir, + port=self.port, journal_path=journal_path, extra=extra)) # noqa ceph_opts = ["ceph", "-c", conffile] mon_opts = ["ceph-mon", "-c", conffile, "--id", "a", "-d"] + mgr_opts = ["ceph-mgr", "-c", conffile, "-d"] osd_opts = ["ceph-osd", "-c", conffile, "--id", "0", "-d", "-m", "127.0.0.1:%d" % self.port] @@ -133,6 +149,10 @@ mon_opts, wait_for_line=r"mon.a@0\(leader\).mds e1 print_map") + # Start manager + if version >= pkg_resources.parse_version("12.0.0"): + self._exec(mgr_opts, wait_for_line="(mgr send_beacon active|waiting for OSDs)") + # Create and start OSD self._exec(ceph_opts + ["osd", "create"]) self._exec(ceph_opts + ["osd", "crush", "add", "osd.0", "1", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/gnocchi.py new/pifpaf-3.1.5/pifpaf/drivers/gnocchi.py --- old/pifpaf-2.4.0/pifpaf/drivers/gnocchi.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/gnocchi.py 2020-08-20 12:48:44.000000000 +0200 @@ -13,14 +13,13 @@ import logging import os import shutil +import urllib.parse import uuid from distutils import spawn from distutils import version import click -import six.moves.urllib.parse as urlparse - from pifpaf import drivers from pifpaf.drivers import postgresql from pifpaf.drivers import redis @@ -103,15 +102,15 @@ conffile = os.path.join(self.tempdir, "gnocchi.conf") - storage_parsed = urlparse.urlparse(self.storage_url) + storage_parsed = urllib.parse.urlparse(self.storage_url) storage_driver = storage_parsed.scheme if storage_driver == "s3": storage_config = { - "s3_access_key_id": (urlparse.unquote( + "s3_access_key_id": (urllib.parse.unquote( storage_parsed.username or "gnocchi")), "s3_secret_access_key": ( - urlparse.unquote( + urllib.parse.unquote( storage_parsed.password or "whatever")), "s3_endpoint_url": "http://%s:%s/%s" % ( storage_parsed.hostname, @@ -126,9 +125,9 @@ storage_parsed.port, storage_parsed.path, ), - "swift_user": (urlparse.unquote( + "swift_user": (urllib.parse.unquote( storage_parsed.username or "admin:admin")), - "swift_key": (urlparse.unquote( + "swift_key": (urllib.parse.unquote( storage_parsed.password or "admin")), } elif storage_driver == "ceph": @@ -195,7 +194,7 @@ "|Created resource )")) _, v = self._exec(["gnocchi-api", "--", "--version"], stdout=True) - v = version.LooseVersion(drivers.fsdecode(v).strip()) + v = version.LooseVersion(os.fsdecode(v).strip()) if v < version.LooseVersion("4.1.0"): LOG.debug("gnocchi version: %s, running uwsgi manually for api", v) args = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/httpbin.py new/pifpaf-3.1.5/pifpaf/drivers/httpbin.py --- old/pifpaf-2.4.0/pifpaf/drivers/httpbin.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/httpbin.py 2020-08-07 11:20:53.000000000 +0200 @@ -0,0 +1,46 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import sys + +from pifpaf import drivers + + +class HttpBinDriver(drivers.Driver): + + DEFAULT_PORT = 5000 + + def __init__(self, port=DEFAULT_PORT, **kwargs): + """Create a new httpbin server.""" + super(HttpBinDriver, self).__init__(**kwargs) + self.port = port + + @classmethod + def get_options(cls): + return [ + {"param_decls": ["--port"], + "type": int, + "default": cls.DEFAULT_PORT, + "help": "port to use for httpbin"}, + ] + + def _setUp(self): + super(HttpBinDriver, self)._setUp() + + command = [sys.executable, "-m", "httpbin.core", "--port", + str(self.port)] + + c, _ = self._exec(command, wait_for_port=self.port) + + self.putenv("HTTPBIN_PORT", str(self.port)) + self.putenv("URL", "http://127.0.0.1:%d" % self.port) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/memcached.py new/pifpaf-3.1.5/pifpaf/drivers/memcached.py --- old/pifpaf-2.4.0/pifpaf/drivers/memcached.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/memcached.py 2020-12-02 13:37:49.000000000 +0100 @@ -18,10 +18,14 @@ DEFAULT_PORT = 11212 - def __init__(self, port=DEFAULT_PORT, **kwargs): + def __init__(self, port=DEFAULT_PORT, ssl_chain_cert=None, ssl_key=None, + ssl_ca_cert=None, **kwargs): """Create a new memcached server.""" super(MemcachedDriver, self).__init__(**kwargs) self.port = port + self.ssl_chain_cert = ssl_chain_cert + self.ssl_key = ssl_key + self.ssl_ca_cert = ssl_ca_cert @classmethod def get_options(cls): @@ -30,14 +34,32 @@ "type": int, "default": cls.DEFAULT_PORT, "help": "port to use for memcached"}, + {"param_decls": ["--ssl_chain_cert"], + "help": "certificate chain to use for memcached"}, + {"param_decls": ["--ssl_key"], + "help": "key to use for memcached"}, + {"param_decls": ["--ssl_ca_cert"], + "help": "trusted ca to use for memcached"}, ] def _setUp(self): super(MemcachedDriver, self)._setUp() - c, _ = self._exec(["memcached", - "-p " + str(self.port)], - wait_for_port=self.port) + command = ["memcached", "-p " + str(self.port)] + + if self.ssl_chain_cert: + command.extend(["-Z", "-o", "ssl_verify_mode=1", + "-o", "ssl_chain_cert=" + self.ssl_chain_cert]) + + if self.ssl_key: + command.extend(["-o", "ssl_key=" + self.ssl_key]) + + if self.ssl_ca_cert: + command.extend(["-o", "ssl_ca_cert=" + self.ssl_ca_cert]) + + self.putenv("MEMCACHED_TLS_ENABLED", "1") + + c, _ = self._exec(command, wait_for_port=self.port) self.putenv("MEMCACHED_PORT", str(self.port)) self.putenv("URL", "memcached://localhost:%d" % self.port) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/swift.py new/pifpaf-3.1.5/pifpaf/drivers/swift.py --- old/pifpaf-2.4.0/pifpaf/drivers/swift.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/swift.py 2020-08-20 12:48:44.000000000 +0200 @@ -14,10 +14,9 @@ import getpass import logging import os +import socketserver import threading -from six.moves import socketserver - from pifpaf import drivers from pifpaf.drivers import memcached diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/drivers/zookeeper.py new/pifpaf-3.1.5/pifpaf/drivers/zookeeper.py --- old/pifpaf-2.4.0/pifpaf/drivers/zookeeper.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/drivers/zookeeper.py 2020-08-20 12:48:44.000000000 +0200 @@ -43,7 +43,8 @@ cfgfile = os.path.join(self.tempdir, "zoo.cfg") with open(cfgfile, "w") as f: f.write("""dataDir=%s -clientPort=%s""" % (self.tempdir, self.port)) +clientPort=%s +4lw.commands.whitelist=*""" % (self.tempdir, self.port)) logdir = os.path.join(self.tempdir, "log") os.mkdir(logdir) @@ -54,7 +55,7 @@ c, _ = self._exec( ["zkServer.sh", "start", cfgfile], - wait_for_line="STARTED", + wait_for_port=self.port, path=self.PATH) self.addCleanup(self._exec, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/tests/test_drivers.py new/pifpaf-3.1.5/pifpaf/tests/test_drivers.py --- old/pifpaf-2.4.0/pifpaf/tests/test_drivers.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/tests/test_drivers.py 2020-08-20 12:48:44.000000000 +0200 @@ -24,8 +24,6 @@ import requests -import six - import testtools from pifpaf import drivers @@ -38,6 +36,7 @@ from pifpaf.drivers import etcd from pifpaf.drivers import fakes3 from pifpaf.drivers import gnocchi +from pifpaf.drivers import httpbin from pifpaf.drivers import influxdb from pifpaf.drivers import kafka from pifpaf.drivers import keystone @@ -328,7 +327,6 @@ @testtools.skipUnless(spawn.find_executable("gnocchi-api"), "Gnocchi not found") - @testtools.skipUnless(six.PY2, "Swift does not support PY3") @testtools.skipUnless(spawn.find_executable("swift-proxy-server"), "Swift not found") def test_gnocchi_with_existing_swift(self): @@ -516,7 +514,6 @@ self.assertEqual("PLAINTEXT://localhost:54321", os.getenv("PIFPAF_KAFKA_URL")) - @testtools.skipUnless(six.PY2, "Swift does not support PY3") @testtools.skipUnless(spawn.find_executable("swift-proxy-server"), "Swift not found") def test_swift(self): @@ -535,6 +532,16 @@ "swift://test%3Atester:testing@localhost:8080/auth/v1.0", os.getenv("PIFPAF_URL")) + @testtools.skipUnless(testtools.try_import('httpbin'), + "httpbin not found") + def test_httpbin(self): + port = 6666 + a = self.useFixture(httpbin.HttpBinDriver(port=port)) + self.assertEqual(port, a.port) + r = requests.get("http://127.0.0.1:%d/ip" % port) + self.assertEqual(r.status_code, 200) + self.assertEqual(r.json()["origin"], "127.0.0.1") + def _get_tmpdir_for_xattr(self): tmp_rootdir = os.getenv("TMPDIR_FOR_XATTR") # NOTE(sileht): Don't skip test if user have explicitly set a directory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf/util.py new/pifpaf-3.1.5/pifpaf/util.py --- old/pifpaf-2.4.0/pifpaf/util.py 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf/util.py 2021-02-01 18:12:19.000000000 +0100 @@ -76,3 +76,6 @@ gone, alive = psutil.wait_procs(procs, timeout=10) if alive: LOG.warning("`%s` survive SIGKILL", alive) + + # Be sure to get returncode + parent.wait() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf.egg-info/PKG-INFO new/pifpaf-3.1.5/pifpaf.egg-info/PKG-INFO --- old/pifpaf-2.4.0/pifpaf.egg-info/PKG-INFO 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf.egg-info/PKG-INFO 2021-02-01 18:12:43.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pifpaf -Version: 2.4.0 +Version: 3.1.5 Summary: Suite of tools and fixtures to manage daemons for testing Home-page: https://github.com/jd/pifpaf Author: Julien Danjou @@ -50,6 +50,7 @@ * `MongoDB`_ * `OpenStack Swift`_ * `Vault`_ + * `HttpBin`_ .. _Consul: https://www.consul.io/ .. _PostgreSQL: http://postgresql.org @@ -71,12 +72,13 @@ .. _MongoDB: https://www.mongodb.com .. _OpenStack Swift: https://docs.openstack.org/developer/swift/ .. _Vault: https://www.vaultproject.io/ + .. _HttpBin: https://httpbin.org/ Usage ===== To use Pifpaf, simply call the `pifpaf run $daemon <command>` program that you need. It will setup the temporary environment and export a few environment - variable for you to accesss it:: + variable for you to access it:: $ pifpaf run postgresql psql template1 Expanded display is used automatically. @@ -174,10 +176,10 @@ Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2 -Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Topic :: Software Development :: Testing Provides-Extra: test Provides-Extra: gnocchi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf.egg-info/SOURCES.txt new/pifpaf-3.1.5/pifpaf.egg-info/SOURCES.txt --- old/pifpaf-2.4.0/pifpaf.egg-info/SOURCES.txt 2020-01-09 11:14:44.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf.egg-info/SOURCES.txt 2021-02-01 18:12:44.000000000 +0100 @@ -31,6 +31,7 @@ pifpaf/drivers/etcd.py pifpaf/drivers/fakes3.py pifpaf/drivers/gnocchi.py +pifpaf/drivers/httpbin.py pifpaf/drivers/influxdb.py pifpaf/drivers/kafka.py pifpaf/drivers/keystone.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf.egg-info/entry_points.txt new/pifpaf-3.1.5/pifpaf.egg-info/entry_points.txt --- old/pifpaf-2.4.0/pifpaf.egg-info/entry_points.txt 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf.egg-info/entry_points.txt 2021-02-01 18:12:43.000000000 +0100 @@ -11,6 +11,7 @@ etcd = pifpaf.drivers.etcd:EtcdDriver fakes3 = pifpaf.drivers.fakes3:FakeS3Driver gnocchi = pifpaf.drivers.gnocchi:GnocchiDriver +httpbin = pifpaf.drivers.httpbin:HttpBinDriver influxdb = pifpaf.drivers.influxdb:InfluxDBDriver kafka = pifpaf.drivers.kafka:KafkaDriver keystone = pifpaf.drivers.keystone:KeystoneDriver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf.egg-info/pbr.json new/pifpaf-3.1.5/pifpaf.egg-info/pbr.json --- old/pifpaf-2.4.0/pifpaf.egg-info/pbr.json 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf.egg-info/pbr.json 2021-02-01 18:12:43.000000000 +0100 @@ -1 +1 @@ -{"git_version": "90a9cc2", "is_release": true} \ No newline at end of file +{"git_version": "d5e3387", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/pifpaf.egg-info/requires.txt new/pifpaf-3.1.5/pifpaf.egg-info/requires.txt --- old/pifpaf-2.4.0/pifpaf.egg-info/requires.txt 2020-01-09 11:14:43.000000000 +0100 +++ new/pifpaf-3.1.5/pifpaf.egg-info/requires.txt 2021-02-01 18:12:43.000000000 +0100 @@ -2,7 +2,6 @@ click pbr jinja2 -six fixtures psutil Binary files old/pifpaf-2.4.0/pifpaf.jpg and new/pifpaf-3.1.5/pifpaf.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/requirements.txt new/pifpaf-3.1.5/requirements.txt --- old/pifpaf-2.4.0/requirements.txt 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/requirements.txt 2020-08-20 12:48:44.000000000 +0200 @@ -2,7 +2,6 @@ click pbr jinja2 -six fixtures psutil xattr ; sys_platform != 'win32' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/setup.cfg new/pifpaf-3.1.5/setup.cfg --- old/pifpaf-2.4.0/setup.cfg 2020-01-09 11:14:44.000000000 +0100 +++ new/pifpaf-3.1.5/setup.cfg 2021-02-01 18:12:44.136964600 +0100 @@ -10,10 +10,10 @@ License :: OSI Approved :: Apache Software License Operating System :: POSIX Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Topic :: Software Development :: Testing [extras] @@ -44,6 +44,7 @@ swift = pifpaf.drivers.swift:SwiftDriver keystone = pifpaf.drivers.keystone:KeystoneDriver kafka = pifpaf.drivers.kafka:KafkaDriver + httpbin = pifpaf.drivers.httpbin:HttpBinDriver influxdb = pifpaf.drivers.influxdb:InfluxDBDriver memcached = pifpaf.drivers.memcached:MemcachedDriver mongodb = pifpaf.drivers.mongodb:MongoDBDriver @@ -58,9 +59,6 @@ console_scripts = pifpaf = pifpaf.__main__:run_main -[wheel] -universal = 1 - [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pifpaf-2.4.0/tox.ini new/pifpaf-3.1.5/tox.ini --- old/pifpaf-2.4.0/tox.ini 2020-01-09 11:07:41.000000000 +0100 +++ new/pifpaf-3.1.5/tox.ini 2020-08-20 12:48:44.000000000 +0200 @@ -1,16 +1,17 @@ [tox] -envlist = py27,py34,py35,py36,pep8,pypy +envlist = py36,py37,py38,pep8,pypy [testenv] usedevelop = True sitepackages = False deps = .[test,ceph,gnocchi] - gnocchi[postgresql,file,ceph,ceph_recommended_lib,s3] http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[postgresql] + gnocchi[postgresql,file,ceph,ceph_recommended_lib,s3] + httpbin + http://tarballs.openstack.org/keystone/keystone-master.tar.gz http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift python-swiftclient tooz[redis] - http://tarballs.openstack.org/keystone/keystone-master.tar.gz passenv = TMPDIR_FOR_XATTR commands = {toxinidir}/tools/pretty_tox.sh '--concurrency=1 {posargs}' @@ -26,7 +27,7 @@ commands = flake8 [flake8] -basepython = python3.6 +basepython = python3.8 exclude = .tox,.eggs,doc show-source = true ignore = D100,D101,D102,D103,D104,G200,G201,W503,W504 @@ -34,4 +35,4 @@ application-import-names = pifpaf [travis] -python = 3.6: py36, pep8 +python = 3.8: py38, pep8