From 1407ef0517c15c3d6c5c8648b90100945d814886 Mon Sep 17 00:00:00 2001 From: David Graber Date: Mon, 1 Apr 2019 07:24:43 +0200 Subject: [PATCH 1/3] add LJMPython version 1.19.0 to egg dependency link --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b2aeec6..c588798 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ requirements = [ dependency_links = [ 'https://labjack.com/sites/default/files/software/Python_LJM_2018_10_19.zip' - '#egg=LJMPython', + '#egg=LJMPython-1.19.0', ] setup_requirements = ['pytest-runner', ] -- GitLab From 38618031446804fcd8f9332883c7fc1671f6872c Mon Sep 17 00:00:00 2001 From: David Graber Date: Mon, 1 Apr 2019 08:39:26 +0200 Subject: [PATCH 2/3] update HISTORY.rst --- HISTORY.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index d02acfc..844aab9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,11 @@ History ======= +0.2.1 (2019-04-01) +------------------ + +* Fix issue with LJMPython not being installed automatically with setuptools. + 0.2.0 (2019-03-31) ------------------ -- GitLab From 4e720062dd8813fd355c7d2710be331137e66d6f Mon Sep 17 00:00:00 2001 From: David Graber Date: Mon, 1 Apr 2019 15:54:44 +0200 Subject: [PATCH 3/3] bump version to 0.2.1 --- hvl_ccb/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hvl_ccb/__init__.py b/hvl_ccb/__init__.py index c06d93a..6ab9f67 100644 --- a/hvl_ccb/__init__.py +++ b/hvl_ccb/__init__.py @@ -4,7 +4,7 @@ __author__ = """Mikołaj Rybiński, David Graber""" __email__ = 'mikolaj.rybinski@id.ethz.ch, graber@eeh.ee.ethz.ch' -__version__ = '0.2.0' +__version__ = '0.2.1' from .experiment_manager import ( # noqa: F401 ExperimentManager, diff --git a/setup.cfg b/setup.cfg index e96d989..bcf66c3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.0 +current_version = 0.2.1 commit = True tag = True diff --git a/setup.py b/setup.py index c588798..7eb32c8 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,6 @@ setup( test_suite='tests', tests_require=test_requirements, url='https://gitlab.ethz.ch/hvl_priv/hvl_ccb', - version='0.2.0', + version='0.2.1', zip_safe=False, ) -- GitLab