From eba52255e6849797bef79b1ddfad806964aaa7d1 Mon Sep 17 00:00:00 2001 From: Enrico Date: Fri, 3 Dec 2021 16:25:31 +1100 Subject: [PATCH] Migrate to pipenv and Github actions --- .coverage | Bin 0 -> 53248 bytes .coveragerc | 2 + .github/workflows/test.yml | 58 ++++++++++ .travis.yml | 24 ---- Makefile | 2 +- Pipfile | 21 ++++ Pipfile.lock | 218 +++++++++++++++++++++++++++++++++++++ dev_requirements.txt | 7 -- 8 files changed, 300 insertions(+), 32 deletions(-) create mode 100644 .coverage create mode 100644 .coveragerc create mode 100644 .github/workflows/test.yml delete mode 100644 .travis.yml create mode 100644 Pipfile create mode 100644 Pipfile.lock delete mode 100644 dev_requirements.txt diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000000000000000000000000000000000..000dd32ba53e12218e1220dc02562d979a9bd36b GIT binary patch literal 53248 zcmeI4Ux*|}9ml(;W~Qfi{?uO1WxQKATT#Q@UUv51B{6p*y6O>v!I0z#7Y^;~nW^3F zbEbQ)yXSV7c*rKgiFpwOAAImF1oh3l<+!M*5MLBRa)Cg|OF$uLR3hI^kFBIV$JhAb|{W%lbWt;UlKyov?6`V^hpnc zBH8qWLVX}UE?U$U9zR>=PiUq5k2LGGan5X01`ZGa0T2KI z5QqruJX$iUhYsmaUkvR=TZX>flz#kO{>oz~S5KW3r&hoG@JSJ;i6aw&j(T0J3g6ol zUFnN8r!9r!ww$INI_|m%H)JZ^3uH^Jc$7wKo)TP$^i|AqTBH@qbtxgmpjVehuE>5-jVVcc5Z>nw(zXghAyOgC^s$8&|; zlFeQyTl+R}UO`I_f;ZS2D(kFj(AiisscV2vUwI$RL_ASmBja2z#oAX?Rg-dLv)k)5 z2>H2Qr>i=LG~$XwZ=B{h-Ox)K`;q%*pT6w3cc?p4Kb{a+zQUO>4%qP_d+i^x2W^2W%??8_dvm@&d%zW&PR@-@K_Be z40a>tkkjlYk8vH9Ki+TDC>eGVHHzA8;jKkOMrn( zri>*UM5FCBhJ7vam_X71p}8OxTkE+^HB2b|TziWpZVz2Eg znGCPx^3~5zjWb-CU@fcf{4lf@c%_d#j@oC7? z92~CzLJ78P61E#&FO2+Goks4d)}Fq-aRL4Fls!q!MdCEPsiNRSdLn8YcAzGope7og z*Os;$F9{_0P(W2VfrzT!yBK}3Uq-O4%2>Zpi%dz^6g9h_qOq0^D~fbFw%baUDYg2> zrP7qI#-yqzo;yfU)MzXQG%`oZObbnN)kKw+ztANVs??6%ibuKXi-8h1H{_n;;zj7I zb|^!qBZU%)jEVed(+)(_my}6M=v<9mtM^qWS1@VMAHz6PTUewAE!2}t-R;`EsD&~JRamcYI^jk=eYl|ZjR|T| zmcOF$SNMDU&-|^M-au3U0w4eaAOHd&00JNY0w4eaAOHd&a03XG*o>ZDK*$!@l&-EH zup*n*lZyqJBAYSOD+TKQzghXd#$V;X;NRw7=bx#(SNUz_r<8;P1V8`;KmY_l00ck) z1V8`;KmY`80)ZKmX{)Vsw!7|G;Re0L!}Av{%W<91vgj`Mp#sy6k7U#PA=W5s!C+c* zBrBAiZd?6Nzr7wTCdFCmgyidarcqW9c75-hY=(;}PEz!p)@=3swiS{*iO=Pj_T(7x zb?MRzL+Cv&Bu}FAS*BTIM4SG0H}t4MK}hfNQ8(uAWlZzNNZUa`FBaO*9Fbw#gL}0G zP#x8ocIH|<24vO!f3xzeR(ZDaGyYoTcl-r@kw3yeTlwcr=wcKJ0w4eaAOHd&00JNY z0w4eaAOHfIb|+iaM|Q0P8&&f#J3gA7?EedktT~!>t^L2Tz-)c*4qBz`x8cqoWlxS1 zAKCxs>dYD^x_AGdy^ne0q{r|7*G)&v+mCQw%Q|8@R>Mt?X!00ck)1V8`;KmY_l00ck)1V8`;ZbJf$ zmCfk?|M~Yc{%`(w{wMw>|24e_;5q(dO2PpGAOHd&00JNY0w4eaAOHd&00JOzg9%LD zk=4ylo7%4q%+B8Vhxf1kC1W0-lus01KHa>lI7!h@8mH?&|IguUnbXOq@(;ZG?q4sz z^-FfRLZ|oV{`JAu)u%3Be(9afi?45f_~HM)aOJ5@qfn;2JF;6Z8ikUIu?OD&TfRuK zN+y$=$eI*R@ZV@AzoPLgbOqoa{2l%_T?4qv|Hxmy!3{)lAOHd&00JNY0w4eaAOHd& z00JNY0@p_%M_YJZJ;9&T^R%m{9exxP4n%=583lPB1-VKTWXn;&N>Pw0s{8-ih# zEf4?!5C8!X009sH0T2KI5C8!X0D)VBfVz5s{r|1eSFjQUKmY_l00ck)1V8`;KmY_l m00gd=0Pg=^FFELe00@8p2!H?xfB*=900@8p2!Oz?L*W0_tCH*h literal 0 HcmV?d00001 diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..4edd7b1 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,2 @@ +[run] +relative_files = True diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..8b58494 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,58 @@ +name: Run tests + +on: + push: + branches: + - "master" + pull_request: + branches: + - "master" + +jobs: + test: + runs-on: ubuntu-latest + + strategy: + matrix: + python-version: ["3.9"] + django-version: ["3.2"] + + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + - name: Set Up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: Display Python version + run: python -c "import sys; print(sys.version)" + + - name: Install dependecies + uses: VaultVulp/action-pipenv@v2.0.1 + with: + command: install --dev + + - name: Install Django + run: pip install -q Django~=${{ matrix.django-version }} + + - name: Test + uses: VaultVulp/action-pipenv@v2.0.1 + with: + command: run coverage-test + + - name: Coveralls + uses: AndreMiras/coveralls-python-action@develop + with: + parallel: true + flag-name: Unit Test + + coveralls_finish: + needs: test + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: AndreMiras/coveralls-python-action@develop + with: + parallel-finished: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d593c0a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: python - -python: - - 2.7 - - 3.5.2 - -env: - - DJANGO_VERSION=1.8 - - DJANGO_VERSION=1.9 - - DJANGO_VERSION=2.0 - -matrix: - exclude: - - python: 2.7 - env: DJANGO_VERSION=2.0 - -install: - - pip install -q Django==$DJANGO_VERSION - - "make install" - -script: coverage run --source=django_thumbor manage.py test - -after_success: - coveralls diff --git a/Makefile b/Makefile index 6c8c55b..60d21de 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ test: clean @./manage.py test install: - @pip install -r dev_requirements.txt + @pipenv install --dev patch: @$(eval BUMP := 'patch') diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..41504cf --- /dev/null +++ b/Pipfile @@ -0,0 +1,21 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] + +[dev-packages] +django-thumbor = {editable = true, path = "."} +bumpversion = "*" +coverage = "*" +coveralls = "*" +django-nose = "*" +mock = "*" + +[requires] +python_version = "3.9" + +[scripts] +test = "make test" +coverage-test = "./manage.py test --with-coverage" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..56df3a1 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,218 @@ +{ + "_meta": { + "hash": { + "sha256": "cb406ca52bc9da945f831c16787cb70a034cdcfee2cf58cc5a91afe3ddcd987b" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.9" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": {}, + "develop": { + "asgiref": { + "hashes": [ + "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9", + "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214" + ], + "markers": "python_version >= '3.6'", + "version": "==3.4.1" + }, + "bump2version": { + "hashes": [ + "sha256:37f927ea17cde7ae2d7baf832f8e80ce3777624554a653006c9144f8017fe410", + "sha256:762cb2bfad61f4ec8e2bdf452c7c267416f8c70dd9ecb1653fd0bbb01fa936e6" + ], + "markers": "python_version >= '3.5'", + "version": "==1.0.1" + }, + "bumpversion": { + "hashes": [ + "sha256:4ba55e4080d373f80177b4dabef146c07ce73c7d1377aabf9d3c3ae1f94584a6", + "sha256:4eb3267a38194d09f048a2179980bb4803701969bff2c85fa8f6d1ce050be15e" + ], + "index": "pypi", + "version": "==0.6.0" + }, + "certifi": { + "hashes": [ + "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872", + "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569" + ], + "version": "==2021.10.8" + }, + "charset-normalizer": { + "hashes": [ + "sha256:735e240d9a8506778cd7a453d97e817e536bb1fc29f4f6961ce297b9c7a917b0", + "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405" + ], + "markers": "python_version >= '3'", + "version": "==2.0.8" + }, + "coverage": { + "hashes": [ + "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0", + "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd", + "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884", + "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48", + "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76", + "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0", + "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64", + "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685", + "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47", + "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d", + "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840", + "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f", + "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971", + "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c", + "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a", + "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de", + "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17", + "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4", + "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521", + "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57", + "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b", + "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282", + "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644", + "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475", + "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d", + "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da", + "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953", + "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2", + "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e", + "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c", + "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc", + "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64", + "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74", + "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617", + "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3", + "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d", + "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa", + "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739", + "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8", + "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8", + "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781", + "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58", + "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9", + "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c", + "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd", + "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e", + "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49" + ], + "index": "pypi", + "version": "==6.2" + }, + "coveralls": { + "hashes": [ + "sha256:b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea", + "sha256:f42015f31d386b351d4226389b387ae173207058832fbf5c8ec4b40e27b16026" + ], + "index": "pypi", + "version": "==3.3.1" + }, + "django": { + "hashes": [ + "sha256:51284300f1522ffcdb07ccbdf676a307c6678659e1284f0618e5a774127a6a08", + "sha256:e22c9266da3eec7827737cde57694d7db801fedac938d252bf27377cec06ed1b" + ], + "markers": "python_version >= '3.6'", + "version": "==3.2.9" + }, + "django-nose": { + "hashes": [ + "sha256:304adc447ee35b889b733d7106004f98aa401d8387ddcada5d4f2239d86790a9", + "sha256:a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7" + ], + "index": "pypi", + "version": "==1.4.7" + }, + "django-thumbor": { + "editable": true, + "path": "." + }, + "docopt": { + "hashes": [ + "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" + ], + "version": "==0.6.2" + }, + "idna": { + "hashes": [ + "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", + "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" + ], + "markers": "python_version >= '3'", + "version": "==3.3" + }, + "libthumbor": { + "hashes": [ + "sha256:3c4e1a59c019d22f868d225315c06f97fad30fb5e78112d6a230b978e7d24e38", + "sha256:ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0" + ], + "markers": "python_version >= '3.6' and python_version < '4.0'", + "version": "==2.0.1" + }, + "mock": { + "hashes": [ + "sha256:122fcb64ee37cfad5b3f48d7a7d51875d7031aaf3d8be7c42e2bee25044eee62", + "sha256:7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc" + ], + "index": "pypi", + "version": "==4.0.3" + }, + "nose": { + "hashes": [ + "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", + "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", + "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" + ], + "version": "==1.3.7" + }, + "pytz": { + "hashes": [ + "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c", + "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326" + ], + "version": "==2021.3" + }, + "requests": { + "hashes": [ + "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24", + "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==2.26.0" + }, + "six": { + "hashes": [ + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.16.0" + }, + "sqlparse": { + "hashes": [ + "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", + "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d" + ], + "markers": "python_version >= '3.5'", + "version": "==0.4.2" + }, + "urllib3": { + "hashes": [ + "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece", + "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "version": "==1.26.7" + } + } +} diff --git a/dev_requirements.txt b/dev_requirements.txt deleted file mode 100644 index 5f09c1c..0000000 --- a/dev_requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ --e . - -bumpversion -coverage -coveralls -django-nose -mock