lazr.restful

Merge lp:~cjwatson/lazr.restful/faster-version into lp:lazr.restful

  1. faster-version
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 303
Proposed branch: lp:~cjwatson/lazr.restful/faster-version
Merge into: lp:lazr.restful
Diff against target: 88 lines (+17/-9)
4 files modified
NEWS.rst (+6/-0)
setup.py (+2/-3)
src/lazr/restful/__init__.py (+6/-2)
src/lazr/restful/docs/conf.py (+3/-4)
To merge this branch: bzr merge lp:~cjwatson/lazr.restful/faster-version
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+408469@code.launchpad.net

Commit message

Adjust versioning strategy to avoid importing pkg_resources, which is slow in large environments.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS.rst'
--- NEWS.rst 2021-05-20 21:34:13 +0000
+++ NEWS.rst 2021-09-13 09:28:50 +0000
@@ -2,6 +2,12 @@
2NEWS for lazr.restful2NEWS for lazr.restful
3=====================3=====================
44
51.0.4
6=====
7
8- Adjust versioning strategy to avoid importing pkg_resources, which is slow
9 in large environments.
10
51.0.3 (2021-05-20)111.0.3 (2021-05-20)
6==================12==================
713
814
=== modified file 'setup.py'
--- setup.py 2021-02-16 16:51:35 +0000
+++ setup.py 2021-09-13 09:28:50 +0000
@@ -32,11 +32,9 @@
32 return '\n'.join(res)32 return '\n'.join(res)
33# end generic helpers33# end generic helpers
3434
35__version__ = open("src/lazr/restful/version.txt").read().strip()
36
37setup(35setup(
38 name='lazr.restful',36 name='lazr.restful',
39 version=__version__,37 version='1.0.4',
40 namespace_packages=['lazr'],38 namespace_packages=['lazr'],
41 packages=find_packages('src'),39 packages=find_packages('src'),
42 package_dir={'':'src'},40 package_dir={'':'src'},
@@ -52,6 +50,7 @@
52 install_requires=[50 install_requires=[
53 'docutils>=0.3.9',51 'docutils>=0.3.9',
54 'grokcore.component>=1.6',52 'grokcore.component>=1.6',
53 'importlib-metadata; python_version < "3.8"',
55 'lazr.batchnavigator>=1.2.0-dev',54 'lazr.batchnavigator>=1.2.0-dev',
56 'lazr.delegates>=2.0.3',55 'lazr.delegates>=2.0.3',
57 'lazr.enum',56 'lazr.enum',
5857
=== modified file 'src/lazr/restful/__init__.py'
--- src/lazr/restful/__init__.py 2020-02-04 11:52:59 +0000
+++ src/lazr/restful/__init__.py 2021-09-13 09:28:50 +0000
@@ -19,8 +19,12 @@
1919
20from __future__ import absolute_import, print_function20from __future__ import absolute_import, print_function
2121
22import pkg_resources22try:
23__version__ = pkg_resources.resource_string("lazr.restful", "version.txt").strip()23 import importlib.metadata as importlib_metadata
24except ImportError:
25 import importlib_metadata
26
27__version__ = importlib_metadata.version("lazr.restful")
2428
25# Re-export in such a way that __version__ can still be imported if29# Re-export in such a way that __version__ can still be imported if
26# dependencies are not yet available.30# dependencies are not yet available.
2731
=== modified file 'src/lazr/restful/docs/conf.py'
--- src/lazr/restful/docs/conf.py 2019-11-04 09:54:43 +0000
+++ src/lazr/restful/docs/conf.py 2021-09-13 09:28:50 +0000
@@ -12,8 +12,7 @@
12# All configuration values have a default; values that are commented out12# All configuration values have a default; values that are commented out
13# serve to show the default.13# serve to show the default.
1414
15with open('../version.txt') as version_file:15from lazr.restful import __version__
16 _version = version_file.read().strip()
1716
18# If extensions (or modules to document with autodoc) are in another directory,17# If extensions (or modules to document with autodoc) are in another directory,
19# add these directories to sys.path here. If the directory is relative to the18# add these directories to sys.path here. If the directory is relative to the
@@ -57,9 +56,9 @@
57# built documents.56# built documents.
58#57#
59# The short X.Y version.58# The short X.Y version.
60version = _version59version = __version__
61# The full version, including alpha/beta/rc tags.60# The full version, including alpha/beta/rc tags.
62release = _version61release = __version__
6362
64# The language for content autogenerated by Sphinx. Refer to documentation63# The language for content autogenerated by Sphinx. Refer to documentation
65# for a list of supported languages.64# for a list of supported languages.
6665
=== removed file 'src/lazr/restful/version.txt'

Subscribers

People subscribed via source and target branches