Compare commits

..

4 Commits

Author SHA1 Message Date
msramalho
3e22709430 Bump version to v0.3.30 for release 2024-07-16 16:18:32 +01:00
msramalho
9c7eadc716 attempts to circumvent pypi not allowing repo reference 2024-07-16 16:18:23 +01:00
msramalho
5d30d18b7b Bump version to v0.3.29 for release 2024-07-16 16:05:59 +01:00
msramalho
b2d462441e fixing issues with upstream vk api 2024-07-16 16:05:35 +01:00
7 changed files with 1118 additions and 1306 deletions

View File

@@ -30,7 +30,8 @@ requests = ">=2.28.2"
urllib3 = ">=1.26.14" urllib3 = ">=1.26.14"
websockets = ">=10.4" websockets = ">=10.4"
# vk-api = {ref = "77b5a0d51a6bbf54d59554332f28a488615fbd6c", git = "git+https://github.com/python273/vk_api.git"} # vk-api = {ref = "77b5a0d51a6bbf54d59554332f28a488615fbd6c", git = "git+https://github.com/python273/vk_api.git"}
vk-api = "*" # vk-api = "*"
vk-api = {ref = "b99dac0ec2f832a6c4b20bde49869e7229ce4742", git = "git+https://github.com/python273/vk_api.git"}
[dev-packages] [dev-packages]
sphinx-copybutton = "==0.5.0" sphinx-copybutton = "==0.5.0"

