Skip to content

Commit

Permalink
Re-enable coveralls; stop trying 3.12 on Windows; tweak compile flags…
Browse files Browse the repository at this point in the history
… for S390.
  • Loading branch information
jamadden committed Jun 27, 2023
1 parent 201cdac commit 13d1ed1
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 15 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,11 @@ jobs:
uses: ./.github/actions/run-tests
with:
useCoverage: ${{ !startsWith(matrix.python-version, 'pypy') }}

- name: Coveralls Parallel
uses: coverallsapp/github-action@v2
with:
flag-name: run-${{ join(matrix.*, '-') }}
parallel: true
- name: Publish package to PyPI (mac)
# We cannot 'uses: pypa/gh-action-pypi-publish@v1.4.1' because
# that's apparently a container action, and those don't run on
Expand All @@ -213,6 +217,15 @@ jobs:
run: |
twine upload --skip-existing dist/*
coveralls-finish:
needs: test
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v2
with:
parallel-finished: true

manylinux:
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
everything less than 3.7.
- Add the "Requires Python" metadata to prevent installation on Python
< 3.7.
- The minimum supported version of MySQL is 5.3.3.
- Add support for Python 3.11.
- Bump tested database drivers to their latest versions, with the
exception of ``mysql-connector-python``; this driver is only tested
at version 8.0.31 as there are known incompatibilities with 8.0.32
(which is currently the latest version).


3.5.0 (2022-09-16)
Expand Down
11 changes: 6 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ environment:

# Fully supported 64-bit versions, with testing. This should be
# all the current (non EOL) versions.
- PYTHON: "C:\\Python312-x64"
PYTHON_VERSION: "3.12.0b3"
PYTHON_ARCH: "64"
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
# XXX: Cython 3.0b3 won't build us on 3.12 yet.
# - PYTHON: "C:\\Python312-x64"
# PYTHON_VERSION: "3.12.0b3"
# PYTHON_ARCH: "64"
# PYTHON_EXE: python
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

- PYTHON: "C:\\Python311-x64"
PYTHON_VERSION: "3.11.0"
Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Installation
==============

RelStorage 3.0 is supported on Python 2.7.9+, Python 3.6, 3.7,
3.8, and 3.9, as well as PyPy2 and PyPy 3 7.1 or later.
RelStorage 3.0 is supported on Python 3.7,
through 3.11, as well as PyPy3 3.9 or later.

.. seealso:: :doc:`supported-databases`

Expand Down
16 changes: 10 additions & 6 deletions scripts/releases/make-manylinux
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,21 @@ export CCACHE_DIR="/ccache"

GEVENT_WARNFLAGS="-Wno-strict-aliasing -Wno-comment -Wno-unused-value -Wno-unused-but-set-variable -Wno-sign-compare -Wno-parentheses -Wno-unused-function -Wno-tautological-compare -Wno-strict-prototypes -Wno-return-type -Wno-misleading-indentation"
OPTIMIZATION_FLAGS="-pipe"
if [ "$DOCKER_IMAGE" == "quay.io/pypa/manylinux2014_aarch64" -a -n "$GITHUB_ACTIONS" ] || [ "$DOCKER_IMAGE" == "quay.io/pypa/manylinux2014_ppc64le" -a -n "$GITHUB_ACTIONS" ] ; then
# Compiling with -Ofast is a no-go because of the regression it causes (#1864).
# The default settings have -O3, and adding -Os doesn't help much. So maybe -O1 will.
echo "Compiling with -O1"
OPTIMIZATION_FLAGS="-pipe -O1"
SLOW_BUILD=1
if [ -n "$GITHUB_ACTIONS" ]; then
if [ "$DOCKER_IMAGE" == "quay.io/pypa/manylinux2014_aarch64" ] || [ "$DOCKER_IMAGE" == "quay.io/pypa/manylinux2014_ppc64le" ] || [ "$DOCKER_IMAGE" == "quay.io/pypa/manylinux2014_s390x" ] || [ "$DOCKER_IMAGE" == "quay.io/pypa/musllinux_1_1_aarch64" ] ; then
# Compiling with -Ofast is a no-go because of the regression it causes (#1864).
# The default settings have -O3, and adding -Os doesn't help much. So maybe -O1 will.
echo "Compiling with -O1"
OPTIMIZATION_FLAGS="-pipe -O1"
SLOW_BUILD=1
fi
else
echo "Compiling with -O3"
OPTIMIZATION_FLAGS="-pipe -O3"
fi

export CFLAGS="$OPTIMIZATION_FLAGS $GEVENT_WARNFLAGS"
export CXXFLAGS="$CFLAGS"

if [ -d /RelStorage -a -d /opt/python ]; then
# Running inside docker
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ def read_file(*path):
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
# 3.12 pending Cython updates.
#"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Database",
Expand Down

0 comments on commit 13d1ed1

Please sign in to comment.