[Git][debian-gis-team/pyosmium][master] 5 commits: New upstream version 3.4.1

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / pyosmium


Commits:
207c726f by Bas Couwenberg at 2022-07-28T09:56:13+02:00
New upstream version 3.4.1
- - - - -
edebcd70 by Bas Couwenberg at 2022-07-28T09:56:16+02:00
Update upstream source from tag 'upstream/3.4.1'

Update to upstream version '3.4.1'
with Debian dir 1af53bc4d8f724add11c269417bc79a6b904cc47
- - - - -
7c7be996 by Bas Couwenberg at 2022-07-28T09:56:33+02:00
New upstream release.

- - - - -
ba7df7c9 by Bas Couwenberg at 2022-07-28T09:57:16+02:00
Drop pybuild.patch, applied upstream.

- - - - -
d5f5d2f2 by Bas Couwenberg at 2022-07-28T09:58:53+02:00
Set distribution to unstable.

- - - - -


6 changed files:

- CHANGELOG.md
- debian/changelog
- − debian/patches/pybuild.patch
- − debian/patches/series
- doc/conf.py
- src/osmium/version.py


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -4,6 +4,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.4.1] - 2022-07-28
+
+### Fixed
+
+- allow building docs from built sources in PYTHONPATH again
+
+
 ## [3.4.0] - 2022-07-27
 
 ### Fixed


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pyosmium (3.4.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop pybuild.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 28 Jul 2022 09:58:44 +0200
+
 pyosmium (3.4.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/pybuild.patch deleted
=====================================
@@ -1,30 +0,0 @@
-Description: Also support pybuild directory for doc build.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/osmcode/pyosmium/pull/207
-Applied-Upstream: https://github.com/osmcode/pyosmium/commit/ee8908a1f6686802f5a5469dbfcfcdfc307e9307
-
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -28,11 +28,17 @@ if not os.path.exists(build_dir):
-     build_dir = "../build/lib.%s-%s" % (sysconfig.get_platform(),
-                                         sys.implementation.cache_tag)
-     if not os.path.exists(build_dir):
--        print("""
--            Compiled version of pyosmium not found, please build pyosmium for Python {}.{}
--            before building the documentation.
--            """.format(*sys.version_info))
--        raise RuntimeError("Cannot find pyosmium")
-+        # pybuild
-+        build_dir = "../.pybuild/cpython3_%s.%s_pyosmium/build" % (
-+            sys.version_info[0], sys.version_info[1]
-+        )
-+
-+        if not os.path.exists(build_dir):
-+            print("""
-+                Compiled version of pyosmium not found, please build pyosmium for Python {}.{}
-+                before building the documentation.
-+                """.format(*sys.version_info))
-+            raise RuntimeError("Cannot find pyosmium")
- 
- # insert after the current directory
- sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath('.'), build_dir)))


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


=====================================
doc/conf.py
=====================================
@@ -28,17 +28,25 @@ if not os.path.exists(build_dir):
     build_dir = "../build/lib.%s-%s" % (sysconfig.get_platform(),
                                         sys.implementation.cache_tag)
     if not os.path.exists(build_dir):
-        print("""
-            Compiled version of pyosmium not found, please build pyosmium for Python {}.{}
-            before building the documentation.
-            """.format(*sys.version_info))
-        raise RuntimeError("Cannot find pyosmium")
+        # pybuild
+        build_dir = "../.pybuild/cpython3_%s.%s_pyosmium/build" % (
+            sys.version_info[0], sys.version_info[1]
+        )
+
+if os.path.exists(build_dir):
+    sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath('.'), build_dir)))
 
 # insert after the current directory
-sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath('.'), build_dir)))
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath('.'), '../tools')))
 
-from osmium.version import pyosmium_major, pyosmium_release
+try:
+    from osmium.version import pyosmium_major, pyosmium_release
+except ImportError:
+    print("""
+        Compiled version of pyosmium not found, please build pyosmium for Python {}.{}
+        before building the documentation.
+        """.format(*sys.version_info))
+    raise RuntimeError("Cannot find pyosmium")
 
 # -- General configuration ------------------------------------------------
 


=====================================
src/osmium/version.py
=====================================
@@ -5,7 +5,7 @@ Version information.
 # the major version
 pyosmium_major = '3.4'
 # current release (Pip version)
-pyosmium_release = '3.4.0'
+pyosmium_release = '3.4.1'
 
 # libosmium version shipped with the Pip release
 libosmium_version = '2.18.0'



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/1b644d209c38c26689dd67d73b6a75c7707f2fba...d5f5d2f238cf61fba361b79a710922ca0df8f319

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/1b644d209c38c26689dd67d73b6a75c7707f2fba...d5f5d2f238cf61fba361b79a710922ca0df8f319
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/20220728/18972ecb/attachment-0001.htm>