Skip to content

Commit

Permalink
- Drop python 3.6 and 3.7 and add python 3.11 and 3.12.
Browse files Browse the repository at this point in the history
- Update pageformat submodule.
- Minor fixes.
  • Loading branch information
mauvilsa committed Jan 19, 2024
1 parent 8e90446 commit 7b28bbe
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ replace = version = {new_version}
[bumpversion:file:py-pagexml/pagexml/__init__.py]

[bumpversion:file:py-textfeat/textfeat/__init__.py]

[bumpversion:file:py-pagexml/docker/Dockerfile_runtime.sh]
28 changes: 11 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ dockerbuild: &dockerbuild
paths: ./py-pagexml/dist/*.whl

jobs:
build-1804-py36:
docker:
- image: mauvilsa/pagexml:build-ubuntu18.04-py36
<<: *dockerbuild
build-2004-py38:
docker:
- image: mauvilsa/pagexml:build-ubuntu20.04-py38
Expand All @@ -27,16 +23,17 @@ jobs:
docker:
- image: mauvilsa/pagexml:build-ubuntu22.04-py310
<<: *dockerbuild
publish-pypi:
docker:
- image: mauvilsa/docker-twine:1.11.0
steps:
- attach_workspace:
at: .
- run:
name: "Publish Release on PyPI"
command: |
twine upload --repository-url "${PYPI_URL}" --username "${PYPI_USER}" --password "${PYPI_PASS}" ./py-pagexml/dist/*.whl
#publish-pypi:
# docker:
# - image: cimg/python:3.10
# steps:
# - attach_workspace:
# at: .
# - run:
# name: "Publish Release on PyPI"
# command: |
# pip3 install -U twine
# twine upload --repository-url "${PYPI_URL}" --username "${PYPI_USER}" --password "${PYPI_PASS}" ./py-pagexml/dist/*.whl
publish-github:
docker:
- image: cibuilds/github:0.12.0
Expand All @@ -59,8 +56,6 @@ workflows:
version: 2
main:
jobs:
- build-1804-py36:
<<: *tagfilter
- build-2004-py38:
<<: *tagfilter
- build-2204-py310:
Expand All @@ -75,6 +70,5 @@ workflows:
<<: *tagfilter
context: pagexml-context
requires:
- build-1804-py36
- build-2004-py38
- build-2204-py310
4 changes: 2 additions & 2 deletions .github/workflows/ci_build_test_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
git submodule update --init xsd/pageformat
git submodule update --init py-pagexml/lxml
cd py-pagexml
for ver in cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310; do
for ver in cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312; do
echo "=== Building wheel for $(/opt/python/$ver/bin/python3 --version) ==="
/opt/python/$ver/bin/pip3 install pkgconfig
/opt/python/$ver/bin/python3 setup.py bdist_wheel --slim
Expand All @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- name: Setup Python
uses: actions/setup-python@v2
Expand Down
4 changes: 0 additions & 4 deletions githook-pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ while [ "$n" -lt "${#FILES[@]}" ]; do
pylint --errors-only --extension-pkg-whitelist=cv2 "${FILES[$n]}";
[ "$?" != 0 ] && exit 1;
;;
.circleci/config.yml )
echo "${0##*/}: circleci config validate -c .circleci/config.yml" 1>&2;
circleci config validate -c .circleci/config.yml;
[ "$?" != 0 ] && exit 1;
esac
n=$((n+2));
done
Expand Down
2 changes: 1 addition & 1 deletion py-pagexml/docker/Dockerfile_runtime.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

PAGEXML_VERSION=2020.09.02
PAGEXML_VERSION=2022.04.12

docker build \
-f Dockerfile_runtime \
Expand Down
2 changes: 1 addition & 1 deletion xsd/pageformat

0 comments on commit 7b28bbe

Please sign in to comment.