From fde3881741b518d7feaf0224c72bf90a78d056c5 Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Fri, 4 Oct 2019 12:49:42 +0300 Subject: [PATCH 01/10] Add uploading to test.pypi --- .travis.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e7ad171..6d6fa859 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,8 @@ cache: pip jobs: include: - - stage: Upload a new version of python package to PYPI + - &deploy_job + stage: Upload a new version of python package to PYPI name: Publishing current Git tagged version of dist to PyPI if: repo == "aio-libs/create-aio-app" AND tag IS present install: [] @@ -38,7 +39,7 @@ jobs: - python -m pep517.build --source --binary --out-dir dist . - echo > setup.py - deploy: + deploy: &deploy_step provider: pypi user: aio-libs-bot skip-cleanup: true @@ -48,3 +49,18 @@ jobs: ktCdEw9PQO9orA7BmhCn71yOIPK3seomRkJi8+ea54lQsT8cCe+sKZgaXRTBwkcKnKqz11gQl7P11qPNLIWr4cNeVrF6RsDix5YFDxpfqy+x6IPNvpArhkB8/2u2SpFbjzTOh0jT2d4ucSUDV+axjSRPymHK+8lYEMKXucNrzsao8qrExpCMkVJA5rNKeLC537ZN53tVbhwYNih+LsGPXGTvoQoMSQPRk83NfselIper1bPwioUYzIaJCygrOKQKqs/nKOlygMFmPyg4uFoDBh3idG66r8Q9Zmt7DrCAaCxJyGFmjNYHkMzLLh8kl2VuXk+lREbmPDIfNEGzoAM4mX6Jd+LGNvbOOqntRYpW+K4A01qe+YnI142uA7tfxWl1qOqknb0bT6EXKq3iCB4ZXxLdukCcaBAUJP0ctj5wyVpcJ7TAst4SDKLYuZ06I+kx2n51HO5DsfuUQBvkKuMzAHXv0jxXcv8ez2ZS5kBpgQuemNm1NOsrWhtyWzvhlcD2+VMNaYNII63GvAUiwgO8QCf/JNaW12Fdp/nceVUhJWlsmfvQQ1erKqugtecrowh9XWTO5kx7CMrpZJCDdWXMoUMC7aRmJuYaSiz1xCHa44v6xFlMv7bv2UzelRbnpgolCCTzCGXnC6ozct58b/dtGiHKbPJ+cJSOjH513kxRSaM= on: all_branches: true + - <<: *deploy_job + name: >- + Publishing current (unstable) Git revision of dist to Test PyPI + on every commit + if: >- # Always run, except if PR or cron + repo == "aio-libs/create-aio-app" AND + branch == "master" AND + type == "push" + deploy: + <<: *deploy_step + server: https://test.pypi.org/legacy/ + user: + password: + secure: >- + From 4cee2b9399e43bde3b6c8fb5c00f1819e5bba3be Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Fri, 4 Oct 2019 13:01:39 +0300 Subject: [PATCH 02/10] Platforms key in setup.cfg is not used --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 293b655e..8a5a3a3f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,8 +4,6 @@ version = attr: create_aio_app.utils.versiontools.get_self_version description = The tool that helps quickly create a basis for aiohttp application long_description = file: README.md long_description_content_type = text/markdown -platforms = - POSIX author = Mykhailo Havelia author_email = misha.gavela@gmail.com license = MIT From 91b12a98ec0eaa8c5b3e656b31193cee173d2b50 Mon Sep 17 00:00:00 2001 From: Max Tyulin Date: Thu, 10 Oct 2019 16:20:10 +0300 Subject: [PATCH 03/10] Add PYPI_UPLOAD env to deploy job --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d6fa859..05185b58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ jobs: - &deploy_job stage: Upload a new version of python package to PYPI name: Publishing current Git tagged version of dist to PyPI + env: PYPI_UPLOAD=true if: repo == "aio-libs/create-aio-app" AND tag IS present install: [] script: skip From 787099697cde2d24b423b911df4c917a446f8c0e Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Fri, 25 Oct 2019 16:57:36 +0300 Subject: [PATCH 04/10] PYPI_UPLOAD environment only for upload to test pypi --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05185b58..2d1c1754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ jobs: - &deploy_job stage: Upload a new version of python package to PYPI name: Publishing current Git tagged version of dist to PyPI - env: PYPI_UPLOAD=true if: repo == "aio-libs/create-aio-app" AND tag IS present install: [] script: skip @@ -54,6 +53,7 @@ jobs: name: >- Publishing current (unstable) Git revision of dist to Test PyPI on every commit + env: PYPI_UPLOAD=true if: >- # Always run, except if PR or cron repo == "aio-libs/create-aio-app" AND branch == "master" AND From d903c47be87a187aaa304bfb073dc33120927cc2 Mon Sep 17 00:00:00 2001 From: Max Tyulin Date: Fri, 25 Oct 2019 20:03:41 +0300 Subject: [PATCH 05/10] Set user for test pypi Co-Authored-By: Sviatoslav Sydorenko --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d1c1754..5e3566b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ jobs: deploy: <<: *deploy_step server: https://test.pypi.org/legacy/ - user: + user: __token__ password: secure: >- From 345580e9f25e041b20f962b9172f97539b42b48c Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Fri, 25 Oct 2019 21:07:36 +0300 Subject: [PATCH 06/10] Mapping for environment variables --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d1c1754..331a7c07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,8 @@ jobs: name: >- Publishing current (unstable) Git revision of dist to Test PyPI on every commit - env: PYPI_UPLOAD=true + env: + PYPI_UPLOAD: true if: >- # Always run, except if PR or cron repo == "aio-libs/create-aio-app" AND branch == "master" AND From d745fc67e0f0800c3950ae883f6ab9a6da67bc09 Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Fri, 25 Oct 2019 22:45:30 +0300 Subject: [PATCH 07/10] Restore platforms in setup.cfg --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index 8a5a3a3f..056d3ca3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,6 +4,8 @@ version = attr: create_aio_app.utils.versiontools.get_self_version description = The tool that helps quickly create a basis for aiohttp application long_description = file: README.md long_description_content_type = text/markdown +platforms = + POSIX author = Mykhailo Havelia author_email = misha.gavela@gmail.com license = MIT From c569d3a92817f7a054017ca34f2b2e9c4b70a5cb Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Sat, 26 Oct 2019 23:10:10 +0300 Subject: [PATCH 08/10] Restore space --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 056d3ca3..293b655e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ version = attr: create_aio_app.utils.versiontools.get_self_version description = The tool that helps quickly create a basis for aiohttp application long_description = file: README.md long_description_content_type = text/markdown -platforms = +platforms = POSIX author = Mykhailo Havelia author_email = misha.gavela@gmail.com From 00597a6c0ec38fed7b11741ee4e0dd67331aeea1 Mon Sep 17 00:00:00 2001 From: Max Tyulin Date: Sat, 26 Oct 2019 23:39:23 +0300 Subject: [PATCH 09/10] Set password for test pypi Co-Authored-By: Sviatoslav Sydorenko --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 68ea6afc..d2625136 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,4 +65,4 @@ jobs: user: __token__ password: secure: >- - + rfpMPtYl0ipSV2ckqiiLPwfx28esAf4zybAGk2imd5zRVI2TudaHPna0mcLQCJ0Rn5rdl3eBdRfTFoFl+V60+5d98SpwE8PCxlY5hAwXd/CirmpjjKj3N8pvIUrs1KHll0gxaMCXEPmEatiWlkF8av4ZUX/ycytQZE3men+Nw4wVMbruKcMoRkTMm1AJ3u1g0lOd4Dr8Gv2mc4vlKvk6a4v8abKsi8mfHOxUDoq5dQdIl+Ghht/eCSb3lGop5o8D1E+7jZv4wj5k2JVpU0ulb7sOKMdzKls0XKINekOroIg3sgIpdzuEyKfW64tIv8PZGYaZrQgb4jIKmwtklbfC6fCY/LkchsdskPO/1QsuLiOIp+JsmAuDfZNZvZu8xSIvmMhmkHPY9ioxZydHWtwvcrfoAXHvCX90v7xlzqqSruAbYfyoZpsDKnJ+FcRVr6x1h+BQHT0kg9k39bGWOyzdJhDt4WaifiM81G5t7zeQTVKiTGWaNRuaE0xFe1kyY4vMYj63snQuAuw8i2zbJ4AubQSHyf4X+9Emgna+/wnNIbVZAaXsf8PJyXP+9JOusGvIg0I3q/cW0v21eXUj4+AIDTXOhdovndurbkHw5otDpRfD4vt0Hdh+YaYmOiOEOh4yBFlnMuQlV5QJwwb50QJDgipExrkYHq7cfNifoPLHWhw= From e9354b1c229b51888f7ef712c2b7b11607749969 Mon Sep 17 00:00:00 2001 From: MaxTyulin Date: Sat, 26 Oct 2019 23:41:41 +0300 Subject: [PATCH 10/10] Update description for deploy job in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2625136..d2a33022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ jobs: - <<: *deploy_job name: >- Publishing current (unstable) Git revision of dist to Test PyPI - on every commit + on every push to master env: PYPI_UPLOAD: true if: >- # Always run, except if PR or cron