[Git][debian-gis-team/python-pyproj][experimental] 5 commits: New upstream version 3.4.0~rc2

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Fri Sep 9 05:57:39 BST 2022



Bas Couwenberg pushed to branch experimental at Debian GIS Project / python-pyproj


Commits:
37c8049e by Bas Couwenberg at 2022-09-09T06:37:13+02:00
New upstream version 3.4.0~rc2
- - - - -
a10d3fbc by Bas Couwenberg at 2022-09-09T06:37:18+02:00
Update upstream source from tag 'upstream/3.4.0_rc2'

Update to upstream version '3.4.0~rc2'
with Debian dir 8684c7b3f4cc9be96568252f4eed6efa5038ab19
- - - - -
ec46e337 by Bas Couwenberg at 2022-09-09T06:39:11+02:00
New upstream release candidate.

- - - - -
5e89b8cf by Bas Couwenberg at 2022-09-09T06:40:22+02:00
Drop setuptools.patch, applied upstream.

- - - - -
d58f2e14 by Bas Couwenberg at 2022-09-09T06:40:45+02:00
Set distribution to experimental.

- - - - -


7 changed files:

- debian/changelog
- − debian/patches/series
- − debian/patches/setuptools.patch
- docs/conf.py
- pyproj/_show_versions.py
- pyproject.toml
- + setup.cfg


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-pyproj (3.4.0~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop setuptools.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 09 Sep 2022 06:40:27 +0200
+
 python-pyproj (3.4.0~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-setuptools.patch


=====================================
debian/patches/setuptools.patch deleted
=====================================
@@ -1,61 +0,0 @@
-Description: Reinstate setup.cfg.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/pyproj4/pyproj/discussions/1134#discussioncomment-3588912
-
---- /dev/null
-+++ b/setup.cfg
-@@ -0,0 +1,54 @@
-+[metadata]
-+name = pyproj
-+version = 3.4.0rc1
-+description = Python interface to PROJ (cartographic projections and coordinate transformations library)
-+long_description = file: README.md
-+long_description_content_type = text/markdown
-+author = Jeff Whitaker
-+author_email = jeffrey.s.whitaker at noaa.gov
-+license = MIT
-+license_file = LICENSE
-+platform = any
-+keywords = GIS, map, geospatial, coordinate-systems, coordinate-transformation, cartographic-projection, geodesic
-+classifiers =
-+    Development Status :: 4 - Beta
-+    Intended Audience :: Science/Research
-+    License :: OSI Approved :: MIT License
-+    Operating System :: OS Independent
-+    Programming Language :: Python
-+    Programming Language :: Python :: 3.8
-+    Programming Language :: Python :: 3.9
-+    Programming Language :: Python :: 3.10
-+    Programming Language :: Python :: 3.11
-+    Programming Language :: Python :: 3 :: Only
-+    Topic :: Scientific/Engineering
-+    Topic :: Scientific/Engineering :: GIS
-+    Topic :: Scientific/Engineering :: Mathematics
-+    Topic :: Software Development :: Libraries :: Python Modules
-+    Typing :: Typed
-+url = https://github.com/pyproj4/pyproj
-+download_url = http://python.org/pypi/pyproj
-+project_urls =
-+    Documentation = https://pyproj4.github.io/pyproj/
-+    Release Notes = https://pyproj4.github.io/pyproj/stable/history.html
-+    Bug Tracker = https://github.com/pyproj4/pyproj/issues
-+    Source Code = https://github.com/pyproj4/pyproj
-+
-+[options]
-+zip_safe = False # https://mypy.readthedocs.io/en/stable/installed_packages.html
-+packages = pyproj,pyproj.crs
-+python_requires = >=3.8
-+install_requires =
-+    certifi
-+
-+[options.entry_points]
-+console_scripts =
-+    pyproj = pyproj.__main__:main
-+
-+[flake8]
-+max-line-length = 88
-+ignore =
-+    C408 # Unnecessary dict/list/tuple call - rewrite as a literal
-+    E203 # whitespace before ':' - doesn't work well with black
-+    E225 # missing whitespace around operator - let black worry about that
-+    W503 # line break occurred before a binary operator - let black worry about that


=====================================
docs/conf.py
=====================================
@@ -1,4 +1,5 @@
-from importlib.metadata import version as pkg_version
+import importlib.metadata
+import os
 
 # Sphinx extensions
 extensions = [
@@ -35,7 +36,7 @@ project = "pyproj"
 copyright = "2006-2018, Jeffrey Whitaker; 2019-2022, Open source contributors"
 author = "Jeffrey Whitaker"
 
-version = release = pkg_version("pyproj")
+version = release = importlib.metadata.version("pyproj")
 
 exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", "**.ipynb_checkpoints"]
 
@@ -51,7 +52,7 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "furo"
+html_theme = os.getenv("PYPROJ_HTML_THEME", "furo")
 html_logo = "media/logo.png"
 html_favicon = "media/icon.png"
 


=====================================
pyproj/_show_versions.py
=====================================
@@ -4,7 +4,7 @@ Utility methods to print system info for debugging
 adapted from :func:`sklearn.utils._show_versions`
 which was adapted from :func:`pandas.show_versions`
 """
-import importlib
+import importlib.metadata
 import platform
 import sys
 
@@ -85,24 +85,11 @@ def _get_deps_info():
 
     def get_version(module):
         try:
-            return module.__version__
-        except AttributeError:
-            return module.version
+            return importlib.metadata.version(module)
+        except importlib.metadata.PackageNotFoundError:
+            return None
 
-    deps_info = {}
-
-    for modname in deps:
-        try:
-            if modname in sys.modules:
-                mod = sys.modules[modname]
-            else:
-                mod = importlib.import_module(modname)
-            ver = get_version(mod)
-            deps_info[modname] = ver
-        except ImportError:
-            deps_info[modname] = None
-
-    return deps_info
+    return {dep: get_version(dep) for dep in deps}
 
 
 def _print_info_dict(info_dict):


=====================================
pyproject.toml
=====================================
@@ -2,60 +2,5 @@
 requires = ["setuptools>=61.0.0", "wheel", "cython>=0.28.4"]
 build-backend = "setuptools.build_meta"
 
-[project]
-name = "pyproj"
-version = "3.4.0rc1"
-description = "Python interface to PROJ (cartographic projections and coordinate transformations library)"
-readme = "README.md"
-authors = [
-    {name = "Jeff Whitaker", email = "jeffrey.s.whitaker at noaa.gov"},
-]
-license = {file = "LICENSE"}
-keywords = [
-    "GIS",
-    "map",
-    "geospatial",
-    "coordinate-systems",
-    "coordinate-transformation",
-    "cartographic-projection",
-    "geodesic",
-]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3 :: Only",
-    "Topic :: Scientific/Engineering",
-    "Topic :: Scientific/Engineering :: GIS",
-    "Topic :: Scientific/Engineering :: Mathematics",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Typing :: Typed",
-]
-requires-python = ">=3.8"
-dependencies = [
-    "certifi",
-]
-
-[project.urls]
-homepage = "https://pyproj4.github.io/pyproj/"
-documentation = "https://pyproj4.github.io/pyproj/"
-repository = "https://github.com/pyproj4/pyproj"
-changelog = "https://pyproj4.github.io/pyproj/stable/history.html"
-
-[project.scripts]
-pyproj = "pyproj.__main__:main"
-
-[tool.setuptools.packages.find]
-include = [
-    "pyproj",
-    "pyproj.*",
-]
-
 [tool.black]
 target_version = ["py38"]


=====================================
setup.cfg
=====================================
@@ -0,0 +1,53 @@
+[metadata]
+name = pyproj
+version = 3.4.0rc2
+description = Python interface to PROJ (cartographic projections and coordinate transformations library)
+long_description = file: README.md
+long_description_content_type = text/markdown
+author = Jeff Whitaker
+author_email = jeffrey.s.whitaker at noaa.gov
+license = MIT
+license_file = LICENSE
+platform = any
+keywords = GIS, map, geospatial, coordinate-systems, coordinate-transformation, cartographic-projection, geodesic
+classifiers =
+    Development Status :: 4 - Beta
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Programming Language :: Python
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3 :: Only
+    Topic :: Scientific/Engineering
+    Topic :: Scientific/Engineering :: GIS
+    Topic :: Scientific/Engineering :: Mathematics
+    Topic :: Software Development :: Libraries :: Python Modules
+    Typing :: Typed
+url = https://github.com/pyproj4/pyproj
+download_url = http://python.org/pypi/pyproj
+project_urls =
+    Documentation = https://pyproj4.github.io/pyproj/
+    Release Notes = https://pyproj4.github.io/pyproj/stable/history.html
+    Bug Tracker = https://github.com/pyproj4/pyproj/issues
+    Source Code = https://github.com/pyproj4/pyproj
+
+[options]
+zip_safe = False # https://mypy.readthedocs.io/en/stable/installed_packages.html
+packages = pyproj,pyproj.crs
+python_requires = >=3.8
+install_requires =
+    certifi
+
+[options.entry_points]
+console_scripts =
+    pyproj = pyproj.__main__:main
+
+[flake8]
+max-line-length = 88
+ignore =
+    C408 # Unnecessary dict/list/tuple call - rewrite as a literal
+    E203 # whitespace before ':' - doesn't work well with black
+    E225 # missing whitespace around operator - let black worry about that
+    W503 # line break occurred before a binary operator - let black worry about that



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/compare/87a07affe9761e1fecfead089a4ff18eac6be445...d58f2e143e6f4439710b938b52fe0c37f8e80f56

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-pyproj/-/compare/87a07affe9761e1fecfead089a4ff18eac6be445...d58f2e143e6f4439710b938b52fe0c37f8e80f56
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/20220909/7117f516/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list