Skip to content

Commit

Permalink
python 3.6 is EOL (#264)
Browse files Browse the repository at this point in the history
  • Loading branch information
dionhaefner authored Apr 28, 2022
1 parent 0ed9b50 commit 2e8bcdb
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 23 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
os: [ubuntu-latest]
# only test oldest and most recent supported Python versions
# no rasterio wheels on 3.10 yet, so we use 3.9 for now
python-version: ["3.6", "3.9"]
python-version: ["3.7", "3.9"]

defaults:
run:
shell: bash

services:
postgres:
image: postgres
Expand Down Expand Up @@ -113,7 +113,6 @@ jobs:

matrix:
os: [macos-latest, windows-latest]
# Python 3.6 is EOL on conda-forge, so use 3.7 instead
python-version: ["3.7", "3.10"]

defaults:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Terracotta is a pure Python tile server that runs as a WSGI app on a
dedicated webserver or as a serverless app on AWS Lambda. It is built on a
modern Python 3.6 stack, powered by awesome open-source software such as
modern Python stack, powered by awesome open-source software such as
[Flask](http://flask.pocoo.org), [Zappa](https://github.com/Miserlou/Zappa),
and [Rasterio](https://github.com/mapbox/rasterio).

Expand Down
3 changes: 1 addition & 2 deletions docs/get-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ to create a new environment containing all dependencies and Terracotta:
$ conda env create -f environment.yml
If you already have a Python 3.6 installation that you want to use, you
can just run
If you already have Python 3.7 (or above) installed, you can just run

.. code-block:: bash
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Use cases
Installation
------------

If you are using Linux and already have Python 3.6+ installed, all you need to
If you are using Linux and already have Python 3.7+ installed, all you need to
do to check out Terracotta is

.. code-block:: bash
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorials/aws.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ a deployment environment:
.. code-block:: bash
$ pip install virtualenv --user
$ virtualenv ~/envs/tc-deploy --python=python3.6
$ virtualenv ~/envs/tc-deploy --python=python3.7
$ source ~/envs/tc-deploy/bin/activate
If you do not have Python 3.6 installed, one way to get it is via the
If you do not have Python 3.7 installed, one way to get it is via the
``deadsnakes`` PPA (on Ubuntu):

.. code-block:: bash
$ sudo add-apt-repository ppa:deadsnakes/ppa
$ sudo apt update
$ sudo apt install python3.6-dev
$ sudo apt install python3.7-dev
Alternatively, you can use ``pyenv`` or ``conda``.

Expand Down
14 changes: 7 additions & 7 deletions docs/tutorials/windows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Set up conda and install Terracotta
$ git clone https://github.com/DHI-GRAS/terracotta.git
Alternatively,
Alternatively,
`you can choose and download a release version <https://github.com/DHI-GRAS/terracotta/releases>`__.

4. Go to the Terracotta folder, and run
Expand Down Expand Up @@ -54,7 +54,7 @@ support raster files located on AWS S3, and databases on S3 (through the
:class:`~terracotta.drivers.mysql.MySQLDriver`). To use these features, you need
to create an account and authenticate with it.

1. If you do not have an account on AWS yet,
1. If you do not have an account on AWS yet,
`just head over and create one <https://aws.amazon.com>`__.

2. You will need to create an IAM user that has programmatic access to your account.
Expand All @@ -63,7 +63,7 @@ to create an account and authenticate with it.

In the easiest setup, you can give it full permission to your account
(but make sure to keep the key secret). For that, enter a username (such as
``awscli``), check the box ``Programmatic access``, and attach the
``awscli``), check the box ``Programmatic access``, and attach the
``AdministratorAccess`` policy.

3. After you have created the IAM user, AWS will show you the corresponding ID and
Expand Down Expand Up @@ -116,20 +116,20 @@ for deployment. This is why we rely on the Windows subsystem for Linux (WSL).
2. This and all further steps should be executed in a WSL shell. We will have to re-install
Terracotta and its dependencies inside Linux.

We will start by installing Python 3.6 and some libraries:
We will start by installing Python 3.7 and some libraries:

.. code-block:: bash
$ sudo add-apt-repository ppa:deadsnakes/ppa
$ sudo apt update
$ sudo apt install build-essential gdal-bin git libgdal-dev python3.6-dev
$ sudo apt install build-essential gdal-bin git libgdal-dev python3.7-dev
3. Create a new virtual Python environment that we will use to deploy Terracotta:

.. code-block:: bash
$ pip install virtualenv --user
$ virtualenv --python=python3.6 ~/envs/tc-deploy
$ virtualenv --python=python3.7 ~/envs/tc-deploy
Activate the new environment by running

Expand All @@ -142,7 +142,7 @@ for deployment. This is why we rely on the Windows subsystem for Linux (WSL).
.. code-block:: bash
$ git clone https://github.com/DHI-GRAS/terracotta.git
5. Switch to the Terracotta folder and install the Zappa requirements and Terracotta:

.. code-block:: bash
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
- nodefaults
dependencies:
- python>=3.6
- python>=3.7
- numpy
- rasterio>=1.0
- shapely
Expand Down
4 changes: 2 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
image: latest

python:
version: 3.6
version: 3.7
pip_install: true
extra_requirements:
- docs
- docs
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
'Development Status :: 4 - Beta',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand All @@ -47,7 +46,7 @@
],
# module
packages=find_packages(exclude=['docs', 'tests']),
python_requires='>=3.6',
python_requires='>=3.7',
use_scm_version={
'write_to': 'terracotta/_version.py'
},
Expand Down
2 changes: 1 addition & 1 deletion zappa_settings.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ app_function = "terracotta.server.app.app"
aws_region = "eu-central-1"
profile_name = "default"
project_name = "tc-test"
runtime = "python3.6"
runtime = "python3.7"
s3_bucket = "zappa-teracotta-dev"
exclude = [
"*.gz",
Expand Down

0 comments on commit 2e8bcdb

Please sign in to comment.