2324
Pipfile.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -12,6 +12,9 @@ You can use it via the [command line](#command-line-usage) or as a [python libra
## Installation ## Installation
You can install the most recent release from [pypi](https://pypi.org/project/vk-url-scraper/) via `pip install vk-url-scraper`. You can install the most recent release from [pypi](https://pypi.org/project/vk-url-scraper/) via `pip install vk-url-scraper`.
Currently you need to manually install one dependency (as it is installed from github and not pypi):
`pip install git+https://github.com/python273/vk_api.git@b99dac0ec2f832a6c4b20bde49869e7229ce4742`
To use the library you will need a valid username/password combination for vk.com. To use the library you will need a valid username/password combination for vk.com.
## Command line usage ## Command line usage
@@ -98,6 +101,7 @@ To test the command line interface available in [__main__.py](__vk_url_scraper/_
## Releasing new version ## Releasing new version
1. edit [version.py](vk_url_scraper/version.py) with proper versioning 1. edit [version.py](vk_url_scraper/version.py) with proper versioning
2. make sure to run `pipenv run pip freeze > requirements.txt` if you manage libs with pipenv 2. make sure to run `pipenv run pip freeze > requirements.txt` if you manage libs with pipenv
1. if the hardcoded version of [vk_api](https://github.com/python273/vk_api) is still being used, then you must comment/remove that line from the generated requirements file and instruct users to manually install the version from the source as pypi does not allow repo/commit tags. Additionally, add the latest released version, currently `vk-api==11.9.9`.
3. run `./scripts/release.sh` to create a tag and push, alternatively 3. run `./scripts/release.sh` to create a tag and push, alternatively
1. `git tag vx.y.z` to tag version 1. `git tag vx.y.z` to tag version
2. `git push origin vx.y.z` -> this will trigger workflow and put project on [pypi](https://pypi.org/project/vk-url-scraper/) 2. `git push origin vx.y.z` -> this will trigger workflow and put project on [pypi](https://pypi.org/project/vk-url-scraper/)

View File

@@ -1,77 +1,83 @@
aiohttp==3.9.1 aiohttp==3.9.1
aiosignal==1.3.1 aiosignal==1.3.1
alabaster==0.7.16 alabaster==0.7.16
anyio==4.4.0
async-timeout==4.0.3 async-timeout==4.0.3
attrs==23.2.0 attrs==23.2.0
Babel==2.14.0 Babel==2.15.0
beautifulsoup4==4.12.3 backports.tarfile==1.2.0
black==24.1a1 beautifulsoup4==4.13.0b2
black==24.4.2
bleach==6.0.0 bleach==6.0.0
Brotli==1.1.0 Brotli==1.1.0
certifi==2023.11.17 certifi==2024.7.4
cffi==1.16.0 cffi==1.17.0rc1
charset-normalizer==3.3.2 charset-normalizer==3.3.2
click==8.1.7 click==8.1.7
colorama==0.4.6 colorama==0.4.6
commonmark==0.9.1 commonmark==0.9.1
coverage==7.4.0 coverage==7.6.0
cryptography==42.0.0 cryptography==42.0.8
docutils==0.18.1 docutils==0.18.1
exceptiongroup==1.2.0 exceptiongroup==1.2.2
flake8==7.0.0 flake8==7.1.0
frozenlist==1.4.1 frozenlist==1.4.1
furo==2023.3.27 furo==2023.3.27
idna==3.6 h11==0.14.0
idna==3.7
imagesize==1.4.1 imagesize==1.4.1
importlib-metadata==7.0.1 importlib_metadata==8.0.0
iniconfig==2.0.0 iniconfig==2.0.0
isort==6.0.0b2 isort==6.0.0b2
jaraco.classes==3.3.0 jaraco.classes==3.4.0
jaraco.context==5.3.0
jaraco.functools==4.0.1
jeepney==0.8.0 jeepney==0.8.0
Jinja2==3.1.3 Jinja2==3.1.4
keyring==24.3.0 keyring==25.2.1
livereload==2.6.3 livereload==2.6.3
markdown-it-py==2.2.0 markdown-it-py==2.2.0
MarkupSafe==2.1.4 MarkupSafe==2.1.5
mccabe==0.7.0 mccabe==0.7.0
mdit-py-plugins==0.3.5 mdit-py-plugins==0.3.5
mdurl==0.1.2 mdurl==0.1.2
more-itertools==10.2.0 more-itertools==10.3.0
multidict==6.0.4 multidict==6.0.4
mutagen==1.47.0 mutagen==1.47.0
mypy==1.8.0 mypy==1.10.1
mypy-extensions==1.0.0 mypy-extensions==1.0.0
myst-parser==0.18.1 myst-parser==0.18.1
nh3==0.2.15 nh3==0.2.18
packaging==23.2 packaging==24.1
pathspec==0.12.1 pathspec==0.12.1
pkginfo==1.9.6 pkginfo==1.10.0
platformdirs==4.1.0 platformdirs==4.2.2
pluggy==1.3.0 pluggy==1.5.0
py==1.11.0 py==1.11.0
pycodestyle==2.11.1 pycodestyle==2.12.0
pycparser==2.21 pycparser==2.22
pycryptodomex==3.20.0 pycryptodomex==3.20.0
pyflakes==3.2.0 pyflakes==3.2.0
Pygments==2.17.2 Pygments==2.18.0
pyparsing==3.0.9 pyparsing==3.0.9
pytest==8.0.0rc2 pytest==8.2.2
pytest-cov==4.1.0 pytest-cov==5.0.0
pytest-sphinx==0.5.0 pytest-sphinx==0.6.3
python-dotenv==1.0.1 python-dotenv==1.0.1
pytz==2022.1 pytz==2022.1
PyYAML==6.0.1 PyYAML==6.0.2rc1
readme-renderer==42.0 readme_renderer==43.0
requests==2.31.0 requests==2.32.3
requests-toolbelt==1.0.0 requests-toolbelt==1.0.0
rfc3986==2.0.0 rfc3986==2.0.0
rich==13.7.0 rich==13.7.1
SecretStorage==3.3.3 SecretStorage==3.3.3
six==1.16.0 six==1.16.0
sniffio==1.3.1
snowballstemmer==2.2.0 snowballstemmer==2.2.0
soupsieve==2.5 soupsieve==2.5
Sphinx==5.0.2 Sphinx==5.0.2
sphinx-autobuild==2021.3.14 sphinx-autobuild==2024.4.16
sphinx-autodoc-typehints==1.19.1 sphinx-autodoc-typehints==1.19.1
sphinx-basic-ng==1.0.0b2 sphinx-basic-ng==1.0.0b2
sphinx-copybutton==0.5.2 sphinx-copybutton==0.5.2
@@ -81,14 +87,18 @@ sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-jsmath==1.0.1 sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.7 sphinxcontrib-qthelp==1.0.7
sphinxcontrib-serializinghtml==1.1.10 sphinxcontrib-serializinghtml==1.1.10
starlette==0.37.2
tomli==2.0.1 tomli==2.0.1
tornado==6.4 tornado==6.4
twine==4.0.2 twine==5.1.1
typing_extensions==4.9.0 typing_extensions==4.12.2
urllib3==2.1.0 urllib3==2.2.2
vk-api @ git+https://github.com/python273/vk_api.git@77b5a0d51a6bbf54d59554332f28a488615fbd6c uvicorn==0.30.1
# vk-api @ git+https://github.com/python273/vk_api.git@b99dac0ec2f832a6c4b20bde49869e7229ce4742
vk-api==11.9.9
watchfiles==0.22.0
webencodings==0.5.1 webencodings==0.5.1
websockets==12.0 websockets==12.0
yarl==1.9.4 yarl==1.9.4
yt-dlp==2024.1.22.232713.dev0 yt-dlp==2024.7.15.232803.dev0
zipp==3.17.0 zipp==3.19.2

View File

@@ -139,7 +139,6 @@ def test_scrape_video_only():
assert len(res) == 1 assert len(res) == 1
assert res[0]["id"] == "video38556806_456251917" assert res[0]["id"] == "video38556806_456251917"
assert str(res[0]["datetime"]) == str(datetime.datetime(2022, 3, 24, 5, 42, 38)) assert str(res[0]["datetime"]) == str(datetime.datetime(2022, 3, 24, 5, 42, 38))
assert len(res[0]["payload"]) == 34
assert len(res[0]["attachments"].keys()) == 1 assert len(res[0]["attachments"].keys()) == 1
assert list(res[0]["attachments"].keys()) == ["video"] assert list(res[0]["attachments"].keys()) == ["video"]

View File

@@ -59,7 +59,7 @@ class VkScraper:
password : str password : str
Matching password on vk.com Matching password on vk.com
token : str token : str
Access token received after authenticating, can be found in the vl_config.v2.json file Access token received after authenticating, can be found in the vk_config.v2.json file
session_file : str session_file : str
File name where the VK session is saved so future logins are easier, this will not be created if token is passed File name where the VK session is saved so future logins are easier, this will not be created if token is passed
captcha_handler : func captcha_handler : func

View File

@@ -2,7 +2,7 @@ _MAJOR = "0"
_MINOR = "3" _MINOR = "3"
# On main and in a nightly release the patch should be one ahead of the last # On main and in a nightly release the patch should be one ahead of the last
# released build. # released build.
_PATCH = "28" _PATCH = "30"
# This is mainly for nightly builds which have the suffix ".dev$DATE". See # This is mainly for nightly builds which have the suffix ".dev$DATE". See
# https://semver.org/#is-v123-a-semantic-version for the semantics. # https://semver.org/#is-v123-a-semantic-version for the semantics.
_SUFFIX = "" _SUFFIX = ""