Skip to content

Commit

Permalink
Merge pull request #55 from geoadmin/develop
Browse files Browse the repository at this point in the history
New Release v1.5.0 - #minor
  • Loading branch information
ltshb authored May 18, 2022
2 parents 61d942b + e193d5e commit b2c53dc
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 220 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Buster slim python 3.7 base image.
FROM python:3.7-slim-buster
FROM python:3.9-slim-buster
RUN groupadd -r geoadmin && useradd -u 1000 -r -s /bin/false -g geoadmin geoadmin


Expand Down
11 changes: 2 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ help:
@echo
@echo "Possible targets:"
@echo -e " \033[1mSetup TARGETS\033[0m "
@echo "- setup Create the python virtual environment and activate it"
@echo "- dev Create the python virtual environment with developper tools and activate it"
@echo "- setup Create the python virtual environment with developper tools and activate it"
@echo "- ci Create the python virtual environment and install requirements based on the Pipfile.lock"
@echo -e " \033[1mFORMATING, LINTING AND TESTING TOOLS TARGETS\033[0m "
@echo "- format Format the python source code"
Expand All @@ -91,15 +90,9 @@ help:

# Build targets. Calling setup is all that is needed for the local files to be installed as needed.

.PHONY: dev
dev: $(REQUIREMENTS)
pipenv install --dev
pipenv shell


.PHONY: setup
setup: $(REQUIREMENTS)
pipenv install
pipenv install --dev
pipenv shell


Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ pylint = "*"
pylint-flask = "*"

[requires]
python_version = "3.7"
python_version = "3.9"
Loading

0 comments on commit b2c53dc

Please sign in to comment.