summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2022-09-09 18:05:42 +0300
committerMarius Gedminas <marius@gedmin.as>2022-09-09 18:05:42 +0300
commitdc2e4b9841185889bdf8b77ee5c28f5b7295578a (patch)
treef4d23c5d1f93706a029880baea4c0550a4478479
parent22a761cc9e6fcfa840582d55a15abda31a9dd2e1 (diff)
downloadzope-interface-dc2e4b9841185889bdf8b77ee5c28f5b7295578a.tar.gz
Revert "Update to the latest c-code template"
This reverts commit 22a761cc9e6fcfa840582d55a15abda31a9dd2e1. This was not supposed to have been pushed directly to master :/
-rw-r--r--.github/workflows/tests.yml15
-rw-r--r--.meta.toml2
-rw-r--r--src/zope/interface/tests/test_compile_flags.py29
-rw-r--r--tox.ini3
4 files changed, 10 insertions, 39 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 966cf9b..3c3f9a0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -61,8 +61,8 @@ env:
PIP_NO_PYTHON_VERSION_WARNING: 1
PIP_NO_WARN_SCRIPT_LOCATION: 1
- CFLAGS: -O3 -pipe
- CXXFLAGS: -O3 -pipe
+ CFLAGS: -Ofast -pipe
+ CXXFLAGS: -Ofast -pipe
# Uploading built wheels for releases.
# TWINE_PASSWORD is encrypted and stored directly in the
# github repo settings.
@@ -91,7 +91,6 @@ jobs:
# Sigh. Note that the matrix must be kept in sync
# with `test`, and `docs` must use a subset.
runs-on: ${{ matrix.os }}
- if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
strategy:
fail-fast: false
matrix:
@@ -105,7 +104,7 @@ jobs:
- "3.8"
- "3.9"
- "3.10"
- - "3.11.0-rc.1"
+ - "3.11.0-beta.4"
os: [ubuntu-20.04, macos-latest]
exclude:
- os: macos-latest
@@ -154,8 +153,8 @@ jobs:
pip install -U pip
pip install -U setuptools wheel twine cffi
- - name: Build zope.interface (3.11.0-rc.1)
- if: ${{ startsWith(matrix.python-version, '3.11.0-rc.1') }}
+ - name: Build zope.interface (3.11.0-beta.4)
+ if: ${{ startsWith(matrix.python-version, '3.11.0-beta.4') }}
run: |
# Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
# output (pip install uses a random temporary directory, making this difficult).
@@ -210,7 +209,7 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
- && !startsWith(matrix.python-version, '3.11.0-rc.1')
+ && !startsWith(matrix.python-version, '3.11.0-beta.4')
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
@@ -232,7 +231,7 @@ jobs:
- "3.8"
- "3.9"
- "3.10"
- - "3.11.0-rc.1"
+ - "3.11.0-beta.4"
os: [ubuntu-20.04, macos-latest]
exclude:
- os: macos-latest
diff --git a/.meta.toml b/.meta.toml
index b46afac..0d0ec7d 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
-commit-id = "a07c82b7813de1e000863e1d01058e417bc4b33d"
+commit-id = "fe41b5a5937ad36d26b62be91d884b7530ec012f"
[python]
with-appveyor = true
diff --git a/src/zope/interface/tests/test_compile_flags.py b/src/zope/interface/tests/test_compile_flags.py
deleted file mode 100644
index 3455c44..0000000
--- a/src/zope/interface/tests/test_compile_flags.py
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2022 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-import struct
-import unittest
-
-import zope.interface # noqa: try to load a C module for side effects
-
-
-class TestFloatingPoint(unittest.TestCase):
-
- def test_no_fast_math_optimization(self):
- # Building with -Ofast enables -ffast-math, which sets certain FPU
- # flags that can cause breakage elsewhere. A library such as BTrees
- # has no business changing global FPU flags for the entire process.
- zero_bits = struct.unpack("!Q", struct.pack("!d", 0.0))[0]
- next_up = zero_bits + 1
- smallest_subnormal = struct.unpack("!d", struct.pack("!Q", next_up))[0]
- self.assertNotEqual(smallest_subnormal, 0.0)
diff --git a/tox.ini b/tox.ini
index 25dd60c..942ad84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,8 @@ envlist =
usedevelop = true
pip_pre = py311: true
deps =
- Sphinx
+ # repoze.sphinx.autointerface does not yet support Sphinx >= 5:
+ Sphinx < 5
setenv =
pure: PURE_PYTHON=1
!pure-!pypy-!pypy3: PURE_PYTHON=0