Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-calmjs for openSUSE:Factory
checked in at 2021-11-12 15:59:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-calmjs (Old)
and /work/SRC/openSUSE:Factory/.python-calmjs.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-calmjs"
Fri Nov 12 15:59:19 2021 rev:4 rq:930992 version:3.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-calmjs/python-calmjs.changes
2021-01-26 14:49:56.339693083 +0100
+++ /work/SRC/openSUSE:Factory/.python-calmjs.new.1890/python-calmjs.changes
2021-11-12 16:00:06.850588517 +0100
@@ -1,0 +2,12 @@
+Thu Nov 11 22:29:55 UTC 2021 - Matej Cepl <mc...@suse.com>
+
+- Update to 3.4.2:
+ - This is a maintenance release for Python 3.10; no substantial
+ changes were been made.
+ - Provided a check for disabling integration tests using the
+ CALMJS_SKIP_INTEGRATION environment variable, when set to a non-
+ empty string, the integration tests found in test_dist will be
+ skipped. [ #60 ]
+- Fix running of tests (gh#calmjs/calmjs#61).
+
+-------------------------------------------------------------------
Old:
----
3.4.1.tar.gz
New:
----
3.4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-calmjs.spec ++++++
--- /var/tmp/diff_new_pack.uBZOzv/_old 2021-11-12 16:00:07.402588773 +0100
+++ /var/tmp/diff_new_pack.uBZOzv/_new 2021-11-12 16:00:07.406588774 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-calmjs
-Version: 3.4.1
+Version: 3.4.2
Release: 0
Summary: A Python framework for working with the Node.js ecosystem
License: GPL-2.0-or-later
@@ -32,10 +32,9 @@
Requires: python-calmjs.parse >= 1.0.0
Requires: python-calmjs.types
Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
BuildArch: noarch
# SECTION test requirements
-BuildRequires: %{python_module pytest}
BuildRequires: nodejs-common
# /SECTION
%python_subpackages
@@ -59,16 +58,17 @@
export LANG=en_US.UTF-8
%python_install
%python_clone -a %{buildroot}%{_bindir}/calmjs
-%python_expand rm -r %{buildroot}%{$python_sitelib}/calmjs/testing
-%python_expand rm -r %{buildroot}%{$python_sitelib}/calmjs/tests
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+# %%python_expand rm -r %%{buildroot}%%{$python_sitelib}/calmjs/testing
+# %%python_expand rm -r %%{buildroot}%%{$python_sitelib}/calmjs/tests
+%{python_expand touch %{buildroot}%{$python_sitelib}/calmjs/__init__.py
+%fdupes %{buildroot}%{$python_sitelib}
+}
%check
export LANG=en_US.UTF-8
-pushd src
-PYTHONPATH=.
-%pytest -k 'not (test_setup_egg_info or test_build_calmjs_artifact)'
-popd
+# gh#calmjs/calmjs#61
+%python_expand rm -v
%{buildroot}%{$python_sitelib}/calmjs/tests/test_argparse.py
+%pyunittest discover -v -s %{buildroot}%{$python_sitelib}/calmjs/
%post
%python_install_alternative calmjs
++++++ 3.4.1.tar.gz -> 3.4.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/.github/workflows/build.yml
new/calmjs-3.4.2/.github/workflows/build.yml
--- old/calmjs-3.4.1/.github/workflows/build.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/calmjs-3.4.2/.github/workflows/build.yml 2021-10-09
08:19:26.000000000 +0200
@@ -0,0 +1,106 @@
+name: build
+
+on:
+ push:
+ branches:
+ - master
+ - testing
+ - 3.4.x
+ tags:
+ - 3.4.0
+ - 3.4.1
+ - 3.4.2
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ build:
+
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macos-latest, windows-latest]
+ python-version: [3.9, "3.10"]
+ node-version: [12, 14]
+ include:
+ - os: ubuntu-latest
+ python-version: 2.7
+ node-version: 4
+ # No idea why OS X would trigger that specific error, when it
+ # passes on other platforms.
+ # See: https://github.com/calmjs/calmjs/runs/3844830329
+ # - os: macos-latest
+ # python-version: 2.7
+ # node-version: 4
+ - os: windows-latest
+ python-version: 2.7
+ node-version: 4
+
+ - os: ubuntu-latest
+ python-version: 3.6
+ node-version: 8
+ - os: macos-latest
+ python-version: 3.6
+ node-version: 8
+ - os: windows-latest
+ python-version: 3.6
+ node-version: 8
+
+ - os: ubuntu-latest
+ python-version: 3.7
+ node-version: 10
+ - os: macos-latest
+ python-version: 3.7
+ node-version: 10
+ - os: windows-latest
+ python-version: 3.7
+ node-version: 10
+
+ - os: ubuntu-latest
+ python-version: 3.8
+ node-version: 12
+ - os: macos-latest
+ python-version: 3.8
+ node-version: 12
+ - os: windows-latest
+ python-version: 3.8
+ node-version: 12
+
+ - os: ubuntu-latest
+ python-version: pypy2
+ node-version: 12
+ - os: ubuntu-latest
+ python-version: pypy3
+ node-version: 12
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Set up Node ${{ matrix.node-version }}
+ uses: actions/setup-node@v2
+ with:
+ node-version: ${{ matrix.node-version }}
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ python -m pip install coverage flake8
+ python -m pip install -e .
+ - name: Lint with flake8
+ run: |
+ flake8
+ # TODO need to include tests that will FAIL if not properly integrated
+ - name: Test with unittest
+ run: |
+ coverage run --include=src/* -m unittest calmjs.tests.make_suite
+ coverage report -m
+ - name: Coveralls
+ if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version != '2.7'
&& matrix.python-version != 'pypy2' }}
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ python -m pip install coveralls
+ coveralls --service=github
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/.travis.yml new/calmjs-3.4.2/.travis.yml
--- old/calmjs-3.4.1/.travis.yml 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,147 +0,0 @@
-sudo: false
-matrix:
- allow_failures:
- - os: osx
- - python: 3.8-dev
- - env: TRAVIS_NODE_VERSION=11
- include:
- - language: python
- python: 2.7
- env: TRAVIS_NODE_VERSION=4.9
- dist: trusty
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: 3.4
- env: TRAVIS_NODE_VERSION=6.14
- dist: trusty
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: 3.5
- env: TRAVIS_NODE_VERSION=8.14
- dist: trusty
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: 3.6
- env: TRAVIS_NODE_VERSION=8.14
- dist: trusty
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: 3.7
- sudo: true
- dist: xenial
- env: TRAVIS_NODE_VERSION=10
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: 3.8-dev
- sudo: true
- dist: xenial
- env: TRAVIS_NODE_VERSION=11
- addons:
- apt:
- sources:
- - sourceline: 'deb https://dl.yarnpkg.com/debian/ stable main'
- key_url: 'https://dl.yarnpkg.com/debian/pubkey.gpg'
- packages:
- - yarn
- - language: python
- python: pypy
- env: TRAVIS_NODE_VERSION=6.14
- - language: python
- python: pypy3
- env: TRAVIS_NODE_VERSION=8.14
- # test different versions of Node.js on osx
- - language: node_js
- node_js: 4.9
- os: osx
- env: TRAVIS_PYTHON_VERSION=3.4.9
- - language: node_js
- node_js: 6.14
- os: osx
- env: TRAVIS_PYTHON_VERSION=3.5.3
- - language: node_js
- node_js: 8.14
- os: osx
- env: TRAVIS_PYTHON_VERSION=3.6.7
- - language: node_js
- node_js: 10
- os: osx
- env: TRAVIS_PYTHON_VERSION=3.7.1
-
-before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
- brew update || brew update ;
- brew install pyenv ;
- brew outdated pyenv || brew upgrade pyenv ;
- pyenv install $TRAVIS_PYTHON_VERSION ;
- pyenv global $TRAVIS_PYTHON_VERSION ;
- eval "$(pyenv init -)" ;
- python --version ;
- python -m pip install --user virtualenv ;
- python -m virtualenv ~/.venv ;
- source ~/.venv/bin/activate ;
- else
- rm -rf ~/.nvm ;
- git clone https://github.com/creationix/nvm.git ~/.nvm ;
- (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags` );
- source ~/.nvm/nvm.sh ;
- nvm install "$TRAVIS_NODE_VERSION" ;
- fi
- - node --version
- - npm --version
-
-install:
- - pip install coverage flake8
- - pip install -e .
-script:
- - flake8 setup.py src
- - coverage run --include=src/* -m unittest calmjs.tests.make_suite
- - coverage report -m
-# Alternatively without nose
-after_success:
- # only submit coverage when testing under linux.
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
- pip install coveralls ;
- coveralls ;
- fi
-branches:
- only:
- - testing
- - master
- - 1.0.x
- - 2.0.x
- - 3.0.x
- - 3.1.x
- - 3.2.x
- - 3.3.x
- - 3.4.x
- - 3.4.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/CHANGES.rst new/calmjs-3.4.2/CHANGES.rst
--- old/calmjs-3.4.1/CHANGES.rst 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/CHANGES.rst 2021-10-09 08:19:26.000000000 +0200
@@ -1,6 +1,18 @@
Changelog
=========
+3.4.2 (2021-10-09)
+------------------
+
+- This is a maintenance release for Python 3.10; no substantial changes
+ were been made.
+- Provided a check for disabling integration tests using the
+ ``CALMJS_SKIP_INTEGRATION`` environment variable, when set to a non-
+ empty string, the integration tests found in ``test_dist`` will be
+ skipped. [
+ `#60 <https://github.com/calmjs/calmjs/issues/60>`_
+ ]
+
3.4.1 (2019-05-23)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/README.rst new/calmjs-3.4.2/README.rst
--- old/calmjs-3.4.1/README.rst 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/README.rst 2021-10-09 08:19:26.000000000 +0200
@@ -4,12 +4,12 @@
A Python framework for building toolchains and utilities for working
with the Node.js ecosystem from within a Python environment.
-.. image:: https://travis-ci.org/calmjs/calmjs.svg?branch=3.4.1
- :target: https://travis-ci.org/calmjs/calmjs
-.. image::
https://ci.appveyor.com/api/projects/status/45054tm9cfk7ryam/branch/3.4.1?svg=true
- :target: https://ci.appveyor.com/project/metatoaster/calmjs/branch/3.4.1
-.. image::
https://coveralls.io/repos/github/calmjs/calmjs/badge.svg?branch=3.4.1
- :target: https://coveralls.io/github/calmjs/calmjs?branch=3.4.1
+.. image::
https://github.com/calmjs/calmjs/actions/workflows/build.yml/badge.svg?branch=3.4.2
+ :target:
https://github.com/calmjs/calmjs/actions/workflows/build.yml?query=branch:3.4.2
+.. image::
https://ci.appveyor.com/api/projects/status/45054tm9cfk7ryam/branch/3.4.2?svg=true
+ :target: https://ci.appveyor.com/project/metatoaster/calmjs/branch/3.4.2
+.. image::
https://coveralls.io/repos/github/calmjs/calmjs/badge.svg?branch=3.4.2
+ :target: https://coveralls.io/github/calmjs/calmjs?branch=3.4.2
.. |AMD| replace:: AMD (Asynchronous Module Definition)
.. |calmjs.bower| replace:: ``calmjs.bower``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/appveyor.yml
new/calmjs-3.4.2/appveyor.yml
--- old/calmjs-3.4.1/appveyor.yml 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/appveyor.yml 2021-10-09 08:19:26.000000000 +0200
@@ -1,11 +1,5 @@
environment:
matrix:
- - PYTHON: "C:\\Python27"
- nodejs_version: "4"
- - PYTHON: "C:\\Python34"
- nodejs_version: "6"
- - PYTHON: "C:\\Python35"
- nodejs_version: "6"
- PYTHON: "C:\\Python36"
nodejs_version: "8"
- PYTHON: "C:\\Python37"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/setup.py new/calmjs-3.4.2/setup.py
--- old/calmjs-3.4.1/setup.py 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/setup.py 2021-10-09 08:19:26.000000000 +0200
@@ -1,7 +1,7 @@
from setuptools import setup
from setuptools import find_packages
-version = '3.4.1'
+version = '3.4.2'
classifiers = """
Development Status :: 5 - Production/Stable
@@ -21,10 +21,11 @@
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
-Programming Language :: Python :: 3.4
-Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
+Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
+Programming Language :: Python :: 3.10
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Software Development :: Build Tools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/base.py
new/calmjs-3.4.2/src/calmjs/base.py
--- old/calmjs-3.4.1/src/calmjs/base.py 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/base.py 2021-10-09 08:19:26.000000000 +0200
@@ -20,7 +20,10 @@
from os.path import sep
from collections import OrderedDict
-from collections import MutableMapping
+try:
+ from collections.abc import MutableMapping
+except ImportError: # pragma: no cover
+ from collections import MutableMapping
from logging import getLogger
from pkg_resources import Distribution
from pkg_resources import working_set
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/tests/test_dist.py
new/calmjs-3.4.2/src/calmjs/tests/test_dist.py
--- old/calmjs-3.4.1/src/calmjs/tests/test_dist.py 2019-05-23
06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/tests/test_dist.py 2021-10-09
08:19:26.000000000 +0200
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import unittest
import json
+import os
import sys
import textwrap
from os.path import join
@@ -23,6 +24,8 @@
from calmjs.testing.utils import mkdtemp
from calmjs.testing.utils import stub_stdouts
+skip_integration = os.environ.get('CALMJS_SKIP_INTEGRATION')
+
class DistTestCase(unittest.TestCase):
"""
@@ -985,6 +988,7 @@
['nothing'], working_set=working_set), [])
+@unittest.skipIf(skip_integration, 'integration tests skipped')
class ArtifactIntegrationTestCase(unittest.TestCase):
def test_calmjs_artifact_declarations(self):
@@ -1066,6 +1070,7 @@
)
+@unittest.skipIf(skip_integration, 'integration tests skipped')
class DistIntegrationTestCase(unittest.TestCase):
"""
Testing integration of dist with the rest of calmjs and setuptools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/tests/test_registry.py
new/calmjs-3.4.2/src/calmjs/tests/test_registry.py
--- old/calmjs-3.4.1/src/calmjs/tests/test_registry.py 2019-05-23
06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/tests/test_registry.py 2021-10-09
08:19:26.000000000 +0200
@@ -153,7 +153,8 @@
with pretty_logging(stream=mocks.StringIO()) as stream:
self.assertIsNone(registry.get_record('failure'))
# exact error message differs between Python versions.
- self.assertIn('TypeError: __init__() ', stream.getvalue())
+ self.assertIn('TypeError', stream.getvalue())
+ self.assertIn('__init__()', stream.getvalue())
def test_registry_fresh_from_entrypoint(self):
working_set = mocks.WorkingSet({'calmjs.registry': [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/tests/test_ui.py
new/calmjs-3.4.2/src/calmjs/tests/test_ui.py
--- old/calmjs-3.4.1/src/calmjs/tests/test_ui.py 2019-05-23
06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/tests/test_ui.py 2021-10-09
08:19:26.000000000 +0200
@@ -35,7 +35,7 @@
self.assertFalse(ui._check_interactive(fd2, fd1))
@unittest.skipIf(not isatty, 'stdin is not a tty')
- def test_check_interactive_good(self):
+ def test_check_interactive_good(self): # pragma: no cover
# kind of unnecessary because test relies on low level function
self.assertTrue(ui._check_interactive(sys.__stdin__))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/tests/test_yarn.py
new/calmjs-3.4.2/src/calmjs/tests/test_yarn.py
--- old/calmjs-3.4.1/src/calmjs/tests/test_yarn.py 2019-05-23
06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/tests/test_yarn.py 2021-10-09
08:19:26.000000000 +0200
@@ -31,7 +31,7 @@
from calmjs.testing.utils import stub_stdin
from calmjs.testing.utils import stub_stdouts
-which_yarn = which('yarn')
+which_yarn = cli.get_bin_version_str(which('yarn'))
class YarnTestCase(unittest.TestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/calmjs-3.4.1/src/calmjs/ui.py
new/calmjs-3.4.2/src/calmjs/ui.py
--- old/calmjs-3.4.1/src/calmjs/ui.py 2019-05-23 06:19:20.000000000 +0200
+++ new/calmjs-3.4.2/src/calmjs/ui.py 2021-10-09 08:19:26.000000000 +0200
@@ -200,12 +200,12 @@
"""
# generate compacted ndiff output.
- diff = '\n'.join(l for l in (
+ diff = '\n'.join(li for li in (
line.rstrip() for line in difflib.ndiff(
json_dumps(original).splitlines(),
json_dumps(new).splitlines(),
))
- if l[:1] in '?+-' or l[-1:] in '{}' or l[-2:] == '},')
+ if li[:1] in '?+-' or li[-1:] in '{}' or li[-2:] == '},')
basename_target = basename(target_path)
return prompt(
"Generated '%(basename_target)s' differs with '%(target_path)s'.\n\n"
