Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python 3.7 support, and remove references to beta #808

Merged
merged 4 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ workflows:
version: 2
test:
jobs:
- test-37
- test-38
- test-39
- test-310
Expand All @@ -12,9 +11,9 @@ workflows:
jobs:
- docs
jobs:
test-37: &test-template
test-38: &test-template
docker:
- image: cimg/python:3.7
- image: cimg/python:3.8
steps:
- checkout
- restore_cache:
Expand All @@ -37,7 +36,7 @@ jobs:
mkdir test-reports
pytest --junitxml=test-reports/junit.xml --flake8 --cov --cov-report=xml:test-reports/coverage.xml stonesoup
- store_test_results:
path: test-reports
path: test-reports/junit.xml
- store_artifacts:
path: test-reports
- run:
Expand All @@ -47,10 +46,6 @@ jobs:
-f test-reports/coverage.xml \
-F unittests \
-n ${CIRCLE_BUILD_NUM}
test-38:
<<: *test-template
docker:
- image: cimg/python:3.8
test-39:
<<: *test-template
docker:
Expand Down Expand Up @@ -86,13 +81,13 @@ jobs:
name: Build Docs
command: |
. venv/bin/activate
coverage run -m sphinx -b html -W --keep-going -D sphinx_gallery_conf.junit=../../../test-reports/sphinx-gallery/junit.xml docs/source docs/build/html
coverage run -m sphinx -b html -d build/.doctrees -W --keep-going -D sphinx_gallery_conf.junit=../../../test-reports/sphinx-gallery/junit.xml docs/source docs/build/html
coverage xml -o test-reports/coverage.xml
- store_artifacts:
path: docs/build/html
destination: docs
- store_test_results:
path: test-reports
path: test-reports/sphinx-gallery/junit.xml
- store_artifacts:
path: test-reports
- run:
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ estimation algorithms.

An article is [available](https://www.gov.uk/government/news/dstl-shares-new-open-source-framework-initiative) that details the background to the project, and contains links to sample data.

Stone Soup is currently in *beta*.

Please see the
[Stone Soup documentation](https://stonesoup.readthedocs.org/) for more
information.
Expand All @@ -31,7 +29,7 @@ Stone Soup uses the following dependencies:

| Name | License |
| ---- | ------- |
| [Python](https://www.python.org/) (v3.7+) | PSFL |
| [Python](https://www.python.org/) (v3.8+) | PSFL |
| [numpy](https://numpy.org/) | BSD |
| [SciPy](https://www.scipy.org/) | BSD |
| [matplotlib](https://matplotlib.org/) | [PSF/BSD-compatible](https://matplotlib.org/users/license.html) |
Expand Down
7 changes: 3 additions & 4 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ components may not be the most optimised implementations, instead focusing on
being flexible. Its also intended to aid choice of component/algorithms
to tackle real world problems.

Stone Soup is currently in *beta* and under continuing development, where
feedback and contributions are welcomed to improve the component interface
design and grow the number components available.
Stone Soup is under active development, where feedback and contributions are
welcomed to grow the number of components and features available.

Please see the Stone Soup :ref:`auto_tutorials/index:Tutorials` for learning
about tracking and using Stone Soup, :ref:`auto_examples/index:Examples` for
Expand All @@ -42,7 +41,7 @@ To install Stone Soup from Conda-Forge with ``conda``:
conda config --add channels conda-forge
conda install stonesoup

Stone Soup is currently in active development under *beta*. To install
Stone Soup is currently in active development. To install
the latest version from the GitHub repository:

.. code::
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ maintainer_email = [email protected]
url = https://github.com/dstl/Stone-Soup
license = MIT
classifiers =
Development Status :: 4 - Beta
Development Status :: 5 - Production/Stable
Intended Audience :: Science/Research
License :: OSI Approved :: MIT License
Operating System :: OS Independent
Programming Language :: Python :: 3 :: Only
Topic :: Scientific/Engineering

[options]
python_requires = >=3.7
python_requires = >=3.8
packages = find:
install_requires =
matplotlib
Expand Down
60 changes: 0 additions & 60 deletions stonesoup/_util.py

This file was deleted.

3 changes: 1 addition & 2 deletions stonesoup/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ def __init__(self, foo, bar=bar.default, *args, **kwargs):
from abc import ABCMeta
from collections import OrderedDict
from copy import copy
from functools import cached_property
from types import MappingProxyType

from ._util import cached_property


class Property:
"""Property(cls, default=inspect.Parameter.empty)
Expand Down