diff --git a/branches/cloudbuild.yaml b/branches/cloudbuild.yaml index 83f4b6033..95caff7dd 100644 --- a/branches/cloudbuild.yaml +++ b/branches/cloudbuild.yaml @@ -24,7 +24,7 @@ steps: substitutions: _ZONE: us-central1-c _INSTANCE_PATH: /home - _BUILD_ID: 'v1-220004-cron' + _BUILD_ID: 'v1-240800-cron' _INSTANCE_NAME: chetabahana@backend _LOCAL_PATH: /workspace/home/chetabahana diff --git a/branches/home/chetabahana/.docker/branch/Pipfile.lock b/branches/home/chetabahana/.docker/branch/Pipfile.lock index 3ffbb24a2..55b9d27d2 100644 --- a/branches/home/chetabahana/.docker/branch/Pipfile.lock +++ b/branches/home/chetabahana/.docker/branch/Pipfile.lock @@ -553,11 +553,10 @@ }, "graphene-django-optimizer": { "hashes": [ - "sha256:593828902df168b77303987c4c787fcb0816789dea25d8033c16cf735cd8924a", - "sha256:e602293b1b3e0ffe4706ae660690134f89bd618ab762fcaa14e8b960fe3ac639" + "sha256:be7bb8147ec34adfd1e951a7b59a1030eb5ba65f4384279db70fa73a3358bacb" ], "index": "pypi", - "version": "==0.4.1" + "version": "==0.4.2" }, "graphql-core": { "hashes": [ diff --git a/branches/home/chetabahana/.docker/branch/requirements.txt b/branches/home/chetabahana/.docker/branch/requirements.txt index c295e0e8f..566868a95 100644 --- a/branches/home/chetabahana/.docker/branch/requirements.txt +++ b/branches/home/chetabahana/.docker/branch/requirements.txt @@ -62,7 +62,7 @@ google-measurement-protocol==1.0.0 google-resumable-media==0.3.2 googleapis-common-protos==1.6.0 gprof2dot==2016.10.13 -graphene-django-optimizer==0.4.1 +graphene-django-optimizer==0.4.2 graphene-django==2.3.2 graphene==2.1.6 graphql-core==2.2 diff --git a/branches/scripts/branches.log b/branches/scripts/branches.log index 01b2c4e45..71d10a7de 100644 --- a/branches/scripts/branches.log +++ b/branches/scripts/branches.log @@ -17,37 +17,37 @@ tmpfs 370M 1.1M 369M 1% /run/docker.sock RAM -MemTotal: 3781808 kB -MemFree: 2291428 kB -MemAvailable: 3142984 kB -Buffers: 35332 kB -Cached: 960400 kB +MemTotal: 3781800 kB +MemFree: 2447748 kB +MemAvailable: 3154040 kB +Buffers: 117624 kB +Cached: 765176 kB SwapCached: 0 kB -Active: 825928 kB -Inactive: 444280 kB -Active(anon): 275424 kB -Inactive(anon): 192 kB -Active(file): 550504 kB -Inactive(file): 444088 kB +Active: 834520 kB +Inactive: 340896 kB +Active(anon): 293536 kB +Inactive(anon): 188 kB +Active(file): 540984 kB +Inactive(file): 340708 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 0 kB SwapFree: 0 kB -Dirty: 724 kB +Dirty: 600 kB Writeback: 0 kB -AnonPages: 274532 kB -Mapped: 204280 kB -Shmem: 1088 kB -Slab: 154044 kB -SReclaimable: 120208 kB -SUnreclaim: 33836 kB -KernelStack: 3200 kB -PageTables: 5872 kB +AnonPages: 292636 kB +Mapped: 238640 kB +Shmem: 1052 kB +Slab: 88140 kB +SReclaimable: 55696 kB +SUnreclaim: 32444 kB +KernelStack: 3264 kB +PageTables: 6392 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB -CommitLimit: 1890904 kB -Committed_AS: 1168688 kB +CommitLimit: 1890900 kB +Committed_AS: 1239952 kB VmallocTotal: 34359738367 kB VmallocUsed: 0 kB VmallocChunk: 0 kB @@ -62,140 +62,140 @@ HugePages_Free: 0 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB -DirectMap4k: 92148 kB -DirectMap2M: 2791424 kB -DirectMap1G: 1048576 kB +DirectMap4k: 100340 kB +DirectMap2M: 3831808 kB +DirectMap1G: 0 kB ASSETS /builder/home: total 60 -drwxr-xr-x 8 root root 4096 Jun 23 19:59 . -drwxr-xr-x 4 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 25 Jun 23 19:59 .bash_aliases --rw-r--r-- 1 root root 240 Jun 23 19:59 .bash_logout --rw-r--r-- 1 root root 3771 Jun 23 19:59 .bashrc -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .config -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .docker --rw-r--r-- 1 root root 58 Jun 23 19:59 .gitconfig -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .local -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .logs --rw-r--r-- 1 root root 906 Jun 23 19:59 .profile -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .ssh --rw-r--r-- 1 root root 175 Jun 23 19:59 .transifexrc -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .tx --rw-r--r-- 1 root root 248 Jun 23 19:59 .wget-hsts +drwxr-xr-x 8 root root 4096 Jun 24 08:00 . +drwxr-xr-x 4 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 25 Jun 24 08:00 .bash_aliases +-rw-r--r-- 1 root root 240 Jun 24 08:00 .bash_logout +-rw-r--r-- 1 root root 3771 Jun 24 08:00 .bashrc +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .config +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .docker +-rw-r--r-- 1 root root 58 Jun 24 08:00 .gitconfig +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .local +drwxr-xr-x 2 root root 4096 Jun 24 08:00 .logs +-rw-r--r-- 1 root root 906 Jun 24 08:00 .profile +drwxr-xr-x 2 root root 4096 Jun 24 08:01 .ssh +-rw-r--r-- 1 root root 175 Jun 24 08:00 .transifexrc +drwxr-xr-x 2 root root 4096 Jun 24 08:00 .tx +-rw-r--r-- 1 root root 248 Jun 24 08:00 .wget-hsts /builder/home/.config: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 3 root root 4096 Jun 23 19:59 gcloud +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 3 root root 4096 Jun 24 08:01 gcloud /builder/home/.config/gcloud: total 20 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 245 Jun 23 19:59 .last_update_check.json --rw------- 1 root root 4 Jun 23 19:59 gce -drwxr-xr-x 3 root root 4096 Jun 23 19:59 logs +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 245 Jun 24 08:01 .last_update_check.json +-rw------- 1 root root 4 Jun 24 08:01 gce +drwxr-xr-x 3 root root 4096 Jun 24 08:01 logs /builder/home/.config/gcloud/logs: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 2 root root 4096 Jun 23 19:59 2019.06.23 +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +drwxr-xr-x 2 root root 4096 Jun 24 08:01 2019.06.24 -/builder/home/.config/gcloud/logs/2019.06.23: +/builder/home/.config/gcloud/logs/2019.06.24: total 16 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 796 Jun 23 19:59 19.59.50.855182.log --rw-r--r-- 1 root root 604 Jun 23 19:59 19.59.51.389907.log +drwxr-xr-x 2 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 796 Jun 24 08:01 08.01.01.840258.log +-rw-r--r-- 1 root root 604 Jun 24 08:01 08.01.02.700283.log /builder/home/.docker: total 32 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 3 root root 4096 Jun 23 19:59 branch --rw-r--r-- 1 root root 462 Jun 23 19:59 common.env --rw-r--r-- 1 root root 2688 Jun 23 19:59 config.json --rw-r--r-- 1 root root 530 Jun 23 19:59 cron.sh --rw-r--r-- 1 root root 558 Jun 23 19:59 init.sh --rw-r--r-- 1 root root 3173 Jun 23 19:59 update.sh +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 3 root root 4096 Jun 24 08:00 branch +-rw-r--r-- 1 root root 462 Jun 24 08:00 common.env +-rw-r--r-- 1 root root 2688 Jun 24 08:00 config.json +-rw-r--r-- 1 root root 530 Jun 24 08:00 cron.sh +-rw-r--r-- 1 root root 558 Jun 24 08:00 init.sh +-rw-r--r-- 1 root root 3173 Jun 24 08:00 update.sh /builder/home/.docker/branch: total 108 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 2242 Jun 23 19:59 Pipfile --rw-r--r-- 1 root root 83966 Jun 23 19:59 Pipfile.lock --rw-r--r-- 1 root root 2678 Jun 23 19:59 requirements.txt --rw-r--r-- 1 root root 1333 Jun 23 19:59 requirements_dev.txt -drwxr-xr-x 2 root root 4096 Jun 23 19:59 saleor +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 2242 Jun 24 08:00 Pipfile +-rw-r--r-- 1 root root 83966 Jun 24 08:00 Pipfile.lock +-rw-r--r-- 1 root root 2678 Jun 24 08:00 requirements.txt +-rw-r--r-- 1 root root 1333 Jun 24 08:00 requirements_dev.txt +drwxr-xr-x 2 root root 4096 Jun 24 08:00 saleor /builder/home/.docker/branch/saleor: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 278 Jun 23 19:59 gunicorn.py +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 278 Jun 24 08:00 gunicorn.py /builder/home/.local: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 2 root root 4096 Jun 23 19:59 gcloud +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 2 root root 4096 Jun 24 08:00 gcloud /builder/home/.local/gcloud: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 1245 Jun 23 19:59 cloud_env.bat +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 1245 Jun 24 08:00 cloud_env.bat /builder/home/.logs: total 232 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 23970 Jun 23 19:59 branches.log --rw-r--r-- 1 root root 202260 Jun 23 19:59 compose.log +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 23970 Jun 24 08:00 branches.log +-rw-r--r-- 1 root root 202260 Jun 24 08:00 compose.log /builder/home/.ssh: total 68 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw------- 1 root root 2314 Jun 23 19:59 Chetabahana-f92949fb068b.json --rw------- 1 root root 209 Jun 23 19:59 agent --rw------- 1 root root 2604 Jun 23 19:59 authorized_keys --rw------- 1 root root 51 Jun 23 19:59 config --rw------- 1 root root 296 Jun 23 19:59 expect_clone --rw------- 1 root root 201 Jun 23 19:59 expect_push --rw------- 1 root root 40 Jun 23 19:59 github_token --rw------- 1 root root 1675 Jun 23 19:59 google_compute_engine --rw------- 1 root root 1758 Jun 23 19:59 google_compute_engine.enc --rw------- 1 root root 399 Jun 23 19:59 google_compute_engine.pub --rw------- 1 root root 222 Jun 23 19:59 google_compute_known_hosts --rw------- 1 root root 3326 Jun 23 19:59 id_rsa --rw------- 1 root root 3409 Jun 23 19:59 id_rsa.enc --rw------- 1 root root 1326 Jun 23 19:59 known_hosts --rw------- 1 root root 282 Jun 23 19:59 push +drwxr-xr-x 2 root root 4096 Jun 24 08:01 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw------- 1 root root 2314 Jun 24 08:00 Chetabahana-f92949fb068b.json +-rw------- 1 root root 209 Jun 24 08:00 agent +-rw------- 1 root root 2604 Jun 24 08:00 authorized_keys +-rw------- 1 root root 51 Jun 24 08:00 config +-rw------- 1 root root 296 Jun 24 08:00 expect_clone +-rw------- 1 root root 201 Jun 24 08:00 expect_push +-rw------- 1 root root 40 Jun 24 08:00 github_token +-rw------- 1 root root 1675 Jun 24 08:01 google_compute_engine +-rw------- 1 root root 1758 Jun 24 08:00 google_compute_engine.enc +-rw------- 1 root root 399 Jun 24 08:00 google_compute_engine.pub +-rw------- 1 root root 222 Jun 24 08:00 google_compute_known_hosts +-rw------- 1 root root 3326 Jun 24 08:01 id_rsa +-rw------- 1 root root 3409 Jun 24 08:00 id_rsa.enc +-rw------- 1 root root 1326 Jun 24 08:00 known_hosts +-rw------- 1 root root 282 Jun 24 08:00 push /builder/home/.tx: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 41 Jun 23 19:59 config +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 41 Jun 24 08:00 config EXPECT -Get:1 http://security.debian.org/debian-security stretch/updates InRelease [94.3 kB] -Ign:2 http://deb.debian.org/debian stretch InRelease +Ign:1 http://deb.debian.org/debian stretch InRelease +Get:2 http://security.debian.org/debian-security stretch/updates InRelease [94.3 kB] Get:3 http://deb.debian.org/debian stretch-updates InRelease [91.0 kB] Get:4 http://deb.debian.org/debian stretch Release [118 kB] Get:5 http://deb.debian.org/debian stretch Release.gpg [2434 B] Get:6 http://security.debian.org/debian-security stretch/updates/main amd64 Packages [499 kB] Get:7 http://deb.debian.org/debian stretch-updates/main amd64 Packages [27.2 kB] Get:8 http://deb.debian.org/debian stretch/main amd64 Packages [7082 kB] -Fetched 7914 kB in 1s (4189 kB/s) +Fetched 7914 kB in 3s (2246 kB/s) Reading package lists... Reading package lists... Building dependency tree... @@ -209,7 +209,7 @@ Need to get 296 kB of archives. After this operation, 589 kB of additional disk space will be used. Get:1 http://deb.debian.org/debian stretch/main amd64 tcl-expect amd64 5.45-7+deb9u1 [131 kB] Get:2 http://deb.debian.org/debian stretch/main amd64 expect amd64 5.45-7+deb9u1 [165 kB] -Fetched 296 kB in 0s (4736 kB/s) +Fetched 296 kB in 0s (4646 kB/s) Selecting previously unselected package tcl-expect:amd64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 30576 files and directories currently installed.) Preparing to unpack .../tcl-expect_5.45-7+deb9u1_amd64.deb ... @@ -226,15 +226,15 @@ PIPENV Collecting pipenv Downloading https://files.pythonhosted.org/packages/13/b4/3ffa55f77161cff9a5220f162670f7c5eb00df52e00939e203f601b0f579/pipenv-2018.11.26-py3-none-any.whl (5.2MB) -Requirement already satisfied: setuptools>=36.2.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (41.0.1) -Collecting virtualenv (from pipenv) - Downloading https://files.pythonhosted.org/packages/c4/9a/a3f62ac5122a65dec34ad4b5ed8d802633dae4bc06a0fc62e55fe3e96fe1/virtualenv-16.6.1-py2.py3-none-any.whl (2.0MB) Collecting certifi (from pipenv) Downloading https://files.pythonhosted.org/packages/69/1b/b853c7a9d4f6a6d00749e94eb6f3a041e342a885b87340b79c1ef73e3a78/certifi-2019.6.16-py2.py3-none-any.whl (157kB) Collecting virtualenv-clone>=0.2.5 (from pipenv) Downloading https://files.pythonhosted.org/packages/ba/f8/50c2b7dbc99e05fce5e5b9d9a31f37c988c99acd4e8dedd720b7b8d4011d/virtualenv_clone-0.5.3-py2.py3-none-any.whl Requirement already satisfied: pip>=9.0.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (19.1.1) -Installing collected packages: virtualenv, certifi, virtualenv-clone, pipenv +Collecting virtualenv (from pipenv) + Downloading https://files.pythonhosted.org/packages/c4/9a/a3f62ac5122a65dec34ad4b5ed8d802633dae4bc06a0fc62e55fe3e96fe1/virtualenv-16.6.1-py2.py3-none-any.whl (2.0MB) +Requirement already satisfied: setuptools>=36.2.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (41.0.1) +Installing collected packages: certifi, virtualenv-clone, virtualenv, pipenv Successfully installed certifi-2019.6.16 pipenv-2018.11.26 virtualenv-16.6.1 virtualenv-clone-0.5.3 PACKAGES @@ -607,7 +607,7 @@ google-measurement-protocol==1.0.0 - idna [required: >=2.5,<2.9, installed: 2.8] - urllib3 [required: >=1.21.1,<1.26,!=1.25.1,!=1.25.0, installed: 1.25.3] - typing [required: >=3.6.0, installed: 3.7.4] -graphene-django-optimizer==0.4.1 +graphene-django-optimizer==0.4.2 gunicorn==19.9.0 Markdown==3.1.1 - setuptools [required: >=36, installed: 41.0.1] @@ -718,7 +718,7 @@ All good! AGENT -Agent pid 3125 +Agent pid 3134 spawn ssh-add /builder/home/.ssh/id_rsa Enter passphrase for /builder/home/.ssh/id_rsa: Identity added: /builder/home/.ssh/id_rsa (/builder/home/.ssh/id_rsa)4096 SHA256:xefGz0xMkK/wmtCvyIVLdqNtJOGXVGRHUVp4BtSxBf8 /builder/home/.ssh/id_rsa (RSA) @@ -727,20 +727,21 @@ UPSTREAM Your branch is up-to-date with 'origin/master'. Current branch master is up to date. -HEAD is now at 812f815c4 Merge pull request #4319 from NyanKiyoshi/fix/events/add-note-anonymous +HEAD is now at f7897c7a9 Merge pull request #4336 from korycins/fix_populatedb_gift_card_duplication_error REMOTE Branch Chetabahana set up to track remote branch Chetabahana from origin. -HEAD is now at 812f815c4 Merge pull request #4319 from NyanKiyoshi/fix/events/add-note-anonymous +HEAD is now at f7897c7a9 Merge pull request #4336 from korycins/fix_populatedb_gift_card_duplication_error '/workspace/home/chetabahana/.docker/branch/Pipfile' -> '/builder/home/Tutorial-Buka-Toko/Pipfile' '/workspace/home/chetabahana/.docker/branch/Pipfile.lock' -> '/builder/home/Tutorial-Buka-Toko/Pipfile.lock' '/workspace/home/chetabahana/.docker/branch/requirements.txt' -> '/builder/home/Tutorial-Buka-Toko/requirements.txt' '/workspace/home/chetabahana/.docker/branch/requirements_dev.txt' -> '/builder/home/Tutorial-Buka-Toko/requirements_dev.txt' '/workspace/home/chetabahana/.docker/branch/saleor/gunicorn.py' -> '/builder/home/Tutorial-Buka-Toko/saleor/gunicorn.py' On branch Chetabahana -Your branch is behind 'origin/Chetabahana' by 1 commit, and can be fast-forwarded. - (use "git pull" to update your local branch) +Your branch and 'origin/Chetabahana' have diverged, +and have 4 and 1 different commits each, respectively. + (use "git pull" to merge the remote branch into yours) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) @@ -756,21 +757,21 @@ Untracked files: saleor/gunicorn.py no changes added to commit (use "git add" and/or "git commit -a") -[Chetabahana 71d55b6c7] Add support for taxonomy +[Chetabahana e1a5cd70e] Add support for taxonomy 5 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 saleor/gunicorn.py MASTER -HEAD is now at 71d55b6c7 Add support for taxonomy +HEAD is now at e1a5cd70e Add support for taxonomy NEXT Branch taxonomy set up to track remote branch taxonomy from origin. -HEAD is now at 71d55b6c7 Add support for taxonomy +HEAD is now at e1a5cd70e Add support for taxonomy On branch taxonomy Your branch and 'origin/taxonomy' have diverged, -and have 1 and 2 different commits each, respectively. +and have 5 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Changes not staged for commit: (use "git add ..." to update what will be committed) @@ -787,9 +788,9 @@ Untracked files: saleor/dashboard/locale/is/ no changes added to commit (use "git add" and/or "git commit -a") -[taxonomy 3da2f31fd] Add support for taxonomy +[taxonomy ea0e2ee4f] Add support for taxonomy 6 files changed, 9123 insertions(+), 4 deletions(-) create mode 100644 locale/is/LC_MESSAGES/django.po create mode 100644 locale/is/LC_MESSAGES/djangojs.po create mode 100644 saleor/dashboard/locale/is/LC_MESSAGES/django.po -Agent pid 3125 killed +Agent pid 3134 killed diff --git a/logs/branches.log b/logs/branches.log index 01b2c4e45..71d10a7de 100644 --- a/logs/branches.log +++ b/logs/branches.log @@ -17,37 +17,37 @@ tmpfs 370M 1.1M 369M 1% /run/docker.sock RAM -MemTotal: 3781808 kB -MemFree: 2291428 kB -MemAvailable: 3142984 kB -Buffers: 35332 kB -Cached: 960400 kB +MemTotal: 3781800 kB +MemFree: 2447748 kB +MemAvailable: 3154040 kB +Buffers: 117624 kB +Cached: 765176 kB SwapCached: 0 kB -Active: 825928 kB -Inactive: 444280 kB -Active(anon): 275424 kB -Inactive(anon): 192 kB -Active(file): 550504 kB -Inactive(file): 444088 kB +Active: 834520 kB +Inactive: 340896 kB +Active(anon): 293536 kB +Inactive(anon): 188 kB +Active(file): 540984 kB +Inactive(file): 340708 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 0 kB SwapFree: 0 kB -Dirty: 724 kB +Dirty: 600 kB Writeback: 0 kB -AnonPages: 274532 kB -Mapped: 204280 kB -Shmem: 1088 kB -Slab: 154044 kB -SReclaimable: 120208 kB -SUnreclaim: 33836 kB -KernelStack: 3200 kB -PageTables: 5872 kB +AnonPages: 292636 kB +Mapped: 238640 kB +Shmem: 1052 kB +Slab: 88140 kB +SReclaimable: 55696 kB +SUnreclaim: 32444 kB +KernelStack: 3264 kB +PageTables: 6392 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB -CommitLimit: 1890904 kB -Committed_AS: 1168688 kB +CommitLimit: 1890900 kB +Committed_AS: 1239952 kB VmallocTotal: 34359738367 kB VmallocUsed: 0 kB VmallocChunk: 0 kB @@ -62,140 +62,140 @@ HugePages_Free: 0 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB -DirectMap4k: 92148 kB -DirectMap2M: 2791424 kB -DirectMap1G: 1048576 kB +DirectMap4k: 100340 kB +DirectMap2M: 3831808 kB +DirectMap1G: 0 kB ASSETS /builder/home: total 60 -drwxr-xr-x 8 root root 4096 Jun 23 19:59 . -drwxr-xr-x 4 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 25 Jun 23 19:59 .bash_aliases --rw-r--r-- 1 root root 240 Jun 23 19:59 .bash_logout --rw-r--r-- 1 root root 3771 Jun 23 19:59 .bashrc -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .config -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .docker --rw-r--r-- 1 root root 58 Jun 23 19:59 .gitconfig -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .local -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .logs --rw-r--r-- 1 root root 906 Jun 23 19:59 .profile -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .ssh --rw-r--r-- 1 root root 175 Jun 23 19:59 .transifexrc -drwxr-xr-x 2 root root 4096 Jun 23 19:59 .tx --rw-r--r-- 1 root root 248 Jun 23 19:59 .wget-hsts +drwxr-xr-x 8 root root 4096 Jun 24 08:00 . +drwxr-xr-x 4 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 25 Jun 24 08:00 .bash_aliases +-rw-r--r-- 1 root root 240 Jun 24 08:00 .bash_logout +-rw-r--r-- 1 root root 3771 Jun 24 08:00 .bashrc +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .config +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .docker +-rw-r--r-- 1 root root 58 Jun 24 08:00 .gitconfig +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .local +drwxr-xr-x 2 root root 4096 Jun 24 08:00 .logs +-rw-r--r-- 1 root root 906 Jun 24 08:00 .profile +drwxr-xr-x 2 root root 4096 Jun 24 08:01 .ssh +-rw-r--r-- 1 root root 175 Jun 24 08:00 .transifexrc +drwxr-xr-x 2 root root 4096 Jun 24 08:00 .tx +-rw-r--r-- 1 root root 248 Jun 24 08:00 .wget-hsts /builder/home/.config: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 3 root root 4096 Jun 23 19:59 gcloud +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 3 root root 4096 Jun 24 08:01 gcloud /builder/home/.config/gcloud: total 20 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 245 Jun 23 19:59 .last_update_check.json --rw------- 1 root root 4 Jun 23 19:59 gce -drwxr-xr-x 3 root root 4096 Jun 23 19:59 logs +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 245 Jun 24 08:01 .last_update_check.json +-rw------- 1 root root 4 Jun 24 08:01 gce +drwxr-xr-x 3 root root 4096 Jun 24 08:01 logs /builder/home/.config/gcloud/logs: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 2 root root 4096 Jun 23 19:59 2019.06.23 +drwxr-xr-x 3 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +drwxr-xr-x 2 root root 4096 Jun 24 08:01 2019.06.24 -/builder/home/.config/gcloud/logs/2019.06.23: +/builder/home/.config/gcloud/logs/2019.06.24: total 16 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 796 Jun 23 19:59 19.59.50.855182.log --rw-r--r-- 1 root root 604 Jun 23 19:59 19.59.51.389907.log +drwxr-xr-x 2 root root 4096 Jun 24 08:01 . +drwxr-xr-x 3 root root 4096 Jun 24 08:01 .. +-rw-r--r-- 1 root root 796 Jun 24 08:01 08.01.01.840258.log +-rw-r--r-- 1 root root 604 Jun 24 08:01 08.01.02.700283.log /builder/home/.docker: total 32 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 3 root root 4096 Jun 23 19:59 branch --rw-r--r-- 1 root root 462 Jun 23 19:59 common.env --rw-r--r-- 1 root root 2688 Jun 23 19:59 config.json --rw-r--r-- 1 root root 530 Jun 23 19:59 cron.sh --rw-r--r-- 1 root root 558 Jun 23 19:59 init.sh --rw-r--r-- 1 root root 3173 Jun 23 19:59 update.sh +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 3 root root 4096 Jun 24 08:00 branch +-rw-r--r-- 1 root root 462 Jun 24 08:00 common.env +-rw-r--r-- 1 root root 2688 Jun 24 08:00 config.json +-rw-r--r-- 1 root root 530 Jun 24 08:00 cron.sh +-rw-r--r-- 1 root root 558 Jun 24 08:00 init.sh +-rw-r--r-- 1 root root 3173 Jun 24 08:00 update.sh /builder/home/.docker/branch: total 108 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 2242 Jun 23 19:59 Pipfile --rw-r--r-- 1 root root 83966 Jun 23 19:59 Pipfile.lock --rw-r--r-- 1 root root 2678 Jun 23 19:59 requirements.txt --rw-r--r-- 1 root root 1333 Jun 23 19:59 requirements_dev.txt -drwxr-xr-x 2 root root 4096 Jun 23 19:59 saleor +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 2242 Jun 24 08:00 Pipfile +-rw-r--r-- 1 root root 83966 Jun 24 08:00 Pipfile.lock +-rw-r--r-- 1 root root 2678 Jun 24 08:00 requirements.txt +-rw-r--r-- 1 root root 1333 Jun 24 08:00 requirements_dev.txt +drwxr-xr-x 2 root root 4096 Jun 24 08:00 saleor /builder/home/.docker/branch/saleor: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 278 Jun 23 19:59 gunicorn.py +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 278 Jun 24 08:00 gunicorn.py /builder/home/.local: total 12 -drwxr-xr-x 3 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. -drwxr-xr-x 2 root root 4096 Jun 23 19:59 gcloud +drwxr-xr-x 3 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +drwxr-xr-x 2 root root 4096 Jun 24 08:00 gcloud /builder/home/.local/gcloud: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 3 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 1245 Jun 23 19:59 cloud_env.bat +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 3 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 1245 Jun 24 08:00 cloud_env.bat /builder/home/.logs: total 232 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 23970 Jun 23 19:59 branches.log --rw-r--r-- 1 root root 202260 Jun 23 19:59 compose.log +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 23970 Jun 24 08:00 branches.log +-rw-r--r-- 1 root root 202260 Jun 24 08:00 compose.log /builder/home/.ssh: total 68 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw------- 1 root root 2314 Jun 23 19:59 Chetabahana-f92949fb068b.json --rw------- 1 root root 209 Jun 23 19:59 agent --rw------- 1 root root 2604 Jun 23 19:59 authorized_keys --rw------- 1 root root 51 Jun 23 19:59 config --rw------- 1 root root 296 Jun 23 19:59 expect_clone --rw------- 1 root root 201 Jun 23 19:59 expect_push --rw------- 1 root root 40 Jun 23 19:59 github_token --rw------- 1 root root 1675 Jun 23 19:59 google_compute_engine --rw------- 1 root root 1758 Jun 23 19:59 google_compute_engine.enc --rw------- 1 root root 399 Jun 23 19:59 google_compute_engine.pub --rw------- 1 root root 222 Jun 23 19:59 google_compute_known_hosts --rw------- 1 root root 3326 Jun 23 19:59 id_rsa --rw------- 1 root root 3409 Jun 23 19:59 id_rsa.enc --rw------- 1 root root 1326 Jun 23 19:59 known_hosts --rw------- 1 root root 282 Jun 23 19:59 push +drwxr-xr-x 2 root root 4096 Jun 24 08:01 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw------- 1 root root 2314 Jun 24 08:00 Chetabahana-f92949fb068b.json +-rw------- 1 root root 209 Jun 24 08:00 agent +-rw------- 1 root root 2604 Jun 24 08:00 authorized_keys +-rw------- 1 root root 51 Jun 24 08:00 config +-rw------- 1 root root 296 Jun 24 08:00 expect_clone +-rw------- 1 root root 201 Jun 24 08:00 expect_push +-rw------- 1 root root 40 Jun 24 08:00 github_token +-rw------- 1 root root 1675 Jun 24 08:01 google_compute_engine +-rw------- 1 root root 1758 Jun 24 08:00 google_compute_engine.enc +-rw------- 1 root root 399 Jun 24 08:00 google_compute_engine.pub +-rw------- 1 root root 222 Jun 24 08:00 google_compute_known_hosts +-rw------- 1 root root 3326 Jun 24 08:01 id_rsa +-rw------- 1 root root 3409 Jun 24 08:00 id_rsa.enc +-rw------- 1 root root 1326 Jun 24 08:00 known_hosts +-rw------- 1 root root 282 Jun 24 08:00 push /builder/home/.tx: total 12 -drwxr-xr-x 2 root root 4096 Jun 23 19:59 . -drwxr-xr-x 8 root root 4096 Jun 23 19:59 .. --rw-r--r-- 1 root root 41 Jun 23 19:59 config +drwxr-xr-x 2 root root 4096 Jun 24 08:00 . +drwxr-xr-x 8 root root 4096 Jun 24 08:00 .. +-rw-r--r-- 1 root root 41 Jun 24 08:00 config EXPECT -Get:1 http://security.debian.org/debian-security stretch/updates InRelease [94.3 kB] -Ign:2 http://deb.debian.org/debian stretch InRelease +Ign:1 http://deb.debian.org/debian stretch InRelease +Get:2 http://security.debian.org/debian-security stretch/updates InRelease [94.3 kB] Get:3 http://deb.debian.org/debian stretch-updates InRelease [91.0 kB] Get:4 http://deb.debian.org/debian stretch Release [118 kB] Get:5 http://deb.debian.org/debian stretch Release.gpg [2434 B] Get:6 http://security.debian.org/debian-security stretch/updates/main amd64 Packages [499 kB] Get:7 http://deb.debian.org/debian stretch-updates/main amd64 Packages [27.2 kB] Get:8 http://deb.debian.org/debian stretch/main amd64 Packages [7082 kB] -Fetched 7914 kB in 1s (4189 kB/s) +Fetched 7914 kB in 3s (2246 kB/s) Reading package lists... Reading package lists... Building dependency tree... @@ -209,7 +209,7 @@ Need to get 296 kB of archives. After this operation, 589 kB of additional disk space will be used. Get:1 http://deb.debian.org/debian stretch/main amd64 tcl-expect amd64 5.45-7+deb9u1 [131 kB] Get:2 http://deb.debian.org/debian stretch/main amd64 expect amd64 5.45-7+deb9u1 [165 kB] -Fetched 296 kB in 0s (4736 kB/s) +Fetched 296 kB in 0s (4646 kB/s) Selecting previously unselected package tcl-expect:amd64. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 30576 files and directories currently installed.) Preparing to unpack .../tcl-expect_5.45-7+deb9u1_amd64.deb ... @@ -226,15 +226,15 @@ PIPENV Collecting pipenv Downloading https://files.pythonhosted.org/packages/13/b4/3ffa55f77161cff9a5220f162670f7c5eb00df52e00939e203f601b0f579/pipenv-2018.11.26-py3-none-any.whl (5.2MB) -Requirement already satisfied: setuptools>=36.2.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (41.0.1) -Collecting virtualenv (from pipenv) - Downloading https://files.pythonhosted.org/packages/c4/9a/a3f62ac5122a65dec34ad4b5ed8d802633dae4bc06a0fc62e55fe3e96fe1/virtualenv-16.6.1-py2.py3-none-any.whl (2.0MB) Collecting certifi (from pipenv) Downloading https://files.pythonhosted.org/packages/69/1b/b853c7a9d4f6a6d00749e94eb6f3a041e342a885b87340b79c1ef73e3a78/certifi-2019.6.16-py2.py3-none-any.whl (157kB) Collecting virtualenv-clone>=0.2.5 (from pipenv) Downloading https://files.pythonhosted.org/packages/ba/f8/50c2b7dbc99e05fce5e5b9d9a31f37c988c99acd4e8dedd720b7b8d4011d/virtualenv_clone-0.5.3-py2.py3-none-any.whl Requirement already satisfied: pip>=9.0.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (19.1.1) -Installing collected packages: virtualenv, certifi, virtualenv-clone, pipenv +Collecting virtualenv (from pipenv) + Downloading https://files.pythonhosted.org/packages/c4/9a/a3f62ac5122a65dec34ad4b5ed8d802633dae4bc06a0fc62e55fe3e96fe1/virtualenv-16.6.1-py2.py3-none-any.whl (2.0MB) +Requirement already satisfied: setuptools>=36.2.1 in /usr/local/lib/python3.7/site-packages (from pipenv) (41.0.1) +Installing collected packages: certifi, virtualenv-clone, virtualenv, pipenv Successfully installed certifi-2019.6.16 pipenv-2018.11.26 virtualenv-16.6.1 virtualenv-clone-0.5.3 PACKAGES @@ -607,7 +607,7 @@ google-measurement-protocol==1.0.0 - idna [required: >=2.5,<2.9, installed: 2.8] - urllib3 [required: >=1.21.1,<1.26,!=1.25.1,!=1.25.0, installed: 1.25.3] - typing [required: >=3.6.0, installed: 3.7.4] -graphene-django-optimizer==0.4.1 +graphene-django-optimizer==0.4.2 gunicorn==19.9.0 Markdown==3.1.1 - setuptools [required: >=36, installed: 41.0.1] @@ -718,7 +718,7 @@ All good! AGENT -Agent pid 3125 +Agent pid 3134 spawn ssh-add /builder/home/.ssh/id_rsa Enter passphrase for /builder/home/.ssh/id_rsa: Identity added: /builder/home/.ssh/id_rsa (/builder/home/.ssh/id_rsa)4096 SHA256:xefGz0xMkK/wmtCvyIVLdqNtJOGXVGRHUVp4BtSxBf8 /builder/home/.ssh/id_rsa (RSA) @@ -727,20 +727,21 @@ UPSTREAM Your branch is up-to-date with 'origin/master'. Current branch master is up to date. -HEAD is now at 812f815c4 Merge pull request #4319 from NyanKiyoshi/fix/events/add-note-anonymous +HEAD is now at f7897c7a9 Merge pull request #4336 from korycins/fix_populatedb_gift_card_duplication_error REMOTE Branch Chetabahana set up to track remote branch Chetabahana from origin. -HEAD is now at 812f815c4 Merge pull request #4319 from NyanKiyoshi/fix/events/add-note-anonymous +HEAD is now at f7897c7a9 Merge pull request #4336 from korycins/fix_populatedb_gift_card_duplication_error '/workspace/home/chetabahana/.docker/branch/Pipfile' -> '/builder/home/Tutorial-Buka-Toko/Pipfile' '/workspace/home/chetabahana/.docker/branch/Pipfile.lock' -> '/builder/home/Tutorial-Buka-Toko/Pipfile.lock' '/workspace/home/chetabahana/.docker/branch/requirements.txt' -> '/builder/home/Tutorial-Buka-Toko/requirements.txt' '/workspace/home/chetabahana/.docker/branch/requirements_dev.txt' -> '/builder/home/Tutorial-Buka-Toko/requirements_dev.txt' '/workspace/home/chetabahana/.docker/branch/saleor/gunicorn.py' -> '/builder/home/Tutorial-Buka-Toko/saleor/gunicorn.py' On branch Chetabahana -Your branch is behind 'origin/Chetabahana' by 1 commit, and can be fast-forwarded. - (use "git pull" to update your local branch) +Your branch and 'origin/Chetabahana' have diverged, +and have 4 and 1 different commits each, respectively. + (use "git pull" to merge the remote branch into yours) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) @@ -756,21 +757,21 @@ Untracked files: saleor/gunicorn.py no changes added to commit (use "git add" and/or "git commit -a") -[Chetabahana 71d55b6c7] Add support for taxonomy +[Chetabahana e1a5cd70e] Add support for taxonomy 5 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 saleor/gunicorn.py MASTER -HEAD is now at 71d55b6c7 Add support for taxonomy +HEAD is now at e1a5cd70e Add support for taxonomy NEXT Branch taxonomy set up to track remote branch taxonomy from origin. -HEAD is now at 71d55b6c7 Add support for taxonomy +HEAD is now at e1a5cd70e Add support for taxonomy On branch taxonomy Your branch and 'origin/taxonomy' have diverged, -and have 1 and 2 different commits each, respectively. +and have 5 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) Changes not staged for commit: (use "git add ..." to update what will be committed) @@ -787,9 +788,9 @@ Untracked files: saleor/dashboard/locale/is/ no changes added to commit (use "git add" and/or "git commit -a") -[taxonomy 3da2f31fd] Add support for taxonomy +[taxonomy ea0e2ee4f] Add support for taxonomy 6 files changed, 9123 insertions(+), 4 deletions(-) create mode 100644 locale/is/LC_MESSAGES/django.po create mode 100644 locale/is/LC_MESSAGES/djangojs.po create mode 100644 saleor/dashboard/locale/is/LC_MESSAGES/django.po -Agent pid 3125 killed +Agent pid 3134 killed