Skip to content

Commit

Permalink
Bump python to 3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
AA-Turner committed Jan 7, 2021
1 parent 533cfc9 commit 941af90
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ repos:
rev: stable
hooks:
- id: black
language_version: python3.7
language_version: python3.8
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=./"

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python>=3.7
- python>=3.8
- pip
# Core requirements
- branca
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

0 comments on commit 941af90

Please sign in to comment.