diff --git a/MANIFEST.in b/MANIFEST.in index f568748..74215c3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,8 +1,2 @@ include README.md -include LICENSE -include requirements.txt -recursive-include environmental_insights/environmental_insights_data * -recursive-include environmental_insights/environmental_insights_models * -recursive-include environmental_insights/environmental_insights_visulisations * -recursive-include Documentation * -recursive-include tests * +include LICENSE \ No newline at end of file diff --git a/README.md b/README.md index 808b50a..7ba4710 100644 --- a/README.md +++ b/README.md @@ -83,4 +83,4 @@ The documentation for the project is included within the directory "Documentatio ## Pypip -Using `python -m build` will use the `pyproject.toml` file to locally build the package and store it within the `dist` directory. This can then be installed using `pip install dist/*.whl`. The final `dist` files can be uploaded to PyPI via twine. \ No newline at end of file +Using `python -m build` will use the `pyproject.toml` file to locally build the package and store it within the `dist` directory. This can then be installed using `pip install dist/*.whl`. The final `dist` files can be uploaded to PyPI via twine, using "". \ No newline at end of file diff --git a/environmental_insights/__init__.py b/environmental_insights/__init__.py index c95a78c..e69de29 100644 --- a/environmental_insights/__init__.py +++ b/environmental_insights/__init__.py @@ -1,14 +0,0 @@ -# environmental_insights/__init__.py - -# Import specific functions from each module -from .air_pollution_functions import * - -from .data import * - -from .download import * - -from .models import * - -from .variables import * - -# You can also add any initialization code needed for your package here diff --git a/pyproject.toml b/pyproject.toml index 463c50f..fcac50e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,54 +3,30 @@ requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" [project] -name = "environmental-insights" -version = "0.1.3_beta" +name = "environmental_insights" +version = "0.1.7b0" description = "A Python package for democratizing access to ambient air pollution data and predictive analytics." -readme = "README.md" -requires-python = ">=3.6" -license = {text = "GNU General Public License v3 (GPLv3)"} - authors = [ - {name = "Liam J. Berrisford", email = "l.berrisford@exeter.ac.uk"} + { name="Liam J. Berrisford", email="l.berrisford@exeter.ac.uk" } ] +license = { text="GNU General Public License v3 (GPLv3)" } +keywords = ["air pollution", "predictive analytics", "environmental data", "geospatial analysis"] +readme = "README.md" -classifiers = [ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", - "Operating System :: OS Independent" -] - -keywords = ["air pollution", "data analysis", "environmental insights"] - -urls = { "Homepage" = "https://github.com/berrli/Environmental-Insights" } dependencies = [ - "lightgbm==3.3.3", - "geopandas==0.14.1", - "pandas==2.1.3", - "scipy==1.11.4", - "matplotlib==3.8.2", - "overpy==0.6", - "shapely==2.0.2", - "pyarrow==14.0.1", - "pyogrio==0.7.2", + "geopandas", + "lightgbm", + "matplotlib", + "overpy", + "pandas", + "pyarrow", + "pyogrio", "requests", - "rpy2" -] - -[project.optional-dependencies] -dev = [ - "pytest==8.3.2", - "black==23.9.1", - "nbformat>=5.0" + "rpy2", + "scipy", + "shapely" ] -[project.scripts] -insights = "environmental_insights.main:main" - -[tool.setuptools] -include-package-data = true - [tool.setuptools.packages.find] -where = ["environmental_insights"] -include = ["*"] +where = ["."] diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 6b8fe4b..0000000 --- a/requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -lightgbm==3.3.3 -geopandas==0.14.1 -pandas==2.1.3 -scipy==1.11.4 -matplotlib==3.8.2 -overpy==0.6 -shapely==2.0.2 -pyarrow==14.0.1 -pyogrio==0.7.2 -pytest==8.3.2 # Ensure pytest is included -black==23.9.1 -nbformat>=5.0 # This is needed for black's Jupyter support -requests -rpy2