Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions launchable/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pkg_resources import DistributionNotFound, get_distribution
from importlib_metadata import PackageNotFoundError, version

try:
__version__ = get_distribution("launchable").version
except DistributionNotFound:
__version__ = version("launchable")
except PackageNotFoundError:
# package is not installed
pass
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ install_requires =
more_itertools>=7.1.0;python_version>='3.6'
python-dateutil
tabulate
importlib-metadata
python_requires = >=3.6
setup_requires =
setuptools-scm
Expand Down
6 changes: 3 additions & 3 deletions tests/commands/test_api_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def test_record_commit(self):
self.assertEqual(result.exception, None)

server.shutdown()
thread.join()
thread.join(timeout=3)

@responses.activate
@mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
Expand Down Expand Up @@ -134,7 +134,7 @@ def test_record_build(self):
self.assert_tracking_count(tracking=tracking, count=3)

success_server.shutdown()
thread.join()
thread.join(timeout=3)

# case: exe.jar catches error
error_server = HTTPServer(("", 0), ErrorCommitHandlerMock)
Expand Down Expand Up @@ -168,7 +168,7 @@ def test_record_build(self):
self.assert_tracking_count(tracking=tracking, count=3)

error_server.shutdown()
thread.join()
thread.join(timeout=3)

@responses.activate
@mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
Expand Down
Loading