[Git][debian-gis-team/python-deprecated][master] 7 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Jun 11 11:35:16 BST 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / python-deprecated
Commits:
2037127d by Bas Couwenberg at 2023-05-28T07:18:03+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
768f9e0f by Bas Couwenberg at 2023-05-28T07:18:28+02:00
New upstream version 1.2.14
- - - - -
0c7c13e4 by Bas Couwenberg at 2023-05-28T07:18:34+02:00
Update upstream source from tag 'upstream/1.2.14'
Update to upstream version '1.2.14'
with Debian dir ecd4ac556ae8654dd42adcd392537f782b79405e
- - - - -
f12862d9 by Bas Couwenberg at 2023-05-28T07:18:53+02:00
New upstream release.
- - - - -
6d94820f by Bas Couwenberg at 2023-05-28T07:20:40+02:00
Set distribution to experimental.
- - - - -
0a950a0b by Bas Couwenberg at 2023-06-11T12:27:48+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 2037127d8b5f541853e0a36e22cc0795c78cff4e.
- - - - -
d46f0acf by Bas Couwenberg at 2023-06-11T12:28:00+02:00
Move from experimental to unstable.
- - - - -
17 changed files:
- .bumpversion.cfg
- .github/workflows/codeql-analysis.yml
- .github/workflows/python-package.yml
- .packit.yml
- .travis.yml
- CHANGELOG.rst
- appveyor.yml
- debian/changelog
- deprecated/__init__.py
- deprecated/sphinx.py
- docs/source/_static/banner.png
- docs/source/conf.py
- pyproject.toml
- python-deprecated.spec
- setup.py
- tests/test_sphinx.py
- tox.ini
Changes:
=====================================
.bumpversion.cfg
=====================================
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.2.13
+current_version = 1.2.14
commit = True
tag = False
message = Prepare next version {new_version} (unreleased)
@@ -8,6 +8,10 @@ message = Prepare next version {new_version} (unreleased)
search = version='{current_version}'
replace = version='{new_version}'
+[bumpversion:file:appveyor.yml]
+search = version: {current_version}
+replace = version: {new_version}
+
[bumpversion:file:deprecated/__init__.py]
search = __version__ = "{current_version}"
replace = __version__ = "{new_version}"
=====================================
.github/workflows/codeql-analysis.yml
=====================================
@@ -39,7 +39,7 @@ jobs:
steps:
- name: Checkout repository
- uses: actions/checkout at v2
+ uses: actions/checkout at v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
=====================================
.github/workflows/python-package.yml
=====================================
@@ -10,41 +10,18 @@ on:
branches: [ master ]
jobs:
- pytest-py27-p35:
- runs-on: ${{ matrix.platform }}
-
+ pytest:
strategy:
matrix:
platform: [ ubuntu-latest, macos-latest, windows-latest ]
- python-version: [ 2.7, 3.5 ]
-
- steps:
- - uses: actions/checkout at v2
- - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python at v2
- with:
- python-version: ${{ matrix.python-version }}
- - name: Install dependencies
- run: |
- python -m pip install --upgrade 'pip < 21'
- python -m pip install 'PyTest < 5'
- python -m pip install -e .
- - name: Test with pytest
- run: |
- pytest tests/
+ python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ]
- pytest-py36-py39:
runs-on: ${{ matrix.platform }}
- strategy:
- matrix:
- platform: [ ubuntu-latest, macos-latest, windows-latest ]
- python-version: [ 3.6, 3.7, 3.8, 3.9 ]
-
steps:
- - uses: actions/checkout at v2
+ - uses: actions/checkout at v3
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python at v2
+ uses: actions/setup-python at v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -55,3 +32,4 @@ jobs:
- name: Test with pytest
run: |
pytest tests/
+
=====================================
.packit.yml
=====================================
@@ -15,3 +15,8 @@ jobs:
metadata:
targets:
- fedora-all
+
+srpm_build_deps:
+ - python3-pip
+ - python3-setuptools_scm
+
=====================================
.travis.yml
=====================================
@@ -1,31 +1,24 @@
+dist: focal
arch:
- amd64
- ppc64le
language: python
python:
- - "2.7"
- - "3.5"
- - "3.6"
- "3.7"
- "3.8"
- "3.9"
- - "3.10-dev" # 3.10 development branch
- - "pypy"
- - "pypy3"
+ - "3.10"
+ - "3.11"
+ - "3.12-dev" # development branch
+ - "pypy3.9-7.3.9"
jobs:
exclude:
- arch: ppc64le
- python: "2.7"
- - arch: ppc64le
- python: "pypy"
- - arch: ppc64le
- python: "pypy3"
- - arch: amd64
- python: "pypy"
-
+ python: "pypy3.9-7.3.9"
+
allow_failures:
- - python: "3.10-dev"
-
+ - python: "3.12-dev"
+
install:
- pip install coveralls tox-travis
script:
=====================================
CHANGELOG.rst
=====================================
@@ -18,6 +18,27 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
(only in comment or documentation).
+v1.2.14 (unreleased)
+====================
+
+Bug fix release
+
+Fix
+---
+
+- Fix #60: return a correctly dedented docstring when long docstring are using the D212 or D213 format.
+
+Other
+-----
+
+- Add support for Python 3.11.
+
+- Drop support for Python older than 3.7 in build systems like pytest and tox,
+ while ensuring the library remains production-compatible.
+
+- Update GitHub workflow to run in recent Python versions.
+
+
v1.2.13 (2021-09-05)
====================
=====================================
appveyor.yml
=====================================
@@ -1,29 +1,12 @@
-# What Python version is installed where:
-# http://www.appveyor.com/docs/installed-software#python
-
-version: 1.2.13.{build}
+# Deprecated's package version, sync with setup.py
+version: 1.2.14.{build}
+# Explicitly set base image to use
+image: Visual Studio 2022
environment:
matrix:
- # Python **2.6** and **3.3** are no more supported
- - PYTHON: "C:\\Python27"
- TOX_ENV: "py27"
-
- - PYTHON: "C:\\Python27-x64"
- TOX_ENV: "py27"
-
- - PYTHON: "C:\\Python35"
- TOX_ENV: "py35"
-
- - PYTHON: "C:\\Python35-x64"
- TOX_ENV: "py35"
-
- - PYTHON: "C:\\Python36"
- TOX_ENV: "py36"
-
- - PYTHON: "C:\\Python36-x64"
- TOX_ENV: "py36"
-
+ # What Python version is installed where:
+ # https://www.appveyor.com/docs/windows-images-software/#python
- PYTHON: "C:\\Python37"
TOX_ENV: "py37"
@@ -36,6 +19,24 @@ environment:
- PYTHON: "C:\\Python38-x64"
TOX_ENV: "py38"
+ - PYTHON: "C:\\Python39"
+ TOX_ENV: "py39"
+
+ - PYTHON: "C:\\Python39-x64"
+ TOX_ENV: "py39"
+
+ - PYTHON: "C:\\Python310"
+ TOX_ENV: "py310"
+
+ - PYTHON: "C:\\Python310-x64"
+ TOX_ENV: "py310"
+
+ - PYTHON: "C:\\Python311"
+ TOX_ENV: "py311"
+
+ - PYTHON: "C:\\Python311-x64"
+ TOX_ENV: "py311"
+
init:
- set PATH=%PYTHON%;%PYTHON%\Scripts;C:\MinGW\msys\1.0\bin;%PATH%
- "git config --system http.sslcainfo \"C:\\Program Files\\Git\\mingw64\\ssl\\certs\\ca-bundle.crt\""
=====================================
debian/changelog
=====================================
@@ -1,8 +1,15 @@
-python-deprecated (1.2.13-4) UNRELEASED; urgency=medium
+python-deprecated (1.2.14-1) unstable; urgency=medium
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 11 Jun 2023 12:27:52 +0200
+
+python-deprecated (1.2.14-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
* Bump Standards-Version to 4.6.2, no changes.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 18 Jan 2023 17:15:32 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 28 May 2023 07:20:28 +0200
python-deprecated (1.2.13-3) unstable; urgency=medium
=====================================
deprecated/__init__.py
=====================================
@@ -7,9 +7,9 @@ Python ``@deprecated`` decorator to deprecate old python classes, functions or m
"""
-__version__ = "1.2.13"
+__version__ = "1.2.14"
__author__ = u"Laurent LAPORTE <tantale.solutions at gmail.com>"
-__date__ = "2021-09-05"
+__date__ = "unreleased"
__credits__ = "(c) Laurent LAPORTE"
from deprecated.classic import deprecated
=====================================
deprecated/sphinx.py
=====================================
@@ -118,7 +118,11 @@ class SphinxAdapter(ClassicAdapter):
div_lines.append("")
# -- get the docstring, normalize the trailing newlines
- docstring = textwrap.dedent(wrapped.__doc__ or "")
+ # keep a consistent behaviour if the docstring starts with newline or directly on the first one
+ docstring = wrapped.__doc__ or ""
+ lines = docstring.splitlines(keepends=True) or [""]
+ docstring = textwrap.dedent("".join(lines[1:])) if len(lines) > 1 else ""
+ docstring = lines[0] + docstring
if docstring:
# An empty line must separate the original docstring and the directive.
docstring = re.sub(r"\n+$", "", docstring, flags=re.DOTALL) + "\n\n"
=====================================
docs/source/_static/banner.png
=====================================
Binary files a/docs/source/_static/banner.png and b/docs/source/_static/banner.png differ
=====================================
docs/source/conf.py
=====================================
@@ -61,7 +61,7 @@ author = 'Marcos CARDOSO & Laurent LAPORTE'
# built documents.
#
# The full version, including alpha/beta/rc tags.
-release = "1.2.13"
+release = "1.2.14"
# The short X.Y version.
version = release.rpartition('.')[0]
=====================================
pyproject.toml
=====================================
@@ -1,7 +1,7 @@
[tool.black]
line-length = 120
skip-string-normalization = true
-target-version = ['py27', 'py34', 'py35', 'py36', 'py37', 'py38']
+target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
include = '\.pyi?$'
[tool.isort]
=====================================
python-deprecated.spec
=====================================
@@ -2,7 +2,7 @@
%global pkgname deprecated
Name: python-%{pkgname}
-Version: 1.2.13
+Version: 1.2.14
Release: 1%{?dist}
Summary: Python decorator to deprecate old python classes, functions or methods
License: MIT
=====================================
setup.py
=====================================
@@ -143,7 +143,7 @@ from setuptools import setup
setup(
name='Deprecated',
- version='1.2.13',
+ version='1.2.14',
url='https://github.com/tantale/deprecated',
project_urls={
"Documentation": "https://deprecated.readthedocs.io/en/latest/",
@@ -178,24 +178,18 @@ setup(
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
- # 'Programming Language :: Python :: 3.10', # scheduled on 2021-10-04
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
+ 'Programming Language :: Python :: 3.12',
'Topic :: Software Development :: Libraries :: Python Modules',
],
extras_require={
'dev': [
'tox',
- 'PyTest ; python_version >= "3.6"',
- 'PyTest < 5 ; python_version < "3.6"',
- 'PyTest-Cov ; python_version >= "3.6"',
- 'PyTest-Cov < 2.6 ; python_version < "3.6"',
+ 'PyTest',
+ 'PyTest-Cov',
'bump2version < 1',
'sphinx < 2',
- # Python 2.7 EOL:
- 'importlib-metadata < 3 ; python_version < "3"',
- 'importlib-resources < 4 ; python_version < "3"',
- 'configparser < 5 ; python_version < "3"',
- 'sphinxcontrib-websupport < 2 ; python_version < "3"',
- 'zipp < 2 ; python_version < "3"',
]
},
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
=====================================
tests/test_sphinx.py
=====================================
@@ -19,12 +19,18 @@ import deprecated.sphinx
"""
This function adds *x* and *y*.
+ :param x: number *x*
+ :param y: number *y*
+ :return: sum = *x* + *y*
+ """,
+ """This function adds *x* and *y*.
+
:param x: number *x*
:param y: number *y*
:return: sum = *x* + *y*
""",
],
- ids=["no_docstring", "short_docstring", "long_docstring"],
+ ids=["no_docstring", "short_docstring", "D213_long_docstring", "D212_long_docstring"],
)
def docstring(request):
return request.param
=====================================
tox.ini
=====================================
@@ -8,32 +8,31 @@
[tox]
# PyPy configuration (on Linux/OSX):
-# - /usr/local/bin/pypy -> /opt/pypy2.7-v7.3.0-osx64/bin/pypy
# - /usr/local/bin/pypy3 -> /opt/pypy3.6-v7.3.0-osx64/bin/pypy3
envlist =
- py{27,34,35,36,37,38,39,310}-wrapt{1.10,1.11,1.12,1.13}
- pypy, pypy3
+ py{37,38,39,310}-wrapt{1.10,1.11,1.12,1.13,1.14}
+ py{311,312}-wrapt{1.14}
+ pypy3
docs
[testenv]
commands = pytest --cov-report term-missing --cov=deprecated tests/
deps =
- py27,py34,py35: pip >= 9.0.3, < 21
- py27,py34: PyTest < 5
- py35,py36,py37,py38,py39,pypy,pypy3: PyTest
- py27,py34: PyTest-Cov < 2.6
- py34: typing # required by pytest->attrs
- py35,py36,py37,py38,py39,py310,pypy,pypy3: PyTest-Cov
+ py{37,38,39,310,311,312,py3}: PyTest
+ py{37,38,39,310,311,312,py3}: PyTest-Cov
wrapt1.10: wrapt ~= 1.10.0
wrapt1.11: wrapt ~= 1.11.0
wrapt1.12: wrapt ~= 1.12.0
- wrapt1.13: wrapt == 1.13.0rc3
- coverage < 5
+ wrapt1.13: wrapt ~= 1.13.0
+ wrapt1.14: wrapt ~= 1.14.0
+ coverage
[testenv:docs]
basepython = python
+# jinja2 3.0.3 was the last version to have contextfunction that sphinx 1.x needs
deps =
sphinx < 2
+ jinja2 == 3.0.3
commands =
sphinx-build -b html -d {envtmpdir}/doctrees docs/source/ {envtmpdir}/html
sphinx-build -b epub -d {envtmpdir}/doctrees docs/source/ {envtmpdir}/epub
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-deprecated/-/compare/624bf4debc3999fcd0901912d7ef13160a6dc560...d46f0acfd869b26b5ee4b2c911cf37e808a907fe
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-deprecated/-/compare/624bf4debc3999fcd0901912d7ef13160a6dc560...d46f0acfd869b26b5ee4b2c911cf37e808a907fe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230611/d41e0c0d/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list