DFO-LS 1.4.0__tar.gz → 1.4.1__tar.gz

{DFO-LS-1.4.0 → DFO-LS-1.4.1}/DFO_LS.egg-info/PKG-INFO

@@ -1,32 +1,46 @@
 Metadata-Version: 2.1
 Name: DFO-LS
-Version: 1.4.0
+Version: 1.4.1
 Summary: A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization
-Home-page: https://github.com/numericalalgorithmsgroup/dfols/
-Author: Lindon Roberts
-Author-email: lindon.roberts@anu.edu.au
-License: GNU GPL
-Download-URL: https://github.com/numericalalgorithmsgroup/dfols/archive/v1.4.0.tar.gz
-Keywords: mathematics derivative free optimization nonlinear least squares
-Platform: UNKNOWN
+Author-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
+Maintainer-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
+License: GPL-3.0-or-later
+Project-URL: Homepage, https://github.com/numericalalgorithmsgroup/dfols
+Project-URL: Download, https://github.com/numericalalgorithmsgroup/dfols/releases/
+Project-URL: Bug Tracker, https://github.com/numericalalgorithmsgroup/dfols/issues/
+Project-URL: Documentation, https://numericalalgorithmsgroup.github.io/dfols/
+Project-URL: Source Code, https://github.com/numericalalgorithmsgroup/dfols
+Keywords: mathematics,optimization,least squares,derivative free optimization,nonlinear least squares
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: IPython
 Classifier: Framework :: Jupyter
-Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Provides-Extra: trustregion
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: scipy>=1.11
+Requires-Dist: pandas
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: Sphinx; extra == "dev"
+Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Provides-Extra: trustregion
+Requires-Dist: trustregion>=1.1; extra == "trustregion"
 
 ===================================================
 DFO-LS: Derivative-Free Optimizer for Least-Squares
@@ -70,19 +84,19 @@ Cartis, C., Fiala, J., Marteau, B. and Roberts, L., `Improving the Flexibility a
 
 If you use DFO-LS for problems with constraints, including bound constraints, please also cite:
 
-Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://arxiv.org/abs/2111.05443>`_, *arXiv preprint arXiv:2111.05443*, (2021).
+Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579.
 
 Requirements
 ------------
 DFO-LS requires the following software to be installed:
 
