Skip to content

Commit

Permalink
Merge branch 'master' into drop-dashboard-1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
IKarbowiak authored Nov 27, 2019
2 parents 9d05d80 + d2273a7 commit e9894c2
Show file tree
Hide file tree
Showing 47 changed files with 2,467 additions and 1,014 deletions.
17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ language: python
sudo: false

python:
- "3.6"
- "3.7"
- "3.8"

branches:
only:
Expand Down Expand Up @@ -46,19 +45,17 @@ matrix:
fast_finish: true
include:
- env: TOXENV=black
python: "3.6"
python: "3.8"
- env: TOXENV=flake8
python: "3.6"
python: "3.8"
- env: TOXENV=check_gql_schema
python: "3.6"
python: "3.8"
- env: TOXENV=check_migrations
python: "3.6"
python: "3.8"
- env: TOXENV=pydocstyle
python: "3.6"
python: "3.8"
allow_failures:
- python: "3.6"
env: DJANGO="master"
- python: "3.7"
- python: "3.8"
env: DJANGO="master"

services:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable, unreleased changes to this project will be documented in this file.

## [Unreleased]

- Relocate Checkout and CheckoutLine methods into separate module and update checkout related plugins to use them - #4980 by @krzysztofwolski
- Fix problem with free shipping voucher - #4942 by @IKarbowiak
- Add sub-categories to random data - #4949 by @IKarbowiak
- Deprecate `localized` field in Money type - #4952 by @IKarbowiak
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Build and install packages
FROM python:3.7 as build-python
FROM python:3.8 as build-python

RUN apt-get -y update \
&& apt-get install -y gettext \
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN STATIC_URL=${STATIC_URL} npm run build-assets --production \
&& npm run build-emails --production

### Final image
FROM python:3.7-slim
FROM python:3.8-slim

ARG STATIC_URL
ENV STATIC_URL ${STATIC_URL:-/static/}
Expand All @@ -51,7 +51,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

COPY . /app
COPY --from=build-python /usr/local/lib/python3.7/site-packages/ /usr/local/lib/python3.7/site-packages/
COPY --from=build-python /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
COPY --from=build-python /usr/local/bin/ /usr/local/bin/
COPY --from=build-nodejs /app/saleor/static /app/saleor/static
COPY --from=build-nodejs /app/webpack-bundle.json /app/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Help us out… If you love free stuff and great software, give us a star! 🌟

## Installation

Saleor requires Python 3.6+, Node.js 10.0+, PostgreSQL and OS-specific dependency tools.
Saleor requires Python 3.8, Node.js 10.0+, PostgreSQL and OS-specific dependency tools.

[See the Saleor docs](https://docs.saleor.io/docs/getting-started/intro/) for step-by-step installation and deployment instructions.

Expand Down
Loading

0 comments on commit e9894c2

Please sign in to comment.