Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-kiwisolver for
openSUSE:Factory checked in at 2022-01-07 12:44:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kiwisolver (Old)
and /work/SRC/openSUSE:Factory/.python-kiwisolver.new.1896 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kiwisolver"
Fri Jan 7 12:44:52 2022 rev:6 rq:943952 version:1.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kiwisolver/python-kiwisolver.changes
2020-12-23 14:19:08.177592829 +0100
+++
/work/SRC/openSUSE:Factory/.python-kiwisolver.new.1896/python-kiwisolver.changes
2022-01-07 12:45:26.459806283 +0100
@@ -1,0 +2,7 @@
+Wed Jan 5 10:27:23 UTC 2022 - Dirk M??ller <[email protected]>
+
+- update to 1.3.2:
+ - Add support for Python 3.10, drop official support Python 3.6
+ - Remove direct accesses to ob_type in C-API use Py_TYPE instead
+
+-------------------------------------------------------------------
Old:
----
1.3.1.tar.gz
New:
----
1.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-kiwisolver.spec ++++++
--- /var/tmp/diff_new_pack.l7eKC5/_old 2022-01-07 12:45:26.907806595 +0100
+++ /var/tmp/diff_new_pack.l7eKC5/_new 2022-01-07 12:45:26.915806600 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-kiwisolver
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,9 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
+%global skip_python36 1
Name: python-kiwisolver
-Version: 1.3.1
+Version: 1.3.2
Release: 0
Summary: An implementation of the Cassowary constraint solver
License: BSD-3-Clause
++++++ 1.3.1.tar.gz -> 1.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/.github/FUNDING.yml
new/kiwi-1.3.2/.github/FUNDING.yml
--- old/kiwi-1.3.1/.github/FUNDING.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi-1.3.2/.github/FUNDING.yml 2021-08-31 08:52:52.000000000 +0200
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [MatthieuDartiailh]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g.,
npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g.,
cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/.github/workflows/ci.yml
new/kiwi-1.3.2/.github/workflows/ci.yml
--- old/kiwi-1.3.1/.github/workflows/ci.yml 2020-11-02 03:14:28.000000000
+0100
+++ new/kiwi-1.3.2/.github/workflows/ci.yml 2021-08-31 08:52:52.000000000
+0200
@@ -4,10 +4,10 @@
- cron: '0 0 * * 2'
push:
branches:
- - master
+ - main
pull_request:
branches:
- - master
+ - main
paths:
- .github/workflows/ci.yml
- benchmarks/*
@@ -32,7 +32,7 @@
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
- python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+ python-version: [3.7, 3.8, 3.9, 3.10.0-rc.1, pypy-3.7]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
@@ -42,27 +42,24 @@
- name: Install dependencies
run: |
python -m pip install --upgrade pip
- pip install https://github.com/nucleic/cppy/tarball/master
+ pip install https://github.com/nucleic/cppy/tarball/main
- name: Install project
env:
CPPFLAGS: --coverage
+ KIWI_DISABLE_FH4: 1
run: |
python setup.py develop
- name: Test with pytest
- if: matrix.python-version == '3.6'
- env:
- KIWI_DISBALE_FH4: 1
- run: |
- pip install pytest
- python -m pytest py/tests
- - name: Test with pytest
- if: matrix.python-version != '3.6'
run: |
pip install pytest
python -X dev -m pytest py/tests
+ - name: Generate C++ coverage reports
+ if: (github.event_name != 'schedule' && matrix.os != 'windows-latest')
+ run: |
+ bash -c "find . -type f -name '*.gcno' -exec gcov -pb --all-blocks
{} +" || true
- name: Upload coverage to Codecov
- uses: codecov/codecov-action@v1
- if: matrix.os != 'windows-latest'
+ uses: codecov/codecov-action@v2
+ if: (github.event_name != 'schedule' && matrix.os != 'windows-latest')
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/.github/workflows/docs.yml
new/kiwi-1.3.2/.github/workflows/docs.yml
--- old/kiwi-1.3.1/.github/workflows/docs.yml 2020-11-02 03:14:28.000000000
+0100
+++ new/kiwi-1.3.2/.github/workflows/docs.yml 2021-08-31 08:52:52.000000000
+0200
@@ -4,10 +4,10 @@
- cron: '0 0 * * 2'
push:
branches:
- - master
+ - main
pull_request:
branches:
- - master
+ - main
paths:
- .github/workflows/docs.yml
- kiwi/*
@@ -26,7 +26,7 @@
- name: Install dependencies
run: |
python -m pip install --upgrade pip
- pip install https://github.com/nucleic/cppy/tarball/master
+ pip install https://github.com/nucleic/cppy/tarball/main
- name: Install project
run: |
python setup.py develop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/.github/workflows/release.yml
new/kiwi-1.3.2/.github/workflows/release.yml
--- old/kiwi-1.3.1/.github/workflows/release.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/kiwi-1.3.2/.github/workflows/release.yml 2021-08-31
08:52:52.000000000 +0200
@@ -0,0 +1,139 @@
+name: Build and upload wheels
+on:
+ workflow_dispatch:
+ schedule:
+ - cron: '0 0 * * 3'
+ push:
+ tags:
+ - '*'
+
+jobs:
+ build_sdist:
+ name: Build sdist
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Setup Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.8'
+ - name: Build sdist
+ run: |
+ pip install --upgrade pip
+ pip install wheel
+ python setup.py sdist
+ - name: Test sdist
+ run: |
+ pip install pytest
+ pip install --no-index --find-links dist kiwisolver
+ cd ..
+ python -m pytest kiwi/py/tests
+ - name: Store artifacts
+ uses: actions/upload-artifact@v2
+ with:
+ name: artifact
+ path: dist/*
+
+ build_wheels:
+ name: Build wheels on ${{ matrix.os }} for Python ${{ matrix.python }}
+ runs-on: ${{ matrix.os }}
+ env:
+ BUILD_COMMIT: main
+ strategy:
+ matrix:
+ os: [ubuntu-latest, windows-latest, macos-latest]
+ python: [cp37, cp38, cp39, cp310, pp3.7]
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: Setup Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.9'
+ - name: Set up QEMU
+ if: runner.os == 'Linux'
+ uses: docker/setup-qemu-action@v1
+ with:
+ platforms: all
+ - name: Build wheels
+ uses: pypa/[email protected]
+ if: matrix.python == 'cp37' || matrix.python == 'cp38'
+ env:
+ CIBW_BUILD: ${{ matrix.python }}-*
+ CIBW_ARCHS_MACOS: x86_64 universal2 arm64
+ # configure cibuildwheel to build native archs ('auto'), and some
+ # emulated ones
+ CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x
+ CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
+ CIBW_MANYLINUX_I686_IMAGE: manylinux1
+ CIBW_TEST_REQUIRES: pytest
+ CIBW_TEST_COMMAND: python -m pytest {package}/py/tests -v
+ # Do not link against VC2014_1 on Windows
+ KIWI_DISABLE_FH4: 1
+ - name: Build wheels
+ uses: pypa/[email protected]
+ if: matrix.python != 'cp37' && matrix.python != 'cp38'
+ env:
+ CIBW_BUILD: "cp39-* cp310-* pp37-*"
+ CIBW_ARCHS_MACOS: x86_64 universal2 arm64
+ # configure cibuildwheel to build native archs ('auto'), and some
+ # emulated ones
+ CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x
+ CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
+ CIBW_MANYLINUX_I686_IMAGE: manylinux2010
+ CIBW_TEST_REQUIRES: pytest
+ CIBW_TEST_COMMAND: python -m pytest {package}/py/tests -v
+ # Do not link against VC2014_1 on Windows
+ KIWI_DISABLE_FH4: 1
+ - name: Store artifacts
+ uses: actions/upload-artifact@v2
+ with:
+ name: artifact
+ path: ./wheelhouse/*.whl
+
+ release_upload:
+ name: Create Release and Upload Release Asset
+ runs-on: ubuntu-latest
+ if: github.event_name == 'push'
+ needs: [build_wheels, build_sdist]
+ steps:
+ - name: Create Release
+ id: create_release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ github.ref }}
+ release_name: Release ${{ github.ref }}
+ draft: false
+ prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref,
'a') || contains(github.ref, 'b')}}
+ - uses: actions/download-artifact@v2
+ with:
+ name: artifact
+ path: dist
+ - name: Upload Release Asset
+ id: upload-release-asset
+ uses: shogo82148/actions-upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: dist/*
+
+ upload_pypi:
+ if: github.event_name == 'push'
+ needs: [build_wheels, build_sdist]
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/download-artifact@v2
+ with:
+ name: artifact
+ path: dist
+
+ - uses: pypa/gh-action-pypi-publish@master
+ with:
+ user: __token__
+ password: ${{ secrets.pypi_password }}
+ # To test:
+ # repository_url: https://test.pypi.org/legacy/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/.travis.yml new/kiwi-1.3.2/.travis.yml
--- old/kiwi-1.3.1/.travis.yml 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/.travis.yml 2021-08-31 08:52:52.000000000 +0200
@@ -12,7 +12,7 @@
branches:
only:
- - master
+ - main
jobs:
include:
@@ -45,7 +45,7 @@
- CPPFLAGS=--coverage
before_install:
- pip install --upgrade pip
- - pip install https://github.com/nucleic/cppy/tarball/master
+ - pip install https://github.com/nucleic/cppy/tarball/main
install:
- python setup.py develop
script:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/README.rst new/kiwi-1.3.2/README.rst
--- old/kiwi-1.3.1/README.rst 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/README.rst 2021-08-31 08:52:52.000000000 +0200
@@ -1,24 +1,25 @@
Welcome to Kiwi
===============
-.. image:: https://travis-ci.org/nucleic/kiwi.svg?branch=master
+.. image:: https://travis-ci.org/nucleic/kiwi.svg?branch=main
:target: https://travis-ci.org/nucleic/kiwi
.. image::
https://github.com/nucleic/kiwi/workflows/Continuous%20Integration/badge.svg
:target: https://github.com/nucleic/kiwi/actions
.. image::
https://github.com/nucleic/kiwi/workflows/Documentation%20building/badge.svg
:target: https://github.com/nucleic/kiwi/actions
-.. image:: https://codecov.io/gh/nucleic/kiwi/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/nucleic/kiwi/branch/main/graph/badge.svg
:target: https://codecov.io/gh/nucleic/kiwi
.. image:: https://readthedocs.org/projects/kiwisolver/badge/?version=latest
:target: https://kiwisolver.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status
Kiwi is an efficient C++ implementation of the Cassowary constraint solving
-algorithm. Kiwi is an implementation of the algorithm based on the seminal
-Cassowary paper. It is *not* a refactoring of the original C++ solver. Kiwi
-has been designed from the ground up to be lightweight and fast. Kiwi ranges
-from 10x to 500x faster than the original Cassowary solver with typical use
-cases gaining a 40x improvement. Memory savings are consistently > 5x.
+algorithm. Kiwi is an implementation of the algorithm based on the
+`seminal Cassowary paper
<https://constraints.cs.washington.edu/solvers/cassowary-tochi.pdf>`_.
+It is *not* a refactoring of the original C++ solver. Kiwi has been designed
+from the ground up to be lightweight and fast. Kiwi ranges from 10x to 500x
+faster than the original Cassowary solver with typical usecases gaining a 40x
+improvement. Memory savings are consistently > 5x.
In addition to the C++ solver, Kiwi ships with hand-rolled Python bindings for
-Python 3.6+.
+Python 3.7+.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/benchmarks/nanobench.h
new/kiwi-1.3.2/benchmarks/nanobench.h
--- old/kiwi-1.3.1/benchmarks/nanobench.h 2020-11-02 03:14:28.000000000
+0100
+++ new/kiwi-1.3.2/benchmarks/nanobench.h 2021-08-31 08:52:52.000000000
+0200
@@ -7,7 +7,7 @@
//
// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
// SPDX-License-Identifier: MIT
-// Copyright (c) 2019-2020 Martin Ankerl <[email protected]>
+// Copyright (c) 2019-2021 Martin Ankerl <[email protected]>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
deal
@@ -32,8 +32,8 @@
// see https://semver.org/
#define ANKERL_NANOBENCH_VERSION_MAJOR 4 // incompatible API changes
-#define ANKERL_NANOBENCH_VERSION_MINOR 2 // backwards-compatible changes
-#define ANKERL_NANOBENCH_VERSION_PATCH 0 // backwards-compatible bug fixes
+#define ANKERL_NANOBENCH_VERSION_MINOR 3 // backwards-compatible changes
+#define ANKERL_NANOBENCH_VERSION_PATCH 4 // backwards-compatible bug fixes
///////////////////////////////////////////////////////////////////////////////////////////////////
// public facing api - as minimal as possible
@@ -88,7 +88,10 @@
} while (0)
#endif
-#if defined(__linux__) && !defined(ANKERL_NANOBENCH_DISABLE_PERF_COUNTERS)
+#if defined(__linux__) && defined(PERF_EVENT_IOC_ID) &&
defined(PERF_COUNT_HW_REF_CPU_CYCLES) && defined(PERF_FLAG_FD_CLOEXEC) && \
+ !defined(ANKERL_NANOBENCH_DISABLE_PERF_COUNTERS)
+// only enable perf counters on kernel 3.14 which seems to have all the
necessary defines. The three PERF_... defines are not in
+// kernel 2.6.32 (all others are).
# define ANKERL_NANOBENCH_PRIVATE_PERF_COUNTERS() 1
#else
# define ANKERL_NANOBENCH_PRIVATE_PERF_COUNTERS() 0
@@ -523,6 +526,7 @@
*/
explicit Rng(uint64_t seed) noexcept;
Rng(uint64_t x, uint64_t y) noexcept;
+ Rng(std::vector<uint64_t> const& data);
/**
* Creates a copy of the Rng, thus the copy provides exactly the same
random sequence as the original.
@@ -577,6 +581,14 @@
template <typename Container>
void shuffle(Container& container) noexcept;
+ /**
+ * Extracts the full state of the generator, e.g. for serialization. For
this RNG this is just 2 values, but to stay API compatible
+ * with future implementations that potentially use more state, we use a
vector.
+ *
+ * @return Vector containing the full state:
+ */
+ std::vector<uint64_t> state() const;
+
private:
static constexpr uint64_t rotl(uint64_t x, unsigned k) noexcept;
@@ -1101,7 +1113,7 @@
return (std::numeric_limits<uint64_t>::max)();
}
-ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
uint64_t Rng::operator()() noexcept {
auto x = mX;
@@ -1111,7 +1123,7 @@
return x;
}
-ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
uint32_t Rng::bounded(uint32_t range) noexcept {
uint64_t r32 = static_cast<uint32_t>(operator()());
auto multiresult = r32 * range;
@@ -2013,7 +2025,7 @@
return sHeaderHash;
}
-ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
inline uint64_t hash_combine(uint64_t seed, uint64_t val) {
return seed ^ (val + UINT64_C(0x9e3779b9) + (seed << 6U) + (seed >> 2U));
}
@@ -2091,7 +2103,7 @@
return static_cast<uint64_t>(doubleNewIters + 0.5);
}
- ANKERL_NANOBENCH_NO_SANITIZE("integer") void
upscale(std::chrono::nanoseconds elapsed) {
+ ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined") void
upscale(std::chrono::nanoseconds elapsed) {
if (elapsed * 10 < mTargetRuntimePerEpoch) {
// we are far below the target runtime. Multiply iterations by 10
(with overflow check)
if (mNumIters * 10 < mNumIters) {
@@ -2233,8 +2245,8 @@
hash = hash_combine(std::hash<std::string>{}(mBench.title()),
hash);
hash =
hash_combine(std::hash<std::string>{}(mBench.timeUnitName()), hash);
hash =
hash_combine(std::hash<double>{}(mBench.timeUnit().count()), hash);
- hash = hash_combine(mBench.relative(), hash);
- hash = hash_combine(mBench.performanceCounters(), hash);
+ hash = hash_combine(std::hash<bool>{}(mBench.relative()), hash);
+ hash =
hash_combine(std::hash<bool>{}(mBench.performanceCounters()), hash);
if (hash != singletonHeaderHash()) {
singletonHeaderHash() = hash;
@@ -2390,7 +2402,7 @@
}
template <typename Op>
- ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
void calibrate(Op&& op) {
// clear current calibration data,
for (auto& v : mCalibratedOverhead) {
@@ -2496,7 +2508,7 @@
}
// overflow is ok, it's checked
-ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
void LinuxPerformanceCounters::updateResults(uint64_t numIters) {
// clear old data
for (auto& id_value : mIdToTarget) {
@@ -3223,7 +3235,7 @@
} while (mX == 0 && mY == 0);
}
-ANKERL_NANOBENCH_NO_SANITIZE("integer")
+ANKERL_NANOBENCH_NO_SANITIZE("integer", "undefined")
uint64_t splitMix64(uint64_t& state) noexcept {
uint64_t z = (state += UINT64_C(0x9e3779b97f4a7c15));
z = (z ^ (z >> 30U)) * UINT64_C(0xbf58476d1ce4e5b9);
@@ -3249,6 +3261,24 @@
return Rng{mX, mY};
}
+Rng::Rng(std::vector<uint64_t> const& data)
+ : mX(0)
+ , mY(0) {
+ if (data.size() != 2) {
+ throw std::runtime_error("ankerl::nanobench::Rng::Rng: needed exactly
2 entries in data, but got " +
+ std::to_string(data.size()));
+ }
+ mX = data[0];
+ mY = data[1];
+}
+
+std::vector<uint64_t> Rng::state() const {
+ std::vector<uint64_t> data(2);
+ data[0] = mX;
+ data[1] = mY;
+ return data;
+}
+
BigO::RangeMeasure BigO::collectRangeMeasure(std::vector<Result> const&
results) {
BigO::RangeMeasure rangeMeasure;
for (auto const& result : results) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/codecov.yml new/kiwi-1.3.2/codecov.yml
--- old/kiwi-1.3.1/codecov.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi-1.3.2/codecov.yml 2021-08-31 08:52:52.000000000 +0200
@@ -0,0 +1,24 @@
+codecov:
+ notify:
+ require_ci_to_pass: yes
+
+coverage:
+ precision: 2
+
+ status:
+ project: yes
+ patch: yes
+ changes: yes
+
+parsers:
+ gcov:
+ branch_detection:
+ conditional: yes
+ loop: yes
+ method: no
+ macro: no
+
+comment:
+ layout: "header, diff"
+ behavior: default
+ require_changes: no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/requirements.txt
new/kiwi-1.3.2/docs/requirements.txt
--- old/kiwi-1.3.1/docs/requirements.txt 2020-11-02 03:14:28.000000000
+0100
+++ new/kiwi-1.3.2/docs/requirements.txt 2021-08-31 08:52:52.000000000
+0200
@@ -1,2 +1,2 @@
sphinx-tabs
-https://github.com/nucleic/cppy/tarball/master
+https://github.com/nucleic/cppy/tarball/main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/source/basis/basic_systems.rst
new/kiwi-1.3.2/docs/source/basis/basic_systems.rst
--- old/kiwi-1.3.1/docs/source/basis/basic_systems.rst 2020-11-02
03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/docs/source/basis/basic_systems.rst 2021-08-31
08:52:52.000000000 +0200
@@ -5,7 +5,7 @@
.. include:: ../substitutions.sub
-A system in Kiwi is defined by a set of contraints that can be either
+A system in Kiwi is defined by a set of constraints that can be either
equalities or inequalities (>= and <= only, strict inequalities are not
accepted), each of which can have an associated strength making more or less
important to respect when solving the problem. The next sections will cover how
@@ -136,7 +136,7 @@
a better way: edit variables.
Edit variables are variables for which you can suggest values. Edit variable
-have a strength whcih can be at most strong (the value of a edit variable can
+have a strength which can be at most strong (the value of a edit variable can
never be required).
For the sake of our example we will make "xm" editable:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/source/basis/solver_internals.rst
new/kiwi-1.3.2/docs/source/basis/solver_internals.rst
--- old/kiwi-1.3.1/docs/source/basis/solver_internals.rst 2020-11-02
03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/docs/source/basis/solver_internals.rst 2021-08-31
08:52:52.000000000 +0200
@@ -67,8 +67,8 @@
- i: invalid symbol, returned when no valid symbol can be found.
-Stay contraints emulation
--------------------------
+Stay constraints emulation
+--------------------------
One feature of Cassowary that Kiwi abandoned is the notion of stay
constraints. Stay constraints are typically used in under-constrained
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/source/conf.py
new/kiwi-1.3.2/docs/source/conf.py
--- old/kiwi-1.3.1/docs/source/conf.py 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/docs/source/conf.py 2021-08-31 08:52:52.000000000 +0200
@@ -4,7 +4,7 @@
#
# This file does only contain a selection of the most common options. For a
# full list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
+# http://www.sphinx-doc.org/en/main/config
# -- Path setup --------------------------------------------------------------
@@ -26,7 +26,7 @@
# The short X.Y version
version = '1.3'
# The full version, including alpha/beta/rc tags
-release = '1.3.1'
+release = '1.3.2'
# -- General configuration ---------------------------------------------------
@@ -63,8 +63,8 @@
# source_suffix = ['.rst', '.md']
source_suffix = '.rst'
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -141,7 +141,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
- (master_doc, 'kiwi.tex', 'kiwi Documentation',
+ (main_doc, 'kiwi.tex', 'kiwi Documentation',
'Nucleic team', 'manual'),
]
@@ -151,7 +151,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- (master_doc, 'kiwi', 'kiwi Documentation',
+ (main_doc, 'kiwi', 'kiwi Documentation',
[author], 1)
]
@@ -162,7 +162,7 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
- (master_doc, 'kiwi', 'kiwi Documentation',
+ (main_doc, 'kiwi', 'kiwi Documentation',
author, 'kiwi', 'One line description of project.',
'Miscellaneous'),
]
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/source/index.rst
new/kiwi-1.3.2/docs/source/index.rst
--- old/kiwi-1.3.1/docs/source/index.rst 2020-11-02 03:14:28.000000000
+0100
+++ new/kiwi-1.3.2/docs/source/index.rst 2021-08-31 08:52:52.000000000
+0200
@@ -1,4 +1,4 @@
-.. kiwi documentation master file, created by
+.. kiwi documentation main file, created by
sphinx-quickstart on Mon Oct 29 21:48:45 2018.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/docs/source/use_cases/enaml.rst
new/kiwi-1.3.2/docs/source/use_cases/enaml.rst
--- old/kiwi-1.3.1/docs/source/use_cases/enaml.rst 2020-11-02
03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/docs/source/use_cases/enaml.rst 2021-08-31
08:52:52.000000000 +0200
@@ -47,7 +47,7 @@
container margins.
The base classes used a mixin to implement those behaviors are defined in:
-https://github.com/nucleic/enaml/blob/master/enaml/layout/constrainable.py
+https://github.com/nucleic/enaml/blob/main/enaml/layout/constrainable.py
Constraints definition
----------------------
@@ -59,7 +59,7 @@
To make constraints definition easier, Enaml relies on helpers function and
classes. In the following, we will focus on how horizontal and vertical boxes
-constraints are handled, by studing the following example in details:
+constraints are handled, by studying the following example in details:
.. image:: enaml_hbox.svg
@@ -94,12 +94,12 @@
For further details you can have a look at the source of the helpers described
in this section which can be found in the Enaml source:
-- spacers: https://github.com/nucleic/enaml/blob/master/enaml/layout/spacers.py
+- spacers: https://github.com/nucleic/enaml/blob/main/enaml/layout/spacers.py
- helpers:
- -
https://github.com/nucleic/enaml/blob/master/enaml/layout/layout_helpers.py
- -
https://github.com/nucleic/enaml/blob/master/enaml/layout/linear_box_helper.py
- -
https://github.com/nucleic/enaml/blob/master/enaml/layout/sequence_helper.py
+ - https://github.com/nucleic/enaml/blob/main/enaml/layout/layout_helpers.py
+ -
https://github.com/nucleic/enaml/blob/main/enaml/layout/linear_box_helper.py
+ -
https://github.com/nucleic/enaml/blob/main/enaml/layout/sequence_helper.py
Setting up the solver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/kiwi/shareddata.h
new/kiwi-1.3.2/kiwi/shareddata.h
--- old/kiwi-1.3.1/kiwi/shareddata.h 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/kiwi/shareddata.h 2021-08-31 08:52:52.000000000 +0200
@@ -7,6 +7,16 @@
|----------------------------------------------------------------------------*/
#pragma once
+/*
+Implementation note
+===================
+SharedDataPtr/SharedData offer the same basic functionality as std::shared_ptr,
+but do not use atomic counters under the hood.
+Since kiwi operates within a single thread context, atomic counters are not
necessary,
+especially given the extra CPU cost.
+Therefore the use of SharedDataPtr/SharedData is preferred over
std::shared_ptr.
+*/
+
namespace kiwi
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/py/expression.cpp
new/kiwi-1.3.2/py/expression.cpp
--- old/kiwi-1.3.1/py/expression.cpp 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/py/expression.cpp 2021-08-31 08:52:52.000000000 +0200
@@ -181,8 +181,8 @@
"unsupported operand type(s) for %s: "
"'%.100s' and '%.100s'",
pyop_str( op ),
- first->ob_type->tp_name,
- second->ob_type->tp_name
+ Py_TYPE( first )->tp_name,
+ Py_TYPE( second )->tp_name
);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/py/kiwisolver.cpp
new/kiwi-1.3.2/py/kiwisolver.cpp
--- old/kiwi-1.3.1/py/kiwisolver.cpp 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/py/kiwisolver.cpp 2021-08-31 08:52:52.000000000 +0200
@@ -9,7 +9,7 @@
#include <kiwi/kiwi.h>
#include "types.h"
-#define PY_KIWI_VERSION "1.3.1"
+#define PY_KIWI_VERSION "1.3.2"
namespace
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/py/term.cpp new/kiwi-1.3.2/py/term.cpp
--- old/kiwi-1.3.1/py/term.cpp 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/py/term.cpp 2021-08-31 08:52:52.000000000 +0200
@@ -159,8 +159,8 @@
"unsupported operand type(s) for %s: "
"'%.100s' and '%.100s'",
pyop_str( op ),
- first->ob_type->tp_name,
- second->ob_type->tp_name
+ Py_TYPE( first )->tp_name,
+ Py_TYPE( second )->tp_name
);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/py/variable.cpp
new/kiwi-1.3.2/py/variable.cpp
--- old/kiwi-1.3.1/py/variable.cpp 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/py/variable.cpp 2021-08-31 08:52:52.000000000 +0200
@@ -196,8 +196,8 @@
"unsupported operand type(s) for %s: "
"'%.100s' and '%.100s'",
pyop_str( op ),
- first->ob_type->tp_name,
- second->ob_type->tp_name
+ Py_TYPE( first )->tp_name,
+ Py_TYPE( second )->tp_name
);
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/releasenotes.rst
new/kiwi-1.3.2/releasenotes.rst
--- old/kiwi-1.3.1/releasenotes.rst 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/releasenotes.rst 2021-08-31 08:52:52.000000000 +0200
@@ -1,6 +1,11 @@
Kiwi Release Notes
==================
+Wrappers 1.3.2 | Solver 1.3.1 | 31/08/2021
+------------------------------------------
+- Add support for Python 3.10, drop official support Python 3.6 PR #103
+- Remove direct accesses to ob_type in C-API use Py_TYPE instead PR #103
+
Wrappers 1.3.1 | Solver 1.3.1 | 11/01/2020
------------------------------------------
- allow to avoid linking against VC2014_1 on windows PR #97
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi-1.3.1/setup.py new/kiwi-1.3.2/setup.py
--- old/kiwi-1.3.1/setup.py 2020-11-02 03:14:28.000000000 +0100
+++ new/kiwi-1.3.2/setup.py 2021-08-31 08:52:52.000000000 +0200
@@ -68,7 +68,7 @@
setup(
name='kiwisolver',
- version='1.3.1',
+ version='1.3.2',
author='The Nucleic Development Team',
author_email='[email protected]',
url='https://github.com/nucleic/kiwi',
@@ -80,13 +80,14 @@
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
- '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',
],
- python_requires='>=3.6',
+ python_requires='>=3.7',
setup_requires=['cppy>=1.1.0'],
ext_modules=ext_modules,
cmdclass={'build_ext': BuildExt},
