Skip to content

Commit

Permalink
Merge pull request #37 from larsnaesbye/python3.9
Browse files Browse the repository at this point in the history
Update Python to 3.9
  • Loading branch information
larsnaesbye authored Feb 1, 2022
2 parents 180b78e + 3e55684 commit 196d236
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
conda info -a
conda env create -f environment-dev.yaml
conda activate webproj
conda install coveralls
pytest --cov
- run: >-
docker exec restapi curl -s
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 'app' is present and everything should run smoothly with all the bells and
# whistles of a properly configured HTTP server

FROM tiangolo/meinheld-gunicorn-flask:python3.8
FROM tiangolo/meinheld-gunicorn-flask:python3.9

ENV WEBPROJ_LIB /proj

Expand Down
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ $ conda activate webproj
For production use, the API should be installed as a component in a
WSGI compatible http server. How to configure this depends on the used http server.


Remember to run projsync in order to install the datum grids.

```
$ projsync --source-id dk_sdfe
```

### Tests

WEBPROJ uses the `pytest` environment for tests. Run the test-suite with
Expand Down
6 changes: 2 additions & 4 deletions environment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.8
- python=3.9
- pip>=20.0
- werkzeug>=1.0
- flask>=1.0
- flask-restx>=0.1.1
- flask-cors>=3.0
- proj-datumgrid-europe=1.4
- proj-datumgrid-north-america=1.2
- pyproj>=3.3
- black
- pytest
- coverage<5.0.0
- coverage
- pytest-cov
4 changes: 1 addition & 3 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.8
- python=3.9
- pip>=20.0
- werkzeug>=1.0
- flask>=1.0
- flask-x>=0.1.1
- flask-cors>=3.0
- proj-datumgrid-europe=1.4
- proj-datumgrid-north-america=1.2
- pyproj>=3.3

0 comments on commit 196d236

Please sign in to comment.