From 48415910598ee01729437cead0c896808b69e48c Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Wed, 29 Jul 2020 14:06:01 -0700 Subject: [PATCH 1/2] pin pytest --- tox.ini | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tox.ini b/tox.ini index ef640c9a..58140ac3 100644 --- a/tox.ini +++ b/tox.ini @@ -11,10 +11,17 @@ requires = setuptools >= 30.3.0 pip >= 19.3.1 setuptools_scm + tox-pypi-filter >= 0.12 isolated_build = true [testenv] +# The following option combined with the use of the tox-pypi-filter above allows +# project-wide pinning of dependencies, e.g. if new versions of pytest do not +# work correctly with pytest-astropy plugins. Most of the time the pinnings file +# should be empty. +pypi_filter = https://raw.githubusercontent.com/astropy/ci-helpers/master/pip_pinnings.txt + # Pass through the following environment variables which may be needed for the CI passenv = HOME WINDIR LC_ALL LC_CTYPE CC CI TRAVIS From 4a1c36962eac987f33e49906e18377c5afb545d9 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Tue, 25 Aug 2020 12:33:06 -0700 Subject: [PATCH 2/2] remove extraneous str --- pydl/pydlutils/yanny.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydl/pydlutils/yanny.py b/pydl/pydlutils/yanny.py index 147b3076..cfe6ccf5 100644 --- a/pydl/pydlutils/yanny.py +++ b/pydl/pydlutils/yanny.py @@ -1,4 +1,4 @@ -(str,)# Licensed under a 3-clause BSD style license - see LICENSE.rst +# Licensed under a 3-clause BSD style license - see LICENSE.rst # -*- coding: utf-8 -*- """This module corresponds to the yanny directory in idlutils.