Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
voisardf committed Jul 3, 2024
2 parents d667506 + a875ff3 commit 46444b5
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Check style (lint)
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: sudo rm /etc/apt/sources.list.d/*.list
- run: sudo apt update
- run: sudo apt-get install libpq-dev
Expand All @@ -18,7 +18,7 @@ jobs:
name: Check style (git-attributes)
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: sudo rm /etc/apt/sources.list.d/*.list
- run: sudo apt update
- run: sudo apt-get install libpq-dev
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- '3.11'
- '3.12'
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Set up Python v${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
Expand All @@ -78,7 +78,7 @@ jobs:
name: Check federal data definitions
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: sudo rm /etc/apt/sources.list.d/*.list
- run: sudo apt update
- run: sudo apt-get install xsltproc
Expand All @@ -95,7 +95,7 @@ jobs:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Make documentation
run: |
sudo rm /etc/apt/sources.list.d/*.list
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/daily_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Check federal data definitions
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: sudo rm /etc/apt/sources.list.d/*.list
- run: sudo apt update
- run: sudo apt-get install xsltproc
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- python3.11
- python3.12
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- run: sudo rm /etc/apt/sources.list.d/*.list
- run: sudo apt update
- run: sudo apt-get install libpq-dev
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

2.5.1
-----
- Library upgrades (SQLAlchemy, shapely, geoalchemy2, responses, urllib3, lxml)

2.5.0
-----
- Use ST_DWithin instead of ST_Distance for performance reasons (#1930)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.3-bullseye
FROM python:3.12.4-bullseye

ENV DEBIAN_FRONTEND=noninteractive

Expand Down
6 changes: 6 additions & 0 deletions doc/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Changes/Hints for migration
This chapter will give you hints on how to handle version migration, in particular regarding what you may need
to adapt in your project configuration, database etc. when upgrading to a new version.

Version 2.5.1
-------------
Maintenance release:

* Library upgrades (SQLAlchemy, shapely, geoalchemy2, responses, urllib3, lxml)

Version 2.5.0
-------------
Performance optimization release:
Expand Down
16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "pyramid_oereb"
version = "2.5.0"
version = "2.5.1"
description = "pyramid_oereb, extension for pyramid web frame work to provide a basic server part for the oereb project"

classifiers=[
Expand Down Expand Up @@ -43,13 +43,13 @@ recommend = [
"qrcode==7.4.2",
"image==1.5.33",
"shapely==2.0.4",
"SQLAlchemy==2.0.30",
"SQLAlchemy==2.0.31",
"pyaml-env==1.2.1",
"urllib3==2.2.1",
"urllib3==2.2.2",
"waitress==3.0.0",
"pyreproj==3.0.0",
"mako-render==0.1.0",
"requests==2.32.2",
"requests==2.32.3",
"geolink-formatter==2.0.5",
"pyconizer==0.1.4",
"c2cwsgiutils[standard]==6.0.8"]
Expand All @@ -75,18 +75,18 @@ no-version = [
testing = [
"jsonschema==4.22.0",
"lxml==5.2.2",
"pytest==8.2.1",
"pytest==8.2.2",
"pytest-cov==5.0.0",
"pytest-ordering==0.6",
"requests-mock==1.12.1",
"responses==0.25.0",
"responses==0.25.3",
"webtest==3.0.0",
"pillow==10.3.0"]
dev = [
"flake8==7.0.0",
"flake8==7.1.0",
"Flake8-pyproject==1.2.3",
"pyflakes==3.2.0",
"pycodestyle==2.11.1",
"pycodestyle==2.12.0",
"Sphinx==7.3.7",
"sphinx_rtd_theme==2.0.0",
"psycopg2==2.9.9",
Expand Down

0 comments on commit 46444b5

Please sign in to comment.