-* Python 2.7 or Python 3 (http://www.python.org/)
+* Python 3.9 or higher (http://www.python.org/)
 
 Additionally, the following python packages should be installed (these will be installed automatically if using *pip*, see `Installation using pip`_):
 
-* NumPy 1.11 or higher (http://www.numpy.org/)
-* SciPy 1.11 or higher (http://www.scipy.org/)
-* Pandas 0.17 or higher (http://pandas.pydata.org/)
+* NumPy (http://www.numpy.org/)
+* SciPy version 1.11 or higher (http://www.scipy.org/)
+* Pandas (http://pandas.pydata.org/)
 
 **Optional package:** DFO-LS versions 1.2 and higher also support the `trustregion <https://github.com/lindonroberts/trust-region>`_ package for fast trust-region subproblem solutions. To install this, make sure you have a Fortran compiler (e.g. `gfortran <https://gcc.gnu.org/wiki/GFortran>`_) and NumPy installed, then run :code:`pip install trustregion`. You do not have to have trustregion installed for DFO-LS to work, and it is not installed by default.
 
@@ -147,7 +161,7 @@ If you do not have root privileges or you want to install DFO-LS for your privat
 
 instead.
 
-To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`setup.py`) and rerun the installation using :code:`pip`, as above:
+To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`pyproject.toml`) and rerun the installation using :code:`pip`, as above:
 
  .. code-block:: bash
 
@@ -156,11 +170,12 @@ To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.
 
 Testing
 -------
-If you installed DFO-LS manually, you can test your installation by running:
+If you installed DFO-LS manually, you can test your installation using the pytest package:
 
  .. code-block:: bash
 
-    $ python setup.py test
+    $ pip install pytest
+    $ python -m pytest --pyargs dfols
 
 Alternatively, the HTML documentation provides some simple examples of how to run DFO-LS.
 
@@ -180,10 +195,8 @@ If DFO-LS was installed manually you have to remove the installed files by hand
 
 Bugs
 ----
-Please report any bugs using GitHub's issue tracker.
+Please report any bugs using `GitHub's issue tracker <https://github.com/numericalalgorithmsgroup/dfols/issues>`_.
 
 License
 -------
 This algorithm is released under the GNU GPL license. Please `contact NAG <http://www.nag.com/content/worldwide-contact-information>`_ for alternative licensing.
-
-

{DFO-LS-1.4.0 → DFO-LS-1.4.1}/DFO_LS.egg-info/SOURCES.txt

@@ -1,13 +1,12 @@
 LICENSE.txt
 MANIFEST.in
 README.rst
-setup.py
+pyproject.toml
 DFO_LS.egg-info/PKG-INFO
 DFO_LS.egg-info/SOURCES.txt
 DFO_LS.egg-info/dependency_links.txt
 DFO_LS.egg-info/requires.txt
 DFO_LS.egg-info/top_level.txt
-DFO_LS.egg-info/zip-safe
 dfols/__init__.py
 dfols/controller.py
 dfols/diagnostic_info.py
@@ -16,5 +15,4 @@ dfols/model.py
 dfols/params.py
 dfols/solver.py
 dfols/trust_region.py
-dfols/util.py
-dfols/version.py
+dfols/util.py

DFO-LS-1.4.1/DFO_LS.egg-info/requires.txt

@@ -0,0 +1,12 @@
+setuptools
+numpy
+scipy>=1.11
+pandas
+
+[dev]
+pytest
+Sphinx
+sphinx-rtd-theme
+
+[trustregion]
+trustregion>=1.1

{DFO-LS-1.4.0 → DFO-LS-1.4.1}/PKG-INFO

@@ -1,32 +1,46 @@
 Metadata-Version: 2.1
 Name: DFO-LS
-Version: 1.4.0
+Version: 1.4.1
 Summary: A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization
-Home-page: https://github.com/numericalalgorithmsgroup/dfols/
-Author: Lindon Roberts
-Author-email: lindon.roberts@anu.edu.au
-License: GNU GPL
-Download-URL: https://github.com/numericalalgorithmsgroup/dfols/archive/v1.4.0.tar.gz
-Keywords: mathematics derivative free optimization nonlinear least squares
-Platform: UNKNOWN
+Author-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
+Maintainer-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
+License: GPL-3.0-or-later
+Project-URL: Homepage, https://github.com/numericalalgorithmsgroup/dfols
+Project-URL: Download, https://github.com/numericalalgorithmsgroup/dfols/releases/
+Project-URL: Bug Tracker, https://github.com/numericalalgorithmsgroup/dfols/issues/
+Project-URL: Documentation, https://numericalalgorithmsgroup.github.io/dfols/
+Project-URL: Source Code, https://github.com/numericalalgorithmsgroup/dfols
+Keywords: mathematics,optimization,least squares,derivative free optimization,nonlinear least squares
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Framework :: IPython
 Classifier: Framework :: Jupyter
-Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Provides-Extra: trustregion
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: scipy>=1.11
+Requires-Dist: pandas
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: Sphinx; extra == "dev"
+Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Provides-Extra: trustregion
+Requires-Dist: trustregion>=1.1; extra == "trustregion"
 
 ===================================================
 DFO-LS: Derivative-Free Optimizer for Least-Squares
@@ -70,19 +84,19 @@ Cartis, C., Fiala, J., Marteau, B. and Roberts, L., `Improving the Flexibility a
 
 If you use DFO-LS for problems with constraints, including bound constraints, please also cite:
 
-Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://arxiv.org/abs/2111.05443>`_, *arXiv preprint arXiv:2111.05443*, (2021).
+Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579.
 
 Requirements
 ------------
 DFO-LS requires the following software to be installed:
 
-* Python 2.7 or Python 3 (http://www.python.org/)
+* Python 3.9 or higher (http://www.python.org/)
 
 Additionally, the following python packages should be installed (these will be installed automatically if using *pip*, see `Installation using pip`_):
 
-* NumPy 1.11 or higher (http://www.numpy.org/)
-* SciPy 1.11 or higher (http://www.scipy.org/)
-* Pandas 0.17 or higher (http://pandas.pydata.org/)
+* NumPy (http://www.numpy.org/)
+* SciPy version 1.11 or higher (http://www.scipy.org/)
+* Pandas (http://pandas.pydata.org/)
 
 **Optional package:** DFO-LS versions 1.2 and higher also support the `trustregion <https://github.com/lindonroberts/trust-region>`_ package for fast trust-region subproblem solutions. To install this, make sure you have a Fortran compiler (e.g. `gfortran <https://gcc.gnu.org/wiki/GFortran>`_) and NumPy installed, then run :code:`pip install trustregion`. You do not have to have trustregion installed for DFO-LS to work, and it is not installed by default.
 
@@ -147,7 +161,7 @@ If you do not have root privileges or you want to install DFO-LS for your privat
 
 instead.
 
-To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`setup.py`) and rerun the installation using :code:`pip`, as above:
+To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`pyproject.toml`) and rerun the installation using :code:`pip`, as above:
 
  .. code-block:: bash
 
@@ -156,11 +170,12 @@ To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.
 
 Testing
 -------
-If you installed DFO-LS manually, you can test your installation by running:
+If you installed DFO-LS manually, you can test your installation using the pytest package:
 
  .. code-block:: bash
 
-    $ python setup.py test
+    $ pip install pytest
+    $ python -m pytest --pyargs dfols
 
 Alternatively, the HTML documentation provides some simple examples of how to run DFO-LS.
 
@@ -180,10 +195,8 @@ If DFO-LS was installed manually you have to remove the installed files by hand
 
 Bugs
 ----
-Please report any bugs using GitHub's issue tracker.
+Please report any bugs using `GitHub's issue tracker <https://github.com/numericalalgorithmsgroup/dfols/issues>`_.
 
 License
 -------
 This algorithm is released under the GNU GPL license. Please `contact NAG <http://www.nag.com/content/worldwide-contact-information>`_ for alternative licensing.
-
-

{DFO-LS-1.4.0 → DFO-LS-1.4.1}/README.rst

@@ -40,19 +40,19 @@ Cartis, C., Fiala, J., Marteau, B. and Roberts, L., `Improving the Flexibility a
 
 If you use DFO-LS for problems with constraints, including bound constraints, please also cite:
 
-Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://arxiv.org/abs/2111.05443>`_, *arXiv preprint arXiv:2111.05443*, (2021).
+Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579.
 
 Requirements
 ------------
 DFO-LS requires the following software to be installed:
 
-* Python 2.7 or Python 3 (http://www.python.org/)
+* Python 3.9 or higher (http://www.python.org/)
 
 Additionally, the following python packages should be installed (these will be installed automatically if using *pip*, see `Installation using pip`_):
 
-* NumPy 1.11 or higher (http://www.numpy.org/)
-* SciPy 1.11 or higher (http://www.scipy.org/)
-* Pandas 0.17 or higher (http://pandas.pydata.org/)
+* NumPy (http://www.numpy.org/)
+* SciPy version 1.11 or higher (http://www.scipy.org/)
+* Pandas (http://pandas.pydata.org/)
 
 **Optional package:** DFO-LS versions 1.2 and higher also support the `trustregion <https://github.com/lindonroberts/trust-region>`_ package for fast trust-region subproblem solutions. To install this, make sure you have a Fortran compiler (e.g. `gfortran <https://gcc.gnu.org/wiki/GFortran>`_) and NumPy installed, then run :code:`pip install trustregion`. You do not have to have trustregion installed for DFO-LS to work, and it is not installed by default.
 
@@ -117,7 +117,7 @@ If you do not have root privileges or you want to install DFO-LS for your privat
 
 instead.
 
-To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`setup.py`) and rerun the installation using :code:`pip`, as above:
+To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`pyproject.toml`) and rerun the installation using :code:`pip`, as above:
 
  .. code-block:: bash
 
@@ -126,11 +126,12 @@ To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.
 
 Testing
 -------
-If you installed DFO-LS manually, you can test your installation by running:
+If you installed DFO-LS manually, you can test your installation using the pytest package:
 
  .. code-block:: bash
 
-    $ python setup.py test
+    $ pip install pytest
+    $ python -m pytest --pyargs dfols
 
 Alternatively, the HTML documentation provides some simple examples of how to run DFO-LS.
 
@@ -150,7 +151,7 @@ If DFO-LS was installed manually you have to remove the installed files by hand
 
 Bugs
 ----
-Please report any bugs using GitHub's issue tracker.
+Please report any bugs using `GitHub's issue tracker <https://github.com/numericalalgorithmsgroup/dfols/issues>`_.
 
 License
 -------

{DFO-LS-1.4.0 → DFO-LS-1.4.1}/dfols/__init__.py

@@ -38,10 +38,10 @@ alternative licensing.
 # Ensure compatibility with Python 2
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from .version import __version__
-__all__ = ['__version__']
+# DFO-LS version
+__version__ = '1.4.1'
 
 # Main solver & exit flags
 from .solver import *
-__all__ += ['solve']
+__all__ = ['solve']
 

DFO-LS-1.4.1/pyproject.toml

@@ -0,0 +1,60 @@
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "DFO-LS"
+dynamic = ["version"]
+dependencies = [
+    "setuptools",
+    "numpy",
+    "scipy>=1.11",
+    "pandas"
+]
+requires-python = ">=3.9"
+authors = [
+    {name = "Lindon Roberts", email = "lindon.roberts@sydney.edu.au"}
+]
+maintainers = [
+    {name = "Lindon Roberts", email = "lindon.roberts@sydney.edu.au"}
+]
+description = "A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization"
+readme = "README.rst"
+license = {text = "GPL-3.0-or-later"}
+keywords = ["mathematics", "optimization", "least squares", "derivative free optimization", "nonlinear least squares"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Framework :: IPython",
+    "Framework :: Jupyter",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: Unix",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Scientific/Engineering",
+    "Topic :: Scientific/Engineering :: Mathematics"
+]
+
+[project.optional-dependencies]
+dev = ["pytest", "Sphinx", "sphinx-rtd-theme"]
+trustregion = ["trustregion>=1.1"]
+
+[project.urls]
+Homepage = "https://github.com/numericalalgorithmsgroup/dfols"
+Download = "https://github.com/numericalalgorithmsgroup/dfols/releases/"
+"Bug Tracker" = "https://github.com/numericalalgorithmsgroup/dfols/issues/"
+Documentation = "https://numericalalgorithmsgroup.github.io/dfols/"
+"Source Code" = "https://github.com/numericalalgorithmsgroup/dfols"
+
+[tool.setuptools]
+packages = ["dfols"]
+
+[tool.setuptools.dynamic]
+version = {attr = "dfols.__version__"}

DFO-LS-1.4.0/DFO_LS.egg-info/requires.txt

@@ -1,6 +0,0 @@
-numpy>=1.11
-pandas>=0.17
-scipy>=0.18
-
-[trustregion]
-trustregion>=1.1

DFO-LS-1.4.0/DFO_LS.egg-info/zip-safe

@@ -1 +0,0 @@
-

DFO-LS-1.4.0/dfols/version.py

@@ -1,25 +0,0 @@
-"""
-Version number
-====
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-The development of this software was sponsored by NAG Ltd. (http://www.nag.co.uk)
-and the EPSRC Centre For Doctoral Training in Industrially Focused Mathematical
-Modelling (EP/L015803/1) at the University of Oxford. Please contact NAG for
-alternative licensing.
-
-"""
-
-__version__ = '1.4.0'

DFO-LS-1.4.0/setup.py

@@ -1,70 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-The development of this software was sponsored by NAG Ltd. (http://www.nag.co.uk)
-and the EPSRC Centre For Doctoral Training in Industrially Focused Mathematical
-Modelling (EP/L015803/1) at the University of Oxford. Please contact NAG for
-alternative licensing.
-
-"""
-
-from setuptools import setup
-
-# Get package version without "import dfols" (which requires dependencies to already be installed)
-import os
-version = {}
-with open(os.path.join('dfols', 'version.py')) as fp:
-    exec(fp.read(), version)
-__version__ = version['__version__']
-
-setup(
-    name='DFO-LS',
-    version=__version__,
-    description='A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization',
-    long_description=open('README.rst').read(),
-    author='Lindon Roberts',
-    author_email='lindon.roberts@anu.edu.au',
-    url='https://github.com/numericalalgorithmsgroup/dfols/',
-    download_url='https://github.com/numericalalgorithmsgroup/dfols/archive/v1.4.0.tar.gz',
-    packages=['dfols'],
-    license='GNU GPL',
-    keywords = 'mathematics derivative free optimization nonlinear least squares',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Framework :: IPython',
-        'Framework :: Jupyter',
-        'Intended Audience :: Financial and Insurance Industry',
-        'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
-        'Operating System :: MacOS',
-        'Operating System :: Microsoft :: Windows',
-        'Operating System :: POSIX',
-        'Operating System :: Unix',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        'Topic :: Scientific/Engineering',
-        'Topic :: Scientific/Engineering :: Mathematics',
-        ],
-    install_requires = ['numpy >= 1.11', 'scipy >= 0.18', 'pandas >= 0.17'],
-    extras_require = {'trustregion': 'trustregion >= 1.1'},
-    test_suite='nose.collector',
-    tests_require=['nose'],
-    zip_safe = True,
-    )
-