From af4045cd0c02e2f55888ec2c27611c85267e48f9 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Mon, 10 Apr 2023 15:42:59 -0700 Subject: [PATCH 1/2] TST: fix an issue with the test suite failing to run with latest lightpath --- docs/source/releases.rst | 13 +++++++++++++ hutch_python/tests/test_tstpython.py | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/source/releases.rst b/docs/source/releases.rst index 084c4d18..ccf6d052 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -1,6 +1,19 @@ Release History ############### +v1.18.2 (2023-04-11) +==================== + +Maintenance +----------- +- Fix an issue where the test suite would not run with the latest + lightpath. This was a test-suite only bug, not a runtime + function bug. + +Contributors +------------ +- zllentz + v1.18.1 (2023-04-04) ==================== diff --git a/hutch_python/tests/test_tstpython.py b/hutch_python/tests/test_tstpython.py index 5f3fac9e..56e9190d 100644 --- a/hutch_python/tests/test_tstpython.py +++ b/hutch_python/tests/test_tstpython.py @@ -36,7 +36,7 @@ def test_tstpython_scripts(): try: import lightpath - lightpath_version = lightpath.__version__ + lightpath_version = str(lightpath.__version__) except ImportError: lightpath_version = '0.0.0' @@ -47,7 +47,7 @@ def test_tstpython_scripts(): reason=('IPython breaks in a pseudo-tty if any package ' 'initializes colorama, ruining this test.')) @pytest.mark.skipif( - version.parse(lightpath.__version__) <= version.parse('1.0.0'), + version.parse(lightpath_version) <= version.parse('1.0.0'), reason='Need lightpath config read bugfix from PR#167' ) def test_tstpython_ipython(): From 55949b973180e2af9046f2724e61d8f9584c8942 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 11 Apr 2023 10:47:50 -0700 Subject: [PATCH 2/2] CI: allow workflow to inherit secrets --- .github/workflows/standard.yml | 1 + docs/source/releases.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/standard.yml b/.github/workflows/standard.yml index fb8ffb2f..82e73c7a 100644 --- a/.github/workflows/standard.yml +++ b/.github/workflows/standard.yml @@ -10,6 +10,7 @@ on: jobs: standard: uses: pcdshub/pcds-ci-helpers/.github/workflows/python-standard.yml@master + secrets: inherit with: # The workflow needs to know the package name. This can be determined # automatically if the repository name is the same as the import name. diff --git a/docs/source/releases.rst b/docs/source/releases.rst index ccf6d052..0bdb8fdb 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -9,6 +9,8 @@ Maintenance - Fix an issue where the test suite would not run with the latest lightpath. This was a test-suite only bug, not a runtime function bug. +- Fix an issue where pypi/conda upload builds would not have + proper authentication. Contributors ------------