Merge branch 'master' into FilFinder3D

.github/workflows/main.yml

@@ -21,49 +21,49 @@ jobs:
             toxenv: py39-test
 
           - os: ubuntu-latest
-            python-version: 3.8
-            name: Python 3.8 with minimal dependencies
-            toxenv: py38-test
+            python-version: '3.10'
+            name: Python 3.10 with minimal dependencies
+            toxenv: py310-test
 
           - os: ubuntu-latest
-            python-version: 3.7
-            name: Python 3.7 with minimal dependencies
-            toxenv: py37-test
+            python-version: 3.11
+            name: Python 3.11 with minimal dependencies
+            toxenv: py311-test
 
           - os: ubuntu-latest
             python-version: 3.9
             name: Python 3.9 with minimal and dev dependencies
             toxenv: py39-test-dev
 
           - os: ubuntu-latest
-            python-version: 3.9
-            name: Python 3.9, all dependencies, and dev versions of key dependencies
-            toxenv: py39-test-dev
+            python-version: 3.11
+            name: Python 3.11, all dependencies, and dev versions of key dependencies
+            toxenv: py311-test-dev
 
           - os: ubuntu-latest
-            python-version: 3.9
-            name: Python 3.9, all dependencies, and coverage
-            toxenv: py39-test-all-cov
+            python-version: 3.11
+            name: Python 3.11, all dependencies, and coverage
+            toxenv: py311-test-all-cov
 
           - os: macos-latest
-            python-version: 3.9
-            name: Python 3.9 with all dependencies on MacOS X
-            toxenv: py39-test-all-dev
+            python-version: 3.11
+            name: Python 3.11 with all dependencies on MacOS X
+            toxenv: py311-test-all-dev
 
           # - os: windows-latest
           #   python-version: 3.7
           #   name: Python 3.7, with all dependencies on Windows
           #   toxenv: py37-test-all-dev
 
           - os: ubuntu-latest
-            python-version: 3.9
+            python-version: 3.11
             name: Documentation
             toxenv: build_docs
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install testing dependencies
@@ -72,6 +72,6 @@ jobs:
       run: tox -v -e ${{ matrix.toxenv }}
     - name: Upload coverage to codecov
       if: ${{ contains(matrix.toxenv,'-cov') }}
-      uses: codecov/codecov-action@v1.0.13
+      uses: codecov/codecov-action@v3
       with:
         file: ./coverage.xml

.github/workflows/publish.yml

@@ -7,11 +7,11 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Install build
         run: python -m pip install build
       - name: Build sdist
@@ -26,11 +26,11 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist
-      - uses: pypa/gh-action-pypi-publish@master
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

.readthedocs.yml

@@ -1,14 +1,14 @@
 version: 2
 
 build:
-  image: latest
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.12"
 
 # Install regular dependencies.
 python:
-  version: 3.7
   install:
     - method: pip
       path: .
       extra_requirements:
         - docs
-

fil_finder/__init__.py

@@ -2,7 +2,6 @@
 
 from ._astropy_init import __version__, test
 
-from .filfind_class import fil_finder_2D
 from .filfinder2D import FilFinder2D
 from .filfinderPPV import FilFinderPPV
 from .filfinderPPP import FilFinderPPP

fil_finder/conftest.py

@@ -3,7 +3,8 @@
 # no matter how it is invoked within the source tree.
 from __future__ import print_function, absolute_import, division
 
-import pytest
+import os
+from setuptools._distutils.version import LooseVersion
 
 from astropy.version import version as astropy_version
 
@@ -13,8 +14,21 @@
 else:
     from pytest_astropy_header.display import PYTEST_HEADER_MODULES, TESTED_VERSIONS
 
+import pytest
+from fil_finder.tests.testing_utils import generate_filament_model
+
+
 def pytest_configure(config):
 
     config.option.astropy_header = True
 
     PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
+
+
+@pytest.fixture
+def simple_filament_model():
+
+    mod = generate_filament_model(return_hdu=True, pad_size=31, shape=150,
+                                  width=10., background=0.1)[0]
+
+    yield mod