[Git][debian-gis-team/fiona][master] 5 commits: New upstream version 1.8.12
Bas Couwenberg
gitlab at salsa.debian.org
Thu Dec 5 13:33:16 GMT 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / fiona
Commits:
f5abef86 by Bas Couwenberg at 2019-12-05T13:10:25Z
New upstream version 1.8.12
- - - - -
d45cf6bf by Bas Couwenberg at 2019-12-05T13:10:27Z
Update upstream source from tag 'upstream/1.8.12'
Update to upstream version '1.8.12'
with Debian dir 8f703acd0b776c8cc206a76b4ee23eb9044dc1a7
- - - - -
d8380ef7 by Bas Couwenberg at 2019-12-05T13:10:45Z
New upstream release.
- - - - -
85fae3c2 by Bas Couwenberg at 2019-12-05T13:12:07Z
Refresh patches.
- - - - -
22182da4 by Bas Couwenberg at 2019-12-05T13:12:16Z
Set distribution to unstable.
- - - - -
8 changed files:
- CHANGES.txt
- appveyor.yml
- debian/changelog
- debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
- debian/patches/0006-Remove-unknown-distribution-options.patch
- fiona/__init__.py
- requirements-dev.txt
- setup.py
Changes:
=====================================
CHANGES.txt
=====================================
@@ -3,6 +3,12 @@ Changes
All issue numbers are relative to https://github.com/Toblerity/Fiona/issues.
+1.8.12 (2019-12-04)
+-------------------
+
+- Specify Python versions for argparse, enum34, and ordereddict requirements
+ (#842).
+
1.8.11 (2019-11-07)
-------------------
=====================================
appveyor.yml
=====================================
@@ -11,42 +11,43 @@ environment:
# See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
GDAL_HOME: "C:\\gdal"
+ PYTHONWARNINGS: "ignore:DEPRECATION::pip._internal.cli.base_command"
matrix:
- PYTHON: "C:\\Python27-x64"
- PYTHON_VERSION: "2.7.14"
+ PYTHON_VERSION: "2.7"
PYTHON_ARCH: "64"
GDAL_VERSION: "1.11.4"
GIS_INTERNALS: "release-1800-x64-gdal-1-11-4-mapserver-6-4-3.zip"
GIS_INTERNALS_LIBS: "release-1800-x64-gdal-1-11-4-mapserver-6-4-3-libs.zip"
- PYTHON: "C:\\Python36-x64"
- PYTHON_VERSION: "3.6.4"
+ PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
GDAL_VERSION: "1.11.4"
GIS_INTERNALS: "release-1800-x64-gdal-1-11-4-mapserver-6-4-3.zip"
GIS_INTERNALS_LIBS: "release-1800-x64-gdal-1-11-4-mapserver-6-4-3-libs.zip"
- PYTHON: "C:\\Python36-x64"
- PYTHON_VERSION: "3.6.4"
+ PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
GDAL_VERSION: "2.2.3"
GIS_INTERNALS: "release-1911-x64-gdal-2-2-3-mapserver-7-0-7.zip"
GIS_INTERNALS_LIBS: "release-1911-x64-gdal-2-2-3-mapserver-7-0-7-libs.zip"
- PYTHON: "C:\\Python36-x64"
- PYTHON_VERSION: "3.6.4"
+ PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
- GDAL_VERSION: "2.3.0"
- GIS_INTERNALS: "release-1911-x64-gdal-2-3-0-mapserver-7-0-7.zip"
- GIS_INTERNALS_LIBS: "release-1911-x64-gdal-2-3-0-mapserver-7-0-7-libs.zip"
+ GDAL_VERSION: "2.3.3"
+ GIS_INTERNALS: "release-1911-x64-gdal-2-3-3-mapserver-7-2-1.zip"
+ GIS_INTERNALS_LIBS: "release-1911-x64-gdal-2-3-3-mapserver-7-2-1-libs.zip"
- PYTHON: "C:\\Python36-x64"
- PYTHON_VERSION: "3.6.4"
+ PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
- GDAL_VERSION: "2.4.0"
- GIS_INTERNALS: "release-1911-x64-gdal-2-4-0-mapserver-7-2-2.zip"
- GIS_INTERNALS_LIBS: "release-1911-x64-gdal-2-4-0-mapserver-7-2-2-libs.zip"
+ GDAL_VERSION: "2.4.2"
+ GIS_INTERNALS: "release-1911-x64-gdal-2-4-2-mapserver-7-4-0.zip"
+ GIS_INTERNALS_LIBS: "release-1911-x64-gdal-2-4-2-mapserver-7-4-0-libs.zip"
install:
@@ -70,17 +71,6 @@ install:
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-
- # https://code.google.com/p/pymat2/wiki/WindowsTips
- #- ps: (Get-Content "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat) | ForEach-Object { $_ -replace "vcvarsamd64.bat", "vcvars64.bat" } | Set-Content "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat
- # - '%CMD_IN_ENV% echo "conv env"'
- # - ps: 'ls "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin"'
- # - if "%platform%" == "x86" call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat"
- #- if "%platform%" == "x64" echo f | xcopy /f /y "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat" "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat"
- # - if "%platform%" == "x64" call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" amd64
- # - if "%platform%" == "x64" set WIN64_ARG="WIN64=YES"
-
-
- ps: mkdir C:\build | out-null
- ps: mkdir C:\gdal | out-null
@@ -99,9 +89,8 @@ install:
- cd C:\projects\fiona
# Upgrade to the latest version of pip to avoid it displaying warnings
# about it being out of date.
- # - "python -m pip install --disable-pip-version-check --user --upgrade pip"
-
- - pip --version
+ - cmd: python -m pip install --disable-pip-version-check --user --upgrade pip
+ - cmd: python -m pip --version
# Install the build dependencies of the project. If some dependencies contain
# compiled extensions and are not provided as pre-built wheel packages,
@@ -113,7 +102,6 @@ install:
build_script:
# Build the compiled extension
- cmd: echo %PATH%
-
- cmd: echo %PYTHONPATH%
# copy gisinternal gdal librarys into .libs
@@ -125,22 +113,19 @@ build_script:
# install the wheel
- ps: python -m pip install --upgrade pip
- - ps: python -m pip install (gci dist\*.whl | % { "$_" })
+ - ps: python -m pip install --no-deps --ignore-installed (gci dist\*.whl | % { "$_" })
+ - ps: python -m pip freeze
- ps: move fiona fiona.build
test_script:
# Run the project tests
- cmd: SET
-
+ - ps: python -m pip list
- ps: python -c "import fiona"
# Our Windows GDAL doesn't have iconv and can't support certain tests.
- - "%CMD_IN_ENV% python -m pytest -m \"not iconv\" --cov fiona --cov-report term-missing"
-
-matrix:
- allow_failures:
- - PYTHON_VERSION: "2.7.14"
+ - "%CMD_IN_ENV% python -m pytest -m \"not iconv and not wheel\" --cov fiona --cov-report term-missing"
artifacts:
- path: dist\*.whl
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+fiona (1.8.12-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Refresh patches.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 05 Dec 2019 14:12:08 +0100
+
fiona (1.8.11-1) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch
=====================================
@@ -9,7 +9,7 @@ There is already another package providing a binary "fio" (fio).
--- a/setup.py
+++ b/setup.py
-@@ -317,7 +317,7 @@ setup_args = dict(
+@@ -314,7 +314,7 @@ setup_args = dict(
packages=['fiona', 'fiona.fio'],
entry_points='''
[console_scripts]
=====================================
debian/patches/0006-Remove-unknown-distribution-options.patch
=====================================
@@ -6,7 +6,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
--- a/setup.py
+++ b/setup.py
-@@ -299,11 +299,8 @@ extras_require['all'] = list(set(it.chai
+@@ -296,11 +296,8 @@ extras_require['all'] = list(set(it.chai
setup_args = dict(
cmdclass={'sdist': sdist_multi_gdal},
=====================================
fiona/__init__.py
=====================================
@@ -102,7 +102,7 @@ import uuid
__all__ = ['bounds', 'listlayers', 'open', 'prop_type', 'prop_width']
-__version__ = "1.8.11"
+__version__ = "1.8.12"
__gdal_version__ = get_gdal_release_name()
gdal_version = get_gdal_version_tuple()
=====================================
requirements-dev.txt
=====================================
@@ -1,8 +1,9 @@
-r requirements.txt
-coverage==4.5.1
-cython==0.28.3
-pytest==3.4.2
-pytest-cov==2.5.1
+coverage==4.5.4
+cython==0.29.7
+mock ; python_version < '3.3'
+pytest==4.6.6
+pytest-cov==2.8.1
setuptools==39.0.1
boto3==1.9.19
wheel==0.31.1
=====================================
setup.py
=====================================
@@ -279,19 +279,16 @@ requirements = [
'cligj>=0.5',
'click-plugins>=1.0',
'six>=1.7',
- 'munch']
-
-if sys.version_info < (2, 7):
- requirements.append('argparse')
- requirements.append('ordereddict')
-
-if sys.version_info < (3, 4):
- requirements.append('enum34')
+ 'munch',
+ 'argparse; python_version <= "3.4"',
+ 'ordereddict; python_version <= "2.7"',
+ 'enum34; python_version < "3.4"'
+]
extras_require = {
'calc': ['shapely'],
's3': ['boto3>=1.2.4'],
- 'test': ['pytest>=3', 'pytest-cov', 'boto3>=1.2.4', 'mock; python_version<"3.4"']
+ 'test': ['pytest>=3', 'pytest-cov', 'boto3>=1.2.4', 'mock; python_version < "3.4"']
}
extras_require['all'] = list(set(it.chain(*extras_require.values())))
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/compare/a3516af202132d4c78c9b3478336b50e31ca7d31...22182da47899c7ae1f821f4967d056621c212965
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/compare/a3516af202132d4c78c9b3478336b50e31ca7d31...22182da47899c7ae1f821f4967d056621c212965
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/20191205/f7ef49d0/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list