Skip to content

Commit

Permalink
Upgrade pipenv, fix #72
Browse files Browse the repository at this point in the history
  • Loading branch information
jirik committed May 16, 2021
1 parent e4fb530 commit 858750b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
## v1.13.0
{release_date}
### Upgrade requirements
- If you are running Layman with development settings, run `make timgen-build`.
- If you are running Layman with development settings, run
```
make build-dev
make timgen-build
```
### Migrations and checks
#### Schema migrations
#### Data migrations
Expand All @@ -14,6 +18,7 @@
- [#159](https://github.com/jirik/layman/issues/159) [WFS-T](doc/endpoints.md#web-feature-service) request causes update of bounding box and thumbnail of each edited layer in [asynchronous chain](doc/async-tasks.md). Documentation describes concurrency of WFS-T request and its asynchronous chains with another [WFS-T request](doc/endpoints.md#web-feature-service), [PATCH Workspace Layer](doc/rest.md#patch-workspace-layer), [DELETE Workspace Layer](doc/rest.md#delete-workspace-layer), and [DELETE Workspace Layers](doc/rest.md#delete-workspace-layers).
- [#331](https://github.com/jirik/layman/issues/331) Query parameter *full_text_filter* is also use for substring search in all endpoints with filtering.
- Filesystem directory containing workspaces was renamed from `users` to `workspaces`
- [#72](https://github.com/jirik/layman/issues/72) Pipenv upgraded to v2020.11.15

## v1.12.0
2021-04-21
Expand Down
2 changes: 1 addition & 1 deletion doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
| [gdal](http://www.gdal.org/) | 2.4.0 | MIT License | geographicags/docker-gdal2 | prod | bin | to import vector files into DB |
| [chromium](https://www.chromium.org/) | 77+ | BSD and others | Dockerfile | prod | bin | for client-side map rendering and integration testing |
| [chromedriver](http://chromedriver.chromium.org/) | 77+ | BSD and others | Dockerfile | prod | bin | for client-side map rendering and integration testing |
| [pipenv](https://pipenv.pypa.io/en/latest/) | 2018.11.26 | MIT | Dockerfile | prod | bin | to install Python dependencies |
| [pipenv](https://pipenv.pypa.io/en/latest/) | 2020.11.15 | MIT | Dockerfile | prod | bin | to install Python dependencies |
| [node.js](https://nodejs.org/) | 10 | MIT | timgen/Dockerfile | prod | bin | to run Timgen |
| [npm](https://www.npmjs.com/get-npm) | 6 | Artistic License 2.0 | timgen/Dockerfile | prod | bin | to install node.js dependencies |
| [node.js](https://nodejs.org/) | 12 | MIT | client/docker/Dockerfile | prod | bin | to run Layman Test Client |
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM geographica/gdal2:2.4.0

RUN apt-get clean && apt-get update && \
apt-get -y -qq install unzip curl python3-pip chromium-browser python3-lxml && \
pip3 install pipenv==2018.11.26
pip3 install pipenv==2020.11.15

RUN export MAIN_CHROME_VERSION=$(apt-cache policy chromium-browser | grep -oP "Installed: \K\w+") && \
echo "Installed chromium-browser ${MAIN_CHROME_VERSION}" && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM geographica/gdal2:2.4.0

RUN apt-get clean && apt-get update && \
apt-get -y -qq install unzip curl python3-pip chromium-browser python3-lxml && \
pip3 install pipenv==2018.11.26
pip3 install pipenv==2020.11.15

RUN export MAIN_CHROME_VERSION=$(apt-cache policy chromium-browser | grep -oP "Installed: \K\w+") && \
echo "Installed chromium-browser ${MAIN_CHROME_VERSION}" && \
Expand Down

0 comments on commit 858750b

Please sign in to comment.