From 941af90e1f2db32a015e888a111a8416c3960457 Mon Sep 17 00:00:00 2001 From: AA-Turner <9087854+AA-Turner@users.noreply.github.com> Date: Thu, 7 Jan 2021 17:33:37 +0000 Subject: [PATCH] Bump python to 3.8 --- .pre-commit-config.yaml | 2 +- .readthedocs.yml | 2 +- .travis.yml | 8 ++++---- README.md | 4 ++-- environment.yml | 2 +- setup.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c86af76e..21c7bc01 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,4 +3,4 @@ repos: rev: stable hooks: - id: black - language_version: python3.7 + language_version: python3.8 diff --git a/.readthedocs.yml b/.readthedocs.yml index cc1afa13..f3bd2dc1 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,7 @@ sphinx: configuration: docs/source/conf.py fail_on_warning: false python: - version: 3.7 + version: 3.8 install: - method: setuptools path: package diff --git a/.travis.yml b/.travis.yml index c1239293..7263ea19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,12 @@ cache: # run tests and linting separately matrix: include: - - name: "3.7 lint" - python: 3.7 + - name: "3.8 lint" + python: 3.8 env: - TEST_CMD="pre-commit run --all-files" - - name: "3.7 tests" - python: 3.7 + - name: "3.8 tests" + python: 3.8 env: - TEST_CMD="pytest --cov=./" diff --git a/README.md b/README.md index d1750ab2..a2bf09ee 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Mapping Scouts data to UK administrative regions. [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) ## Prerequisites: -This is written and tested in Python 3.7. +This is written and tested in Python 3.8. This project is largely dependent on `geopandas` and `pandas`, along with `folium`, `dash`, and `shapely`. @@ -45,7 +45,7 @@ To install geopandas and its dependencies, follow below It is highly recommended to use conda to install geopandas. However, to install geopandas using pip on windows, follow the following steps: -* Download the wheels for [GDAL](http://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal), [Fiona](http://www.lfd.uci.edu/~gohlke/pythonlibs/#fiona), and [Rtree](http://www.lfd.uci.edu/~gohlke/pythonlibs/#rtree). Choose the correct python version (currently 3.7) and platform +* Download the wheels for [GDAL](http://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal), [Fiona](http://www.lfd.uci.edu/~gohlke/pythonlibs/#fiona), and [Rtree](http://www.lfd.uci.edu/~gohlke/pythonlibs/#rtree). Choose the correct python version (currently 3.8) and platform * Install any prerequisites listed on Gohlke's site (e.g. C++ redistributables) * `pip install` the wheels in the following order (preferably in a Virtual Environment) 1. [GDAL](http://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal) diff --git a/environment.yml b/environment.yml index 622cbcce..ef7d88b2 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python>=3.7 + - python>=3.8 - pip # Core requirements - branca diff --git a/setup.py b/setup.py index 54992c32..03e7ff43 100644 --- a/setup.py +++ b/setup.py @@ -7,5 +7,5 @@ packages=find_namespace_packages(), install_requires=["pandas", "numpy", "folium", "branca", "geopandas", "shapely", "dash", "pyarrow"], extras_require={"dev": ["pytest", "hypothesis", "pytest-cov", "pre-commit", "black"]}, - python_requires=">=3.7", + python_requires=">=3.8", )