diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat deleted file mode 100644 index 0a79fa2..0000000 --- a/conda-recipe/bld.bat +++ /dev/null @@ -1,7 +0,0 @@ -"%PYTHON%" setup.py install -if errorlevel 1 exit 1 - -:: Add more build steps here, if they are necessary. - -:: See http://docs.continuum.io/conda/build.html -:: for a list of environment variables that are set during the build process. diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh deleted file mode 100644 index b792039..0000000 --- a/conda-recipe/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install - -# Add more build steps here, if they are necessary. - -# See http://docs.continuum.io/conda/build.html -# for a list of environment variables that are set during the build process. diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml deleted file mode 100644 index 8d44652..0000000 --- a/conda-recipe/conda_build_config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -python: - - 3.7 - - 3.6 - - 3.5 - - 2.7 diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml deleted file mode 100644 index d3c86a2..0000000 --- a/conda-recipe/meta.yaml +++ /dev/null @@ -1,66 +0,0 @@ -{% set setupdata = load_setup_py_data() %} - -package: - name: diffpy.srfit - version: {{ setupdata['version'] }} - -source: - git_url: .. - -build: - preserve_egg_dir: True - - # If this is a new build for the same version, increment the build - # number. If you do not include this key, it defaults to 0. - # number: 0 - -requirements: - build: - - python {{ python }} - - setuptools - - six - - run: - - python - - setuptools - - numpy >=1.11 - - six - -test: - # Python imports - imports: - - diffpy.srfit - - diffpy.srfit.equation - - diffpy.srfit.equation.literals - - diffpy.srfit.equation.visitors - - diffpy.srfit.fitbase - - diffpy.srfit.interface - - diffpy.srfit.pdf - - diffpy.srfit.sas - - diffpy.srfit.structure - - diffpy.srfit.tests - - diffpy.srfit.util - - commands: - # You can put test commands to be run here. Use this to test that the - # entry points work. - - # You can also put a file called run_test.py in the recipe that will be run - # at test time. - - requires: - # Put any additional test requirements here. For example - - diffpy.structure - - pyobjcryst - - diffpy.srreal - # FIXME - correct when packages become available for Python 3. - - srfit-sasview # [py2k] - -about: - home: https://github.com/diffpy/diffpy.srfit/ - summary: Framework for complex modeling and atomic structure optimization. - license: Modified BSD License - license_file: LICENSE.txt - -# See http://docs.continuum.io/conda/build.html -# for more information about meta.yaml. diff --git a/conda-recipe/run_test.py b/conda-recipe/run_test.py deleted file mode 100644 index 6905f7d..0000000 --- a/conda-recipe/run_test.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python - -import diffpy.srfit.tests - -assert diffpy.srfit.tests.test().wasSuccessful() diff --git a/src/diffpy/srfit/fitbase/recipeorganizer.py b/src/diffpy/srfit/fitbase/recipeorganizer.py index 1d9a1f9..6b245de 100644 --- a/src/diffpy/srfit/fitbase/recipeorganizer.py +++ b/src/diffpy/srfit/fitbase/recipeorganizer.py @@ -944,7 +944,7 @@ def show(self, pattern="", textwidth=78): the screen width. Do not trim when negative or 0. """ regexp = re.compile(pattern) - pmatch = lambda s: (len(s.split(None, 1)) < 2 or regexp.search(s.split(None, 1)[0])) + pmatch = lambda s: (len(s.split(None, 1)) < 2 or regexp.search(s.split(None, 1)[0])) # noqa: E731 # Show sub objects and their parameters lines = [] tlines = self._formatManaged()