update pull

.gitignore

@@ -24,6 +24,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+package-lock.json
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -60,11 +61,6 @@ src/ralph/settings/*local.py
 src/ralph/cross_validator/settings_local.py
 src/ralph/urls/*local.py
 
-# Vagrant
-vagrant/.vagrant
-vagrant/Vagrantfile.local
-vagrant/provision.local.sh
-
 # mkdocs
 site/
 
@@ -86,3 +82,10 @@ debian/ralph-core/*
 
 # mypy
 .mypy_cache/
+
+# other
+.python-version
+tags
+*.lock
+.*.swp
+.*.swo

.travis.yml

@@ -11,7 +11,7 @@ env:
         - REDIS_PORT=6379
         - DATABASE_PORT=5433
     matrix:
-        - DJANGO_VERSION=1.8.18 TEST_DB_ENGINE=mysql MYSQL_VERSION=5.6
+        - DJANGO_VERSION=1.8.18 TEST_DB_ENGINE=mysql MYSQL_VERSION=5.6.45
         - DJANGO_VERSION=1.8.18 TEST_DB_ENGINE=mysql MYSQL_VERSION=5.5
         - DJANGO_VERSION=1.8.18 TEST_DB_ENGINE=psql
         # Django 1.9 build will not pass until #2132 will be merged
@@ -34,10 +34,11 @@ cache:
     - bower_components
 
 python:
-    - "3.4"
     - "3.6"
 
 before_install:
+    - nvm install 11.15.0
+    - nvm use 11.15.0
     - pip install flake8==3.0.4 isort==4.2.5
     - make flake
     - npm install -g gulp

CONTRIBUTING.md

@@ -19,23 +19,6 @@ This is how you fix a bug or add a feature in few quick steps:
 
 Introduce yourself at our Gitter Chat https://gitter.im/allegro/ralph, where current Ralph-related issues and concerns are aired, shared and solved.
 
-## Development environment
-
-Make your software compatible with Ralph development requirements.
-
-1. First, install `git` and `Vagrant` applications.
-2. Then, `git clone https://github.com/allegro/ralph`. The "ng" branch is used by Ralph 3.0, the newest version of the software, currently under development. We do not work anymore on old 2.x branch from develop branch.
-4. Inside "vagrant" directory you will find Vagrantfile for setting up development environment. Just type `vagrant up` to boot up complete development environment.
-5. Now log in the virtual box environment with `vagrant ssh`.
-6. Virtualenv is activated automatically - shell script sits in ~/bin/activate.
-7. Run `make menu`.
-8. Run ralph instance with `make run`, login to the localhost:8000 using `ralph`:`ralph` creditentials.
-
-Then, you are all set ! In case of problems with setting everything up, refer to the `https://github.com/allegro/ralph/tree/ng/vagrant`
-
-If you want to extend Ralph by your own Django app, place your config inside
-`vagrant/Vagrantfile.local` (ex. synced folders). You could also attach custom
-provisioning script in `vagrant/provision.local.sh`.
 
 ## Bug tracker & sprints
 

LICENSE

@@ -1,4 +1,192 @@
-   Copyright 2012-2015 Allegro Group
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 Allegro.pl sp. z o.o.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,14 +1,20 @@
 TEST?=ralph
+TEST_ARGS=
 DOCKER_REPO_NAME?="allegro"
 
 .PHONY: test flake clean coverage docs coveralls
 
 # release-new-version is used by ralph mainteiners prior to publishing
-# new version of the package. The command generates the debian changelog 
+# new version of the package. The command generates the debian changelog
 # commits it and tags the created commit with the appropriate snapshot version.
 release-new-version: new_version = $(shell ./get_version.sh generate)
 release-new-version:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build \
+		--force-rm \
+		-f docker/Dockerfile-deb \
+		--build-arg GIT_USER_NAME="$(shell git config user.name)" \
+		--build-arg GIT_USER_EMAIL="$(shell git config user.email)" \
+		-t ralph-deb:latest .
 	docker run --rm -it -v $(shell pwd):/volume ralph-deb:latest release-new-version
 	docker image rm --force ralph-deb:latest
 	git add debian/changelog
@@ -18,29 +24,48 @@ release-new-version:
 # build-package builds a release version of the package using the generated
 # changelog and the tag.
 build-package:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
 	docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-package
 	docker image rm --force ralph-deb:latest
 
 # build-snapshot-package renerates a snapshot changelog and uses it to build
 # snapshot version of the package. It is mainly used for testing.
 build-snapshot-package:
-	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb .
+	docker build --force-rm -f docker/Dockerfile-deb -t ralph-deb:latest .
 	docker run --rm -v $(shell pwd):/volume ralph-deb:latest build-snapshot-package
 	docker image rm --force ralph-deb:latest
 
 build-docker-image: version = $(shell git describe --abbrev=0)
 build-docker-image:
 	docker build \
 		--no-cache \
-        -f docker/Dockerfile-prod \
-        --build-arg RALPH_VERSION="$(version)" \
-        -t $(DOCKER_REPO_NAME)/ralph:latest \
-        -t "$(DOCKER_REPO_NAME)/ralph:$(version)" .
+		-f docker/Dockerfile-prod \
+		--build-arg RALPH_VERSION="$(version)" \
+		-t $(DOCKER_REPO_NAME)/ralph:latest \
+		-t "$(DOCKER_REPO_NAME)/ralph:$(version)" .
+	docker build \
+		--no-cache \
+		-f docker/Dockerfile-static \
+		--build-arg RALPH_VERSION="$(version)" \
+		-t $(DOCKER_REPO_NAME)/ralph-static-nginx:latest \
+		-t "$(DOCKER_REPO_NAME)/ralph-static-nginx:$(version)" .
+
+build-snapshot-docker-image: version = $(shell ./get_version.sh show)
+build-snapshot-docker-image: build-snapshot-package
+	docker build \
+		-f docker/Dockerfile-prod \
+		--build-arg RALPH_VERSION="$(version)" \
+		--build-arg SNAPSHOT="1" \
+		-t $(DOCKER_REPO_NAME)/ralph:latest \
+		-t "$(DOCKER_REPO_NAME)/ralph:$(version)" .
+	docker build \
+		-f docker/Dockerfile-static \
+		--build-arg RALPH_VERSION="$(version)" \
+		-t "$(DOCKER_REPO_NAME)/ralph-static-nginx:$(version)" .
+
 
 install-js:
 	npm install
-	bower install
 	./node_modules/.bin/gulp
 
 js-hint:
@@ -62,7 +87,7 @@ isort:
 	isort --diff --recursive --check-only --quiet src
 
 test: clean
-	test_ralph test $(TEST)
+	test_ralph test $(TEST) $(TEST_ARGS)
 
 flake: isort
 	flake8 src/ralph

NOTICE

@@ -0,0 +1,17 @@
+                     TRADEMARK NOTICE
+
+Allegro.pl sp. z o.o. is the owner inter alia of the following
+registered and reputed trademarks:
+
+ALLEGRO EUIPO 009759788
+https://euipo.europa.eu/eSearch/#details/trademarks/009759788
+
+WWW.ALLEGRO.PL UPRP R-282691
+http://regservtd.uprp.pl/register/application?lng=de&number=Z.301617
+
+ALLEGRO UPRP R-318812
+http://regservtd.uprp.pl/register/application?lng=de&number=Z.491937
+
+All other trademarks, service marks, trade dress, and logos
+used in the source code are the trademarks, service marks, trade
+dress, and logos of their respective owners.