From aa6d0f0c3f1430a7323d452fa9489b5698b149ff Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Thu, 16 Jan 2020 20:54:24 -0800 Subject: [PATCH] Update dependencies Add version specs to everything, and add transformers --- Pipfile | 20 +++---- Pipfile.lock | 152 +++++++---------------------------------------- requirements.txt | 19 ------ setup.py | 16 ++--- 4 files changed, 37 insertions(+), 170 deletions(-) delete mode 100644 requirements.txt diff --git a/Pipfile b/Pipfile index a124400d..c34d434e 100644 --- a/Pipfile +++ b/Pipfile @@ -7,20 +7,16 @@ verify_ssl = true [packages] numpy = "*" -torch = "<2.0.0,>=0.4.1" -revtok = {editable = true,git = "https://github.com/jekbradbury/revtok.git"} -tqdm = "*" -nltk = "==3.2.5" +torch = "~=1.4" +revtok = "==0.0.3" +tqdm = "~=4.0" python-dateutil = "*" ujson = "*" -pyrouge = {editable = true,git = "git://github.com/andersjo/pyrouge.git"} -sacrebleu = "*" -records = "*" -tabulate = "*" -tensorboardX = "*" -Babel = "*" -requests = "*" -transformers = "*" +pyrouge = ">=0.1.3" +sacrebleu = "~=1.0" +tensorboardX = "==2.0.*" +requests = "~=2.22" +transformers = "~=2.3" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index cdcafb58..3143aac1 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "a49da22eb026763b9c0581905f6624ca97e443e40bb691e3d5531f58dbb199f7" + "sha256": "c8a3e10dfb33615c6f43668e4ffdbd1abb10f73704be9e3bc9a327e9102c6fee" }, "pipfile-spec": 6, "requires": { @@ -16,35 +16,19 @@ ] }, "default": { - "babel": { - "hashes": [ - "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38", - "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4" - ], - "index": "pypi", - "version": "==2.8.0" - }, - "beautifulsoup4": { - "hashes": [ - "sha256:05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a", - "sha256:9fbb4d6e48ecd30bcacc5b63b94088192dcda178513b2ae3c394229f8911b887", - "sha256:e1505eeed31b0f4ce2dbb3bc8eb256c04cc2b3b72af7d551a4ab6efd5cbe5dae" - ], - "version": "==4.8.2" - }, "boto3": { "hashes": [ - "sha256:916efdecda945daba08dca9032373440db681e53e6b46e7d0cae104ffd5ac7ca", - "sha256:925899699b81977b75d4036fc478209916f4547f8683e5c7b1ad678317a6652e" + "sha256:589675488d3d42783098321619ddf7a8ec06dd11e9b73db19deb063cfb05eec6", + "sha256:c8cc6d8d5474e46f0826ba1156356c583961c2df8c4324f4373df7a83bbce627" ], - "version": "==1.11.3" + "version": "==1.11.4" }, "botocore": { "hashes": [ - "sha256:799562d2af023f49518676c6b72ee07325da027513406b4b9d8e5b74ecea8257", - "sha256:80e6522c4bb8d98dab9fd77708c6722bee775c7b85a77326ef44543062a17462" + "sha256:91a39d0ede1676c22cf6158bbbc4f85cc3385ab9201b5190c25e3770967f94c0", + "sha256:cf29118fb62513712888f2f3dd337c0933a3e253b952f0bbe6d8d4c4fd4be5be" ], - "version": "==1.14.3" + "version": "==1.14.4" }, "certifi": { "hashes": [ @@ -67,12 +51,6 @@ ], "version": "==7.0" }, - "docopt": { - "hashes": [ - "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" - ], - "version": "==0.6.2" - }, "docutils": { "hashes": [ "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", @@ -81,12 +59,6 @@ ], "version": "==0.15.2" }, - "et-xmlfile": { - "hashes": [ - "sha256:614d9722d572f6246302c4491846d2c393c199cfa4edc9af593437691683335b" - ], - "version": "==1.0.1" - }, "idna": { "hashes": [ "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", @@ -94,13 +66,6 @@ ], "version": "==2.8" }, - "jdcal": { - "hashes": [ - "sha256:1abf1305fce18b4e8aa248cf8fe0c56ce2032392bc64bbd61b5dff2a19ec8bba", - "sha256:472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" - ], - "version": "==1.4.1" - }, "jmespath": { "hashes": [ "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", @@ -115,13 +80,6 @@ ], "version": "==0.14.1" }, - "nltk": { - "hashes": [ - "sha256:2661f9971d983db314bbebd51ba770811a362c6597fd0f303bb1d3beadcb4834" - ], - "index": "pypi", - "version": "==3.2.5" - }, "numpy": { "hashes": [ "sha256:1786a08236f2c92ae0e70423c45e1e62788ed33028f94ca99c4df03f5be6b3c6", @@ -149,36 +107,6 @@ "index": "pypi", "version": "==1.18.1" }, - "openpyxl": { - "hashes": [ - "sha256:626d38647c063d55803ef4971c4d43226538d4e95cb6260c094e363ee33e10c7" - ], - "version": "==2.4.11" - }, - "pandas": { - "hashes": [ - "sha256:00dff3a8e337f5ed7ad295d98a31821d3d0fe7792da82d78d7fd79b89c03ea9d", - "sha256:22361b1597c8c2ffd697aa9bf85423afa9e1fcfa6b1ea821054a244d5f24d75e", - "sha256:255920e63850dc512ce356233081098554d641ba99c3767dde9e9f35630f994b", - "sha256:26382aab9c119735908d94d2c5c08020a4a0a82969b7e5eefb92f902b3b30ad7", - "sha256:33970f4cacdd9a0ddb8f21e151bfb9f178afb7c36eb7c25b9094c02876f385c2", - "sha256:4545467a637e0e1393f7d05d61dace89689ad6d6f66f267f86fff737b702cce9", - "sha256:52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4", - "sha256:61741f5aeb252f39c3031d11405305b6d10ce663c53bc3112705d7ad66c013d0", - "sha256:6a3ac2c87e4e32a969921d1428525f09462770c349147aa8e9ab95f88c71ec71", - "sha256:7458c48e3d15b8aaa7d575be60e1e4dd70348efcd9376656b72fecd55c59a4c3", - "sha256:78bf638993219311377ce9836b3dc05f627a666d0dbc8cec37c0ff3c9ada673b", - "sha256:8153705d6545fd9eb6dd2bc79301bff08825d2e2f716d5dced48daafc2d0b81f", - "sha256:975c461accd14e89d71772e89108a050fa824c0b87a67d34cedf245f6681fc17", - "sha256:9962957a27bfb70ab64103d0a7b42fa59c642fb4ed4cb75d0227b7bb9228535d", - "sha256:adc3d3a3f9e59a38d923e90e20c4922fc62d1e5a03d083440468c6d8f3f1ae0a", - "sha256:bbe3eb765a0b1e578833d243e2814b60c825b7fdbf4cdfe8e8aae8a08ed56ecf", - "sha256:df8864824b1fe488cf778c3650ee59c3a0d8f42e53707de167ba6b4f7d35f133", - "sha256:e45055c30a608076e31a9fcd780a956ed3b1fa20db61561b8d88b79259f526f7", - "sha256:ee50c2142cdcf41995655d499a157d0a812fce55c97d9aad13bc1eef837ed36c" - ], - "version": "==0.25.3" - }, "portalocker": { "hashes": [ "sha256:6f57aabb25ba176462dc7c63b86c42ad6a9b5bd3d679a9d776d0536bfb803d54", @@ -210,9 +138,11 @@ "version": "==3.11.2" }, "pyrouge": { - "editable": true, - "git": "git://github.com/andersjo/pyrouge.git", - "ref": "3b6c415204dbc2c8360a01d92533441f4aae95eb" + "hashes": [ + "sha256:364f1dd65a5aabeb40eb4cdf967bc0cb495073885c75eaf09c960fc9ea1696a3" + ], + "index": "pypi", + "version": "==0.1.3" }, "python-dateutil": { "hashes": [ @@ -222,21 +152,6 @@ "index": "pypi", "version": "==2.8.1" }, - "pytz": { - "hashes": [ - "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", - "sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" - ], - "version": "==2019.3" - }, - "records": { - "hashes": [ - "sha256:47e4874096f4a8f4b5bcad8c7c7cf512be36186e6e263ff3dfd750b05ff0d3c4", - "sha256:cdbacf52c61b4a3bc10fef1286a24a63ae95255a2e7b4e8ccb1e1f96737231ed" - ], - "index": "pypi", - "version": "==0.5.3" - }, "regex": { "hashes": [ "sha256:07b39bf943d3d2fe63d46281d8504f8df0ff3fe4c57e13d1656737950e53e525", @@ -272,16 +187,19 @@ "version": "==2.22.0" }, "revtok": { - "editable": true, - "git": "https://github.com/jekbradbury/revtok.git", - "ref": "f1998b72a941d1e5f9578a66dc1c20b01913caab" + "hashes": [ + "sha256:a66090024a4ecfc8475cdc802f9c4f838a3a23d8a5c27c78c10cadc06ccba837", + "sha256:b068055907eb3c9b2b4202e6839f51c9b9e9e16c9267a392c06a326d25bd6287" + ], + "index": "pypi", + "version": "==0.0.3" }, "s3transfer": { "hashes": [ - "sha256:2157640a47c8b8fa2071bdd7b0d57378ec8957eede3bd083949c2dcc4d9b0dd4", - "sha256:e3343ae0f371781c17590cf06cb818a54484fbac9a65a5be7603a39b0a6d7b31" + "sha256:248dffd2de2dfb870c507b412fc22ed37cd3255293e293c395158e7c55fbe5f9", + "sha256:80ed96731b3bd77395cd6197246069092015e1124164b2c152c8f741a823dd04" ], - "version": "==0.3.0" + "version": "==0.3.1" }, "sacrebleu": { "hashes": [ @@ -334,34 +252,6 @@ ], "version": "==1.14.0" }, - "soupsieve": { - "hashes": [ - "sha256:bdb0d917b03a1369ce964056fc195cfdff8819c40de04695a80bc813c3cfa1f5", - "sha256:e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda" - ], - "version": "==1.9.5" - }, - "sqlalchemy": { - "hashes": [ - "sha256:bfb8f464a5000b567ac1d350b9090cf081180ec1ab4aa87e7bca12dab25320ec" - ], - "markers": "python_version >= '3.0'", - "version": "==1.3.12" - }, - "tablib": { - "hashes": [ - "sha256:02ef7d074763fb690f696f09b51448614388099bc3b685b118be24152259cf5a", - "sha256:ff3172802e8dd7fb795867942f5238f6c90e2d4e90ad6233c1a796cdfc63bb35" - ], - "version": "==1.0.0" - }, - "tabulate": { - "hashes": [ - "sha256:5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8" - ], - "index": "pypi", - "version": "==0.8.6" - }, "tensorboardx": { "hashes": [ "sha256:835d85db0aef2c6768f07c35e69a74e3dcb122d6afceaf2b8504d7d16c7209a5", diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 9ed920cf..00000000 --- a/requirements.txt +++ /dev/null @@ -1,19 +0,0 @@ -numpy -torch>=0.4.1,<1.2.0 - -# Revtok --e git+https://github.com/jekbradbury/revtok.git#egg=revtok - -# text requirements -tqdm -nltk==3.2.5 - -# tensorboard -tensorboardX -python-dateutil - -# additional python packages -ujson --e git+git://github.com/andersjo/pyrouge.git#egg=pyrouge -sacrebleu -requests \ No newline at end of file diff --git a/setup.py b/setup.py index ef4beb0c..2f3647e5 100644 --- a/setup.py +++ b/setup.py @@ -48,15 +48,15 @@ setuptools.setup( install_requires=[ 'numpy', - 'torch>=0.4.1,<1.2.0', - 'revtok', - 'tqdm', - 'nltk', - 'tensorboardX', + 'torch~=1.4', + 'revtok==0.0.3', + 'tqdm~=4.0', + 'tensorboardX==2.0.*', 'python-dateutil', 'ujson', - 'pyrouge', - 'sacrebleu', - 'requests' + 'pyrouge>=0.1.3', + 'sacrebleu~=1.0', + 'requests~=2.22', + 'transformers~=2.3' ] )