From 30a6416dab1c7a1f388f05bafcc65b33e8a43a2f Mon Sep 17 00:00:00 2001 From: Miguel Vieira Date: Fri, 9 Feb 2024 12:53:06 +0000 Subject: [PATCH 1/4] fix: update requirements to supported versions of packages --- requirements.in | 5 -- requirements.txt | 50 ++----------- requirements_dev.in | 13 ---- requirements_dev.txt | 166 +++---------------------------------------- 4 files changed, 16 insertions(+), 218 deletions(-) delete mode 100644 requirements.in delete mode 100644 requirements_dev.in diff --git a/requirements.in b/requirements.in deleted file mode 100644 index 78d44d5..0000000 --- a/requirements.in +++ /dev/null @@ -1,5 +0,0 @@ -ckanapi>=4,<5 -click>=7,<8 -pandas>=0.25,<0.26 -tqdm>=4,<5 -xlrd>=1.2,<1.3 diff --git a/requirements.txt b/requirements.txt index acdb11e..8bace2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,45 +1,5 @@ -# -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: -# -# pip-compile requirements.in -# -certifi==2019.11.28 - # via requests -chardet==3.0.4 - # via requests -ckanapi==4.3 - # via -r requirements.in -click==7.0 - # via -r requirements.in -docopt==0.6.2 - # via ckanapi -idna==2.8 - # via requests -numpy==1.18.1 - # via pandas -pandas==0.25.3 - # via -r requirements.in -python-dateutil==2.8.1 - # via pandas -python-slugify==4.0.0 - # via ckanapi -pytz==2019.3 - # via pandas -requests==2.22.0 - # via ckanapi -six==1.14.0 - # via - # ckanapi - # python-dateutil -text-unidecode==1.3 - # via python-slugify -tqdm==4.41.1 - # via -r requirements.in -urllib3==1.25.8 - # via requests -xlrd==1.2.0 - # via -r requirements.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools +ckanapi>=4,<5 +click>=7,<8 +pandas<2 +tqdm>=4,<5 +xlrd>=1.2,<1.3 diff --git a/requirements_dev.in b/requirements_dev.in deleted file mode 100644 index 8d93cad..0000000 --- a/requirements_dev.in +++ /dev/null @@ -1,13 +0,0 @@ --r requirements.in - -Sphinx -bumpversion -bleach -coverage -flake8 -pip -pip-tools -tox -twine -watchdog -wheel diff --git a/requirements_dev.txt b/requirements_dev.txt index c9d194d..e5f2530 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,156 +1,12 @@ -# -# This file is autogenerated by pip-compile with python 3.9 -# To update, run: -# -# pip-compile requirements_dev.in -# -alabaster==0.7.12 - # via sphinx -argh==0.26.2 - # via watchdog -babel==2.8.0 - # via sphinx -bleach==3.1.5 - # via - # -r requirements_dev.in - # readme-renderer -bumpversion==0.5.3 - # via -r requirements_dev.in -certifi==2019.11.28 - # via requests -chardet==3.0.4 - # via requests -ckanapi==4.3 - # via -r requirements.in -click==7.0 - # via - # -r requirements.in - # pip-tools -coverage==5.0.3 - # via -r requirements_dev.in -docopt==0.6.2 - # via ckanapi -docutils==0.16 - # via - # readme-renderer - # sphinx -entrypoints==0.3 - # via flake8 -filelock==3.0.12 - # via tox -flake8==3.7.9 - # via -r requirements_dev.in -idna==2.8 - # via requests -imagesize==1.2.0 - # via sphinx -jinja2==2.10.3 - # via sphinx -keyring==21.1.0 - # via twine -markupsafe==1.1.1 - # via jinja2 -mccabe==0.6.1 - # via flake8 -numpy==1.18.1 - # via pandas -packaging==20.0 - # via - # bleach - # sphinx - # tox -pandas==0.25.3 - # via -r requirements.in -pathtools==0.1.2 - # via watchdog -pip-tools==4.4.0 - # via -r requirements_dev.in -pkginfo==1.5.0.1 - # via twine -pluggy==0.13.1 - # via tox -py==1.8.1 - # via tox -pycodestyle==2.5.0 - # via flake8 -pyflakes==2.1.1 - # via flake8 -pygments==2.5.2 - # via - # readme-renderer - # sphinx -pyparsing==2.4.6 - # via packaging -python-dateutil==2.8.1 - # via pandas -python-slugify==4.0.0 - # via ckanapi -pytz==2019.3 - # via - # babel - # pandas -pyyaml==5.3 - # via watchdog -readme-renderer==24.0 - # via twine -requests==2.22.0 - # via - # ckanapi - # requests-toolbelt - # sphinx - # twine -requests-toolbelt==0.9.1 - # via twine -six==1.14.0 - # via - # bleach - # ckanapi - # packaging - # pip-tools - # python-dateutil - # readme-renderer - # tox -snowballstemmer==2.0.0 - # via sphinx -sphinx==2.3.1 - # via -r requirements_dev.in -sphinxcontrib-applehelp==1.0.1 - # via sphinx -sphinxcontrib-devhelp==1.0.1 - # via sphinx -sphinxcontrib-htmlhelp==1.0.2 - # via sphinx -sphinxcontrib-jsmath==1.0.1 - # via sphinx -sphinxcontrib-qthelp==1.0.2 - # via sphinx -sphinxcontrib-serializinghtml==1.1.3 - # via sphinx -text-unidecode==1.3 - # via python-slugify -toml==0.10.0 - # via tox -tox==3.14.3 - # via -r requirements_dev.in -tqdm==4.41.1 - # via - # -r requirements.in - # twine -twine==3.1.1 - # via -r requirements_dev.in -urllib3==1.25.8 - # via requests -virtualenv==16.7.9 - # via tox -watchdog==0.9.0 - # via -r requirements_dev.in -webencodings==0.5.1 - # via bleach -wheel==0.33.6 - # via -r requirements_dev.in -xlrd==1.2.0 - # via -r requirements.in +-r requirements.txt -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools +Sphinx +bumpversion +bleach +coverage +flake8 +pip +tox +twine +watchdog +wheel From b60e37ec0fbc2148d2488928412d4b9e261924c9 Mon Sep 17 00:00:00 2001 From: Miguel Vieira Date: Fri, 9 Feb 2024 12:54:53 +0000 Subject: [PATCH 2/4] docs(history): update changelog --- HISTORY.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 83689c4..8c02e14 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,14 @@ History ======= +[Unreleased] - yyyy-MM-dd +--------------------- + +Fixed +~~~~~ +* Update requirements to supported versions of packages. + + [0.1.11] - 2021-10-28 --------------------- From 91154b3c2274cd08181409676b5c5cf833290e84 Mon Sep 17 00:00:00 2001 From: Miguel Vieira Date: Fri, 9 Feb 2024 12:54:57 +0000 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=200.1.11=20=E2=86=92=200.2.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HISTORY.rst | 2 +- data_portal_explorer/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 8c02e14..8cefb7d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,7 +2,7 @@ History ======= -[Unreleased] - yyyy-MM-dd +[0.2.0] - yyyy-MM-dd --------------------- Fixed diff --git a/data_portal_explorer/__init__.py b/data_portal_explorer/__init__.py index d7e9df8..e4a6eed 100644 --- a/data_portal_explorer/__init__.py +++ b/data_portal_explorer/__init__.py @@ -4,4 +4,4 @@ __author__ = """Kings Digital Lab""" __email__ = "jmvieira@gmail.com" -__version__ = "0.1.11" +__version__ = "0.2.0" diff --git a/setup.cfg b/setup.cfg index 1b12829..a4e374b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.11 +current_version = 0.2.0 commit = True tag = True diff --git a/setup.py b/setup.py index 48f5d0d..9cce0f5 100755 --- a/setup.py +++ b/setup.py @@ -65,6 +65,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/kingsdigitallab/DataPortalExplorer", - version="0.1.11", + version="0.2.0", zip_safe=False, ) From e2a81991467bdf798c4aaad72542179b7a935a3c Mon Sep 17 00:00:00 2001 From: Miguel Vieira Date: Fri, 9 Feb 2024 12:58:00 +0000 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=200.1.11=20=E2=86=92=200.1.?= =?UTF-8?q?12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HISTORY.rst | 2 +- data_portal_explorer/__init__.py | 4 ++-- setup.cfg | 2 +- setup.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 8cefb7d..c709772 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,7 +2,7 @@ History ======= -[0.2.0] - yyyy-MM-dd +[0.1.12] - 2024-02-09 --------------------- Fixed diff --git a/data_portal_explorer/__init__.py b/data_portal_explorer/__init__.py index e4a6eed..6e24862 100644 --- a/data_portal_explorer/__init__.py +++ b/data_portal_explorer/__init__.py @@ -3,5 +3,5 @@ """Top-level package for Data Portal Explorer.""" __author__ = """Kings Digital Lab""" -__email__ = "jmvieira@gmail.com" -__version__ = "0.2.0" +__email__ = "jose.m.vieira@kcl.ac.uk" +__version__ = "0.1.12" diff --git a/setup.cfg b/setup.cfg index a4e374b..f2a5849 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.0 +current_version = 0.1.12 commit = True tag = True diff --git a/setup.py b/setup.py index 9cce0f5..a89f810 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ setup( author="Kings Digital Lab", - author_email="jmvieira@pm.me", + author_email="jose.m.vieira@kcl.ac.uk", classifiers=[ "Development Status :: 2 - Pre-Alpha", "Intended Audience :: Developers", @@ -65,6 +65,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/kingsdigitallab/DataPortalExplorer", - version="0.2.0", + version="0.1.12", zip_safe=False, )