diff --git a/.env b/.env new file mode 100644 index 00000000..02891bd7 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +PIP_FIND_LINKS="https://download.pytorch.org/whl/torch_stable.html" diff --git a/.gitignore b/.gitignore index f77cb52b..131b196a 100644 --- a/.gitignore +++ b/.gitignore @@ -105,7 +105,6 @@ celerybeat.pid *.sage.py # Environments -.env .venv env/ venv/ diff --git a/Pipfile b/Pipfile index 2ea8392c..28ffa466 100644 --- a/Pipfile +++ b/Pipfile @@ -5,6 +5,8 @@ name = "pypi" [packages] clip = {git = "https://github.com/openai/CLIP.git"} +torch = "==1.9.0+cpu" +torchvision = "==0.10.0+cpu" [dev-packages] pycodestyle = "~=2.7" diff --git a/Pipfile.lock b/Pipfile.lock index 83192a87..39433918 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3c74f707dabe9d47a745e30be9ed92d54b9bc912e3014c907817ba70b9558968" + "sha256": "b9ba57c96354eabc4a9270d549c8aca58c576388f736a63326284ec616499d43" }, "pipfile-spec": 6, "requires": { @@ -108,104 +108,77 @@ }, "regex": { "hashes": [ - "sha256:0eb2c6e0fcec5e0f1d3bcc1133556563222a2ffd2211945d7b1480c1b1a42a6f", - "sha256:15dddb19823f5147e7517bb12635b3c82e6f2a3a6b696cc3e321522e8b9308ad", - "sha256:173bc44ff95bc1e96398c38f3629d86fa72e539c79900283afa895694229fe6a", - "sha256:1c78780bf46d620ff4fff40728f98b8afd8b8e35c3efd638c7df67be2d5cddbf", - "sha256:2366fe0479ca0e9afa534174faa2beae87847d208d457d200183f28c74eaea59", - "sha256:2bceeb491b38225b1fee4517107b8491ba54fba77cf22a12e996d96a3c55613d", - "sha256:2ddeabc7652024803666ea09f32dd1ed40a0579b6fbb2a213eba590683025895", - "sha256:2fe5e71e11a54e3355fa272137d521a40aace5d937d08b494bed4529964c19c4", - "sha256:319eb2a8d0888fa6f1d9177705f341bc9455a2c8aca130016e52c7fe8d6c37a3", - "sha256:3f5716923d3d0bfb27048242a6e0f14eecdb2e2a7fac47eda1d055288595f222", - "sha256:422dec1e7cbb2efbbe50e3f1de36b82906def93ed48da12d1714cabcd993d7f0", - "sha256:4c9c3155fe74269f61e27617529b7f09552fbb12e44b1189cebbdb24294e6e1c", - "sha256:4f64fc59fd5b10557f6cd0937e1597af022ad9b27d454e182485f1db3008f417", - "sha256:564a4c8a29435d1f2256ba247a0315325ea63335508ad8ed938a4f14c4116a5d", - "sha256:59506c6e8bd9306cd8a41511e32d16d5d1194110b8cfe5a11d102d8b63cf945d", - "sha256:598c0a79b4b851b922f504f9f39a863d83ebdfff787261a5ed061c21e67dd761", - "sha256:59c00bb8dd8775473cbfb967925ad2c3ecc8886b3b2d0c90a8e2707e06c743f0", - "sha256:6110bab7eab6566492618540c70edd4d2a18f40ca1d51d704f1d81c52d245026", - "sha256:6afe6a627888c9a6cfbb603d1d017ce204cebd589d66e0703309b8048c3b0854", - "sha256:791aa1b300e5b6e5d597c37c346fb4d66422178566bbb426dd87eaae475053fb", - "sha256:8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d", - "sha256:875c355360d0f8d3d827e462b29ea7682bf52327d500a4f837e934e9e4656068", - "sha256:89e5528803566af4df368df2d6f503c84fbfb8249e6631c7b025fe23e6bd0cde", - "sha256:99d8ab206a5270c1002bfcf25c51bf329ca951e5a169f3b43214fdda1f0b5f0d", - "sha256:9a854b916806c7e3b40e6616ac9e85d3cdb7649d9e6590653deb5b341a736cec", - "sha256:b85ac458354165405c8a84725de7bbd07b00d9f72c31a60ffbf96bb38d3e25fa", - "sha256:bc84fb254a875a9f66616ed4538542fb7965db6356f3df571d783f7c8d256edd", - "sha256:c92831dac113a6e0ab28bc98f33781383fe294df1a2c3dfd1e850114da35fd5b", - "sha256:cbe23b323988a04c3e5b0c387fe3f8f363bf06c0680daf775875d979e376bd26", - "sha256:ccb3d2190476d00414aab36cca453e4596e8f70a206e2aa8db3d495a109153d2", - "sha256:d8bbce0c96462dbceaa7ac4a7dfbbee92745b801b24bce10a98d2f2b1ea9432f", - "sha256:db2b7df831c3187a37f3bb80ec095f249fa276dbe09abd3d35297fc250385694", - "sha256:e586f448df2bbc37dfadccdb7ccd125c62b4348cb90c10840d695592aa1b29e0", - "sha256:e5983c19d0beb6af88cb4d47afb92d96751fb3fa1784d8785b1cdf14c6519407", - "sha256:e6a1e5ca97d411a461041d057348e578dc344ecd2add3555aedba3b408c9f874", - "sha256:eaf58b9e30e0e546cdc3ac06cf9165a1ca5b3de8221e9df679416ca667972035", - "sha256:ed693137a9187052fc46eedfafdcb74e09917166362af4cc4fddc3b31560e93d", - "sha256:edd1a68f79b89b0c57339bce297ad5d5ffcc6ae7e1afdb10f1947706ed066c9c", - "sha256:f080248b3e029d052bf74a897b9d74cfb7643537fbde97fe8225a6467fb559b5", - "sha256:f9392a4555f3e4cb45310a65b403d86b589adc773898c25a39184b1ba4db8985", - "sha256:f98dc35ab9a749276f1a4a38ab3e0e2ba1662ce710f6530f5b0a6656f1c32b58" + "sha256:026beb631097a4a3def7299aa5825e05e057de3c6d72b139c37813bfa351274b", + "sha256:14caacd1853e40103f59571f169704367e79fb78fac3d6d09ac84d9197cadd16", + "sha256:16d9eaa8c7e91537516c20da37db975f09ac2e7772a0694b245076c6d68f85da", + "sha256:18fdc51458abc0a974822333bd3a932d4e06ba2a3243e9a1da305668bd62ec6d", + "sha256:28e8af338240b6f39713a34e337c3813047896ace09d51593d6907c66c0708ba", + "sha256:3835de96524a7b6869a6c710b26c90e94558c31006e96ca3cf6af6751b27dca1", + "sha256:3905c86cc4ab6d71635d6419a6f8d972cab7c634539bba6053c47354fd04452c", + "sha256:3c09d88a07483231119f5017904db8f60ad67906efac3f1baa31b9b7f7cca281", + "sha256:4551728b767f35f86b8e5ec19a363df87450c7376d7419c3cac5b9ceb4bce576", + "sha256:459bbe342c5b2dec5c5223e7c363f291558bc27982ef39ffd6569e8c082bdc83", + "sha256:4f421e3cdd3a273bace013751c345f4ebeef08f05e8c10757533ada360b51a39", + "sha256:577737ec3d4c195c4aef01b757905779a9e9aee608fa1cf0aec16b5576c893d3", + "sha256:57fece29f7cc55d882fe282d9de52f2f522bb85290555b49394102f3621751ee", + "sha256:7976d410e42be9ae7458c1816a416218364e06e162b82e42f7060737e711d9ce", + "sha256:85f568892422a0e96235eb8ea6c5a41c8ccbf55576a2260c0160800dbd7c4f20", + "sha256:8764a78c5464ac6bde91a8c87dd718c27c1cabb7ed2b4beaf36d3e8e390567f9", + "sha256:8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a", + "sha256:8fe58d9f6e3d1abf690174fd75800fda9bdc23d2a287e77758dc0e8567e38ce6", + "sha256:937b20955806381e08e54bd9d71f83276d1f883264808521b70b33d98e4dec5d", + "sha256:9569da9e78f0947b249370cb8fadf1015a193c359e7e442ac9ecc585d937f08d", + "sha256:a3b73390511edd2db2d34ff09aa0b2c08be974c71b4c0505b4a048d5dc128c2b", + "sha256:a4eddbe2a715b2dd3849afbdeacf1cc283160b24e09baf64fa5675f51940419d", + "sha256:a5c6dbe09aff091adfa8c7cfc1a0e83fdb8021ddb2c183512775a14f1435fe16", + "sha256:b63e3571b24a7959017573b6455e05b675050bbbea69408f35f3cb984ec54363", + "sha256:bb350eb1060591d8e89d6bac4713d41006cd4d479f5e11db334a48ff8999512f", + "sha256:bf6d987edd4a44dd2fa2723fca2790f9442ae4de2c8438e53fcb1befdf5d823a", + "sha256:bfa6a679410b394600eafd16336b2ce8de43e9b13f7fb9247d84ef5ad2b45e91", + "sha256:c856ec9b42e5af4fe2d8e75970fcc3a2c15925cbcc6e7a9bcb44583b10b95e80", + "sha256:cea56288eeda8b7511d507bbe7790d89ae7049daa5f51ae31a35ae3c05408531", + "sha256:ea212df6e5d3f60341aef46401d32fcfded85593af1d82b8b4a7a68cd67fdd6b", + "sha256:f35567470ee6dbfb946f069ed5f5615b40edcbb5f1e6e1d3d2b114468d505fc6", + "sha256:fbc20975eee093efa2071de80df7f972b7b35e560b213aafabcec7c0bd00bd8c", + "sha256:ff4a8ad9638b7ca52313d8732f37ecd5fd3c8e3aff10a8ccb93176fd5b3812f6" ], - "version": "==2021.7.6" + "version": "==2021.8.3" }, "torch": { "hashes": [ - "sha256:0164673908e6b291ace592d382eba3e258b3bad009b8078cad8f3b9e00d8f23e", - "sha256:0a9e74b5057463ce4e55d9332a5670993fc9e1299c52e1740e505eda106fb355", - "sha256:0aa4cca3f16fab40cb8dae6a49d0eccdc8f4ead9d1a6428cd9ba12befe082b2a", - "sha256:117098d4924b260a24a47c6b3fe37f2ae41f04a2ea2eff9f553ae9210b12fa54", - "sha256:1d8139dcc864f48dc316376384f50e47a459284ad1cb84449242f4964e25aaec", - "sha256:3a2d070cf28860d285d4ab156f3954c0c1d12f4c037aa312a7c029227c0d106b", - "sha256:52548b45efff772fe3810fe91daf34f981ac0ca1a7227f6226fd5693f53b5b88", - "sha256:569ead6ae6bb0e636df0fc8af660ef03260e630dc5f2f4cf3198027e7b6bb481", - "sha256:62c0a7e433681d0861494d1ede96d2485e4dbb3ea8fd867e8419addebf5de1af", - "sha256:646de1bef85d6c7590e98f8ea52e47acdcf58330982e4f5d73f5ca28dea2d552", - "sha256:7e2b14fe5b3a8266cbe2f6740c0195497507974ced7bc21e99971561913a0c28", - "sha256:8a2b2012b3c7d6019e189496688fa77de7029a220840b406d8302d1c8021a11c", - "sha256:95eeec3a6c42fd35aca552777b7d9979ed489760423de97c0118a45e849a61f4", - "sha256:b296e65e25081af147af936f1e3a1f17f583a9afacfa5309742678ffef728ace", - "sha256:d6103b9a634993bd967337a1149f9d8b23922f42a3660676239399e15c1b4515", - "sha256:d88333091fd1627894bbf0d6dcef58a90e36bdf0d90a5d4675b5e07e72075511", - "sha256:e596f0105f748cf09d4763152d8157aaf58d5231232eaf2c5673d4562ba86ad3", - "sha256:ecc7193fff7741ced3db1f760666c8454d6664956288c54d1b49613b987a42f4" + "sha256:1a98e829d15d3b57ec1a120aa167ad2c218400758ad2a7927ad44dabbc6b4696", + "sha256:33c7c9347a09dd3feff15bbe7c66f2f80bc52bea6ec36d3d6a183aea00a1ec65", + "sha256:5ae218f21d47b30509b2ebe0992435a5b2f78c51bb94792baf9a469c0db5ded0", + "sha256:906e9b1907c85b6cbc66dba76bb054ae5aa626549468cc018bbe58f0dd8f16d6", + "sha256:9fadaa8106c5ca9ea76f29609c2221c237053394f9963467d1dd501e683a360f", + "sha256:c2183fafdd292fe9d1c26b88e9cb3c7d8b14419d68f1767a7108dd9e5fcac802", + "sha256:ea73020dce444caf16c584995186f724d68cdc235c92a34668b5fc330f21ba7b", + "sha256:f00efa654e025ef7f6c05a655b1bb418c697ae019fd9366c6d73bb2fafbcc84a" ], - "markers": "python_full_version >= '3.6.2'", - "version": "==1.9.0" + "index": "pypi", + "version": "==1.9.0+cpu" }, "torchvision": { "hashes": [ - "sha256:20a57ce42fa20c26d800c65d5b88dbaaa115a01f4f5623d41abfb182b854f199", - "sha256:4796e1fb2995c6e495c5ea4e2b0fe0e4be44bd9416ef4a1349c1a406675cbdee", - "sha256:487bbfd89575a52cd18bca8a33e24c373570e060f801265051c3a0aafc769720", - "sha256:576d7b070f25cbfc78a710960fd8fa6d3961d640db05f7ace69d9a3e5bbf754a", - "sha256:6b917d4762deaaa4c0cdd106403ea8384a1fdf93de424097bd71f3ebfdc76b41", - "sha256:6d69bf15a6e885e3b8c674a524bc6b53016879cb8b0fd8537327edd2d243cab1", - "sha256:9597da592f76d22d9e80a4a072294e093f8c3a06c404f3ff237f359b9225e097", - "sha256:a30466893a5b97073c992859f3645e3e1f41daf2c1b4db6cb2ac8ec7d0e1f6bc", - "sha256:a405d968e7e94c0744870eef31c977635e2123b0b46becc1461a28b7c27d3c0c", - "sha256:aa709fa63896f93e03a03976230a51050fcd5f1b45cf663f62d91b7eaaf8ac09", - "sha256:ad24107b2ed0ccc372af92822f1f8f5530907b6fb7520a08195cf0bb07446923", - "sha256:ae9606cc248de9b3a077710529b11c57315d2914c8ee3099fbd93a62f56a1661", - "sha256:bb04708354fb6d639f6e47d8066b0d546fbe0a3a68685cf8d413a6370c8f63ad", - "sha256:ce2aae5567522f2a877c6334796721af07c164e94ff75876821fadb3310cfe7e", - "sha256:d5c80cf058c0ecb010a97dc71225f5274e45c596bfad7505e0d000abcccb7063", - "sha256:da65af25b51caf43327ecb3ccf550eedfd62d1f73511db44370b4b9522569b8d", - "sha256:f26c5ba220445ee8e892033234485c9276304874e87ec9d5146779167be3148d", - "sha256:f68291559a4cf1245c95efc5e47ebe158819aceec4e1f585d2fe133cd2c9d8e8" + "sha256:0709a49425273c3d5c163539ea5b9b0d4d4bac5adc6727a0e5b11d8ba236ba62", + "sha256:179053ca8cbe7aeec5a0b10bebd35123e2d85aac4d5279fdfa720e654239c561", + "sha256:4a3d77a3465a1d8636a627725adcdd76143c592982685f1b7fab4efe40b05508", + "sha256:61d2242d939dd0a618f2450e148ddb0d24507db46f5a923af62256a902ddab9c", + "sha256:7b660721701a4f18737bb8d7a3663780a4c8acd1f871fd2ab11c07a4ee1b9aac", + "sha256:bc43b6ed08a6a6cee03b76bec99cbc3cd04a08c3efa97720a048aa22a58bd04b", + "sha256:df9d4ebc93d30e1843c09c9e521e681e893ea816cbb745b2d0f77c8704c9c309", + "sha256:fd0ae2ec106f7469f6ccab80721c498fc999e0acdca21c2eadc0fa5814615974" ], - "version": "==0.10.0" + "index": "pypi", + "version": "==0.10.0+cpu" }, "tqdm": { "hashes": [ - "sha256:5aa445ea0ad8b16d82b15ab342de6b195a722d75fc1ef9934a46bba6feafbc64", - "sha256:8bb94db0d4468fea27d004a0f1d1c02da3cdedc00fe491c0de986b76a04d6b0a" + "sha256:3642d483b558eec80d3c831e23953582c34d7e4540db86d9e5ed9dad238dabc6", + "sha256:706dea48ee05ba16e936ee91cb3791cd2ea6da348a0e50b46863ff4363ff4340" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==4.61.2" + "version": "==4.62.0" }, "typing-extensions": { "hashes": [ diff --git a/README.md b/README.md index 3cbfed48..27d7155c 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,13 @@ Currently, pre-built distributable is available only for Linux x86_64. +1. Download the AppImage from the latest [release](https://github.com/yurijmikhalevich/rclip/releases). + +2. Execute following commands: + ```bash -$ wget -c https://github.com/yurijmikhalevich/rclip/releases/download/v0.0.1-alpha/rclip-0.0.1-alpha-x86_64.AppImage -$ chmod +x rclip-0.0.1-alpha-x86_64.AppImage -$ sudo mv rclip-0.0.1-alpha-x86_64.AppImage /usr/local/bin/rclip +$ chmod +x +$ sudo mv /usr/local/bin/rclip ``` ## Usage @@ -40,6 +43,8 @@ $ rclip --help This repository follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard. +Please, execute `pipenv shell` before running `pipenv sync` or `pipenv install` to set `PIP_FIND_LINKS`. + ## License MIT diff --git a/appimage_after_bundle.sh b/appimage_after_bundle.sh index 2a0d21ae..a5e70b60 100755 --- a/appimage_after_bundle.sh +++ b/appimage_after_bundle.sh @@ -13,4 +13,4 @@ LD_LIBRARY_PATH=$APPDIR/usr/lib/x86_64-linux-gnu python3.8 -m pip install pipenv && python3.8 -m pipenv lock -r > requirements.txt && python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" certifi wheel && -python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r ./requirements.txt +python3.8 -m pip install --upgrade --isolated --no-input --ignore-installed --prefix="$APPDIR/usr" -r ./requirements.txt -f https://download.pytorch.org/whl/torch_stable.html