diff --git a/environment.yml b/environment.yml index 8b124882..bcceb8a3 100644 --- a/environment.yml +++ b/environment.yml @@ -4,6 +4,8 @@ channels: - defaults dependencies: - ipopt>=3.11 + - scip>=8.0.0 + - deprecated - fiona>=1.9.5 - geopandas>=0.14.0 - matplotlib>=3.8.0 @@ -16,8 +18,6 @@ dependencies: - pytest>=3.9.0 - python-jose>=3.0 - rasterio>=1.3.9 - - requests>=2.31.0 - rtree>=1.1.0 - scipy>=1.11.3 - shapely>=2.0.2 - - deprecated>=1.2.14 diff --git a/recipes/meta.yaml~ b/recipes/meta.yaml~ new file mode 100644 index 00000000..8b893bc0 --- /dev/null +++ b/recipes/meta.yaml~ @@ -0,0 +1,72 @@ +{% set name = "pyincore" %} +{% set version = "1.9.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + path: .. + +about: + home: https://incore.ncsa.illinois.edu + license: MPL-2.0 + summary: 'Python library for IN-CORE (Interdependent Networked Community Resilience Modeling Environment)' + description: 'pyIncore is a component of IN-CORE. It is a python package consisting of two primary components: + 1) a set of service classes to interact with the IN-CORE web services, and 2) IN-CORE analyses. The pyIncore + package allows users to apply various hazards to infrastructure in selected areas, propagating the effect of + physical infrastructure damage and loss of functionality to social and economic impacts.' + dev_url: https://github.com/IN-CORE/pyincore + doc_url: https://incore.ncsa.illinois.edu/doc/incore + +build: + # 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: 1 + noarch: python + script: "{{ PYTHON }} -m pip install --no-deps --ignore-installed -vv . " # verbose + +requirements: + build: + - python>=3.9 + - pip + - numpy>=1.26.0,<2.0a0 + + host: + - python>=3.9 + - pip + - numpy>=1.26.0,<2.0a0 + + run: + - python>=3.9 + - ipopt>=3.11 + - scip>=8.0.0 + - {{ pin_compatible('numpy') }} + - fiona>=1.9.5 + - geopandas>=0.14.0 + - matplotlib>=3.8.0 + - networkx>=3.2.1 + - pandas>=2.1.2 + - pyomo>=6.0.0,<=6.6.2 + - pyproj>=3.6.1 + - rasterio>=1.3.9 + - requests>=2.31.0 + - rtree>=1.1.0 + - scipy>=1.11.3 + - shapely>=2.0.2 + +test: + # Python imports + imports: + - pyincore + + requires: + # Put any additional test requirements here. For example + - pytest>=3.9.0 + - pycodestyle>=2.6.0 + - python-jose>=3.0 + + commands: + # You can put built-in test commands to be run here. Use this to test that the entry points work. + python -c "import pyincore; print('SUCCESS')" #; pyincore.test_client()" + # You can also put a file called run_test.py in the recipe that will be run at test time. diff --git a/requirements.imports b/requirements.imports index bad57f2f..126b8f6e 100644 --- a/requirements.imports +++ b/requirements.imports @@ -1,4 +1,5 @@ +deprecated fiona geopandas matplotlib @@ -8,11 +9,9 @@ pandas pyomo pyproj rasterio -requests rtree scipy shapely pycodestyle pytest python-jose -Deprecated diff --git a/requirements.txt b/requirements.txt index e356bb53..d19dd368 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ # This file is autogenerated +deprecated fiona>=1.9.5 geopandas>=0.14.0 matplotlib>=3.8.0 @@ -11,8 +12,6 @@ pyproj>=3.6.1 pytest>=3.9.0 python-jose>=3.0 rasterio>=1.3.9 -requests>=2.31.0 rtree>=1.1.0 scipy>=1.11.3 shapely>=2.0.2 -Deprecated>=1.2.14 diff --git a/setup.py~ b/setup.py~ new file mode 100644 index 00000000..705de3dc --- /dev/null +++ b/setup.py~ @@ -0,0 +1,76 @@ +# Copyright (c) 2019 University of Illinois and others. All rights reserved. +# +# This program and the accompanying materials are made available under the +# terms of the Mozilla Public License v2.0 which accompanies this distribution, +# and is available at https://www.mozilla.org/en-US/MPL/2.0/ + +from setuptools import setup, find_packages + +# version number of pyincore +version = "1.20.1" + +with open("README.rst", encoding="utf-8") as f: + readme = f.read() + +setup( + name="pyincore", + version=version, + description="IN-CORE analysis tool python package", + long_description=readme, + long_description_content_type="text/x-rst", + url="https://incore.ncsa.illinois.edu", + license="Mozilla Public License v2.0", + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)", + "Natural Language :: English", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3", + "Topic :: Scientific/Engineering", + ], + keywords=[ + "infrastructure", + "resilience", + "hazards", + "data discovery", + "IN-CORE", + "earthquake", + "tsunami", + "tornado", + "hurricane", + "dislocation", + ], + packages=find_packages( + where=".", exclude=["*.tests", "*.tests.*", "tests.*", "tests"] + ), + include_package_data=True, + package_data={"": ["*.ini", "*.csv"]}, + python_requires=">=3.9", + install_requires=[ + "fiona>=1.9.5", + "geopandas>=0.14.0", + "matplotlib>=3.8.0", + "networkx>=3.2.1", + "numpy>=1.26.0,<2.0a0", + "pandas>=2.1.2", + "pyomo>=6.0.0,<=6.6.2", + "pyproj>=3.6.1", + "rasterio>=1.3.9", + "rtree>=1.1.0", + "scipy>=1.11.3", + "shapely>=2.0.2", + "Deprecated>=1.2.14", + ], + extras_require={ + "test": [ + "pycodestyle>=2.6.0", + "pytest>=3.9.0", + "python-jose>=3.0", + ] + }, + project_urls={ + "Bug Reports": "https://github.com/IN-CORE/pyincore/issues", + "Source": "https://github.com/IN-CORE/pyincore", + }, +) diff --git a/versions.md b/versions.md index 0aba4d67..41af1010 100644 --- a/versions.md +++ b/versions.md @@ -4,48 +4,46 @@ This file is autogenerated and lists the latest versions of all dependencies. Th | PIP Package | Conda Package | Required Version | Matched Version (pip) | |-------------|---------------|------------------|-----------------------| -| fiona | | \>=1.8.4| 1.9.2 | -| geopandas | | \>=0.6.1| 0.12.2 | -| matplotlib | | \>=2.1.0| 3.7.1 | -| networkx | | \>=2.2| 3.1 | -| numpy | | \>=1.16.6,\<2.0a0| 1.24.2 | -| pandas | | \>=1.1.0| 1.5.3 | -| pycodestyle | | \>=2.6.0| 2.10.0 | -| pyomo | | \>=5.6| 6.5.0 | -| pyproj | | \>=1.9.6| 3.5.0 | -| pytest | | \>=3.9.0| 7.2.2 | +| deprecated | | | 1.2.15 | +| fiona | | \>=1.9.5| 1.10.1 | +| geopandas | | \>=0.14.0| 1.0.1 | +| matplotlib | | \>=3.8.0| 3.9.3 | +| networkx | | \>=3.2.1| 3.4.2 | +| numpy | | \>=1.26.0,\<2.0a0| 1.26.4 | +| pandas | | \>=2.1.2| 2.2.3 | +| pycodestyle | | \>=2.6.0| 2.12.1 | +| pyomo | | \>=6.0.0,\<=6.6.2| 6.6.2 | +| pyproj | | \>=3.6.1| 3.7.0 | +| pytest | | \>=3.9.0| 8.3.4 | | python-jose | | \>=3.0| 3.3.0 | -| rasterio | | \>=1.0.18| 1.3.6 | -| requests | | \>=2.20.0| 2.28.2 | -| rtree | | \>=0.8.3| 1.0.1 | -| scipy | | \>=1.2.0| 1.10.1 | -| shapely | | \>=1.6.4.post1| 2.0.1 | +| rasterio | | \>=1.3.9| 1.4.2 | +| rtree | | \>=1.1.0| 1.3.0 | +| scipy | | \>=1.11.3| 1.14.1 | +| shapely | | \>=2.0.2| 2.0.6 | | affine | | | 2.4.0 | -| attrs | | | 22.2.0 | -| certifi | | | 2022.12.7 | -| charset-normalizer | | | 3.1.0 | -| click | | | 8.1.3 | +| attrs | | | 24.2.0 | +| certifi | | | 2024.8.30 | +| click | | | 8.1.7 | | click-plugins | | | 1.1.1 | | cligj | | | 0.7.2 | -| contourpy | | | 1.0.7 | -| cycler | | | 0.11.0 | -| ecdsa | | | 0.18.0 | -| exceptiongroup | | | 1.1.1 | -| fonttools | | | 4.39.3 | -| idna | | | 3.4 | +| contourpy | | | 1.3.1 | +| cycler | | | 0.12.1 | +| ecdsa | | | 0.19.0 | +| exceptiongroup | | | 1.2.2 | +| fonttools | | | 4.55.0 | | iniconfig | | | 2.0.0 | -| kiwisolver | | | 1.4.4 | -| munch | | | 2.5.0 | -| packaging | | | 23.0 | -| pillow | | | 9.5.0 | -| pluggy | | | 1.0.0 | +| kiwisolver | | | 1.4.7 | +| packaging | | | 24.2 | +| pillow | | | 11.0.0 | +| pluggy | | | 1.5.0 | | ply | | | 3.11 | -| pyasn1 | | | 0.4.8 | -| pyparsing | | | 3.0.9 | -| python-dateutil | | | 2.8.2 | -| pytz | | | 2023.3 | +| pyasn1 | | | 0.6.1 | +| pyogrio | | | 0.10.0 | +| pyparsing | | | 3.2.0 | +| python-dateutil | | | 2.9.0.post0 | +| pytz | | | 2024.2 | | rsa | | | 4.9 | | six | | | 1.16.0 | -| snuggs | | | 1.4.7 | -| tomli | | | 2.0.1 | -| urllib3 | | | 1.26.15 | +| tomli | | | 2.2.1 | +| tzdata | | | 2024.2 | +| wrapt | | | 1.17.0 |