From 37dcbcddc0dca0b6e38908957690a1fc9bad3ecf Mon Sep 17 00:00:00 2001 From: Aleks Hughes Date: Fri, 8 Sep 2023 16:18:04 +0100 Subject: [PATCH] explicitly remove support for py3.7 from setup.py and requirements.txt. build examples/environment.yml with py3.10 --- examples/environment.yml | 11 ++++++----- examples/requirements.txt | 7 +++---- requirements.txt | 28 ++++++++++++++-------------- setup.py | 4 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/environment.yml b/examples/environment.yml index a6438390..dbd47b1f 100644 --- a/examples/environment.yml +++ b/examples/environment.yml @@ -1,11 +1,12 @@ +# this file creates a conda environment latest version of SBTi-finance-tool name: sbti_getting_started channels: - conda-forge - defaults dependencies: - - git=2.28.0=0 - - pip=20.2.1=py_0 - - python=3.7.8=h60c2a47_1_cpython - - jupyter=1.0.0=py_2 + - pip=23.2.1 + - python=3.10.12 + - jupyterlab=4.0.5 - pip: - - git+git://github.com/OFBDABV/SBTi + - sbti-finance-tool + - -r requirements.txt diff --git a/examples/requirements.txt b/examples/requirements.txt index ab73d2d3..021cd83f 100644 --- a/examples/requirements.txt +++ b/examples/requirements.txt @@ -1,5 +1,4 @@ requests -jupyter==1.0.0 -pandas==1.0.3 -openpyxl==2.5.9 -matplotlib==3.2.2 +pandas==1.5.3 +openpyxl==3.1.2 +matplotlib==3.7.2 diff --git a/requirements.txt b/requirements.txt index 429af6c5..c5cb7f49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ -certifi==2021.10.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -charset-normalizer==2.0.12; python_full_version >= "3.6.0" and python_version >= "3" -et-xmlfile==1.1.0; python_version >= "3.6" -idna==3.3; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +certifi==2021.10.8; python_full_version >= "3.8.1" +charset-normalizer==2.0.12; python_full_version >= "3.8.1" +et-xmlfile==1.1.0; python_version >= "3.8" +idna==3.3; python_full_version >= "3.8.1" numpy==1.22.0 -openpyxl==3.1.2; python_version >= "3.6" -pandas==1.5.3; python_full_version >= "3.7.1" -pydantic==1.10.7; python_full_version >= "3.6.1" -python-dateutil==2.8.2; python_full_version >= "3.7.1" -pytz==2021.3; python_full_version >= "3.7.1" -requests==2.29.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -six==1.16.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") -typing-extensions==4.1.1; python_version >= "3.6" and python_full_version >= "3.6.1" -urllib3==1.26.11; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -xlrd==2.0.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") +openpyxl==3.1.2; python_version >= "3.8" +pandas==1.5.3; python_full_version >= "3.8.1" +pydantic==1.10.7; python_full_version >= "3.8.1" +python-dateutil==2.8.2; python_full_version >= "3.8.1" +pytz==2021.3; python_full_version >= "3.8.1" +requests==2.29.0; python_full_version >= "3.8.1" +six==1.16.0; python_full_version >= "3.8.1" +typing-extensions==4.1.1; python_full_version >= "3.8.1" +urllib3==1.26.11; python_full_version >= "3.8.1" +xlrd==2.0.1; python_full_version >= "3.8.1" diff --git a/setup.py b/setup.py index 59be4b67..0d3b7abf 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup_kwargs = { "name": "sbti-finance-tool", - "version": "1.0.9", + "version": "2.0.9", "description": "This package helps companies and financial institutions to assess the temperature alignment of current targets, commitments, and investment and lending portfolios, and to use this information to develop targets for official validation by the SBTi.'", "long_description": "> Visit https://sciencebasedtargets.github.io/SBTi-finance-tool/ for the full documentation\n\n> If you have any additional questions or comments send a mail to: finance@sciencebasedtargets.org\n\n# SBTi Temperature Alignment tool\n\nThis package helps companies and financial institutions to assess the temperature alignment of current\ntargets, commitments, and investment and lending portfolios, and to use this information to develop\ntargets for official validation by the SBTi.\n\nThis tool can be used either as a standalone Python package, a REST API or as a simple webapp which provides a simple skin on the API.\nSo, the SBTi toolkit caters for three types of usage:\n\n- Users can integrate the Python package in their codebase\n- The tool can be included as a Microservice (containerised REST API) in any IT infrastructure (in the cloud or on premise)\n- As an webapp, exposing the functionality with a simple user interface.\n\nTo following diagram provides an overview of the different parts of the toolkit:\n\n +-------------------------------------------------+\n | UI : Simple user interface on top of API |\n | Install: via dockerhub |\n | docker.io/sbti/ui:latest |\n | |\n | +-----------------------------------------+ |\n | | REST API: Dockerized FastAPI/NGINX | |\n | | Source : github.com/OFBDABV/SBTi_api | |\n | | Install: via source or dockerhub | |\n | | docker.io/sbti/sbti/api:latest | |\n | | | |\n | | +---------------------------------+ | |\n | | | | | |\n | | |Core : Python Module | | |\n | | |Source : github.com/ScienceBasedTargets/ |\n | | | SBTi-finance-tool | | |\n | | |Install: via source or PyPi | | |\n | | | | | |\n | | +---------------------------------+ | |\n | +-----------------------------------------+ |\n +-------------------------------------------------+\n\nAs shown above the API is dependent on the Python Repo, in the same way the UI requires the API backend. These dependencies are scripted in the Docker files.\n\n> This repository only contains the Python module. If you'd like to use the REST API, please refer to [this repository](https://github.com/ScienceBasedTargets/SBTi-finance-tool_api) or the same repository on [Dockerhub](https://docker.io/sbti/sbti/api:latest).\n\n## Structure\n\nThe folder structure for this project is as follows:\n\n .\n ├── .github # Github specific files (Github Actions workflows)\n ├── app # FastAPI app files for the API endpoints\n ├── docs # Documentation files (Sphinx)\n ├── config # Config files for the Docker container\n ├── SBTi # The main Python package for the temperature alignment tool\n └── test # Automated unit tests for the SBTi package (Nose2 tests)\n\n## Installation\n\nThe SBTi package may be installed using PIP. If you'd like to install it locally use the following command. For testing or production please see the deployment section for further instructions\n\n```bash\npip install -e .\n```\n\nFor installing the latest stable release in PyPi run:\n\n```bash\npip install sbti\n```\n\n## Development\n\nTo set up the local dev environment with all dependencies, [install poetry](https://python-poetry.org/docs/#osx--linux--bashonwindows-install-instructions) and run\n\n```bash\npoetry install\n```\n\nThis will create a virtual environment inside the project folder under `.venv`.\n\n### Testing\n\nEach class should be unit tested. The unit tests are written using the Nose2 framework.\nThe setup.py script should have already installed Nose2, so now you may run the tests as follows:\n\n```bash\nnose2 -v\n```\n\n### Publish to PyPi\n\nThe package should be published to PyPi when any changes to main are merged.\n\nUpdate package\n\n1. bump version in `pyproject.toml` based on semantic versioning principles\n2. run `poetry build`\n3. run `poetry publish`\n4. check whether package has been successfully uploaded\n\n**Initial Setup**\n\n- Create account on [PyPi](https://pypi.org/)\n", "author": "sbti", @@ -27,7 +27,7 @@ "packages": packages, "package_data": package_data, "install_requires": install_requires, - "python_requires": ">=3.7.1,<4", + "python_requires": ">=3.8.1,<4", }