Skip to content

Commit

Permalink
Merge pull request #457 from HXLStandard/release-1.29
Browse files Browse the repository at this point in the history
Prepare release 1.29
  • Loading branch information
davidmegginson committed Apr 6, 2023
2 parents 38a01a3 + 73f030a commit f91efc3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Release 1.29
2023-04-06 Release 1.29
- /api/source-info now supports all formats (not just XLSX and XLS)
- renamed 'hashtag_hash' property from /api/source-info to 'hxl-hashtag-hash'

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ test-install:
pip3 cache remove '*'
rm -rf venv-test
python3 -m venv venv-test
. venv-test/bin/activate \\
&& python setup.py install
. venv-test/bin/activate \
&& python setup.py install \
&& pytest
rm -rf venv-test # make sure we clean up

Expand Down
2 changes: 1 addition & 1 deletion hxl_proxy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"""

__version__="1.28.1"
__version__="1.29"
"""Module version number
See https://www.python.org/dev/peps/pep-0396/
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
urllib3>=1.21.1<1.27 # version required by requests
#git+https://github.com/HXLStandard/libhxl-python.git@4.29-b1#egg=libhxl # for development
#git+https://github.com/HXLStandard/libhxl-python.git@dev#egg=libhxl # for development
libhxl==4.29 # for release
ckanapi>=3.5
flask-caching
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name = 'hxl-proxy',
packages = ['hxl_proxy'],
package_data={'hxl_proxy': ['*.sql']},
version = "1.28.1",
version = "1.29",
description = 'Flask-based web proxy for HXL',
long_description=long_description,
long_description_content_type="text/markdown",
Expand All @@ -27,8 +27,8 @@
zip_safe = False,
install_requires=[
'urllib3>=1.21.1,<1.27', # version required by requests
'libhxl @ git+https://github.com/HXLStandard/libhxl-python.git@4.27.3', # for development
#'libhxl==4.28', # for release
#'libhxl @ git+https://github.com/HXLStandard/libhxl-python.git@dev', # for development
'libhxl==4.29', # for release
'ckanapi>=3.5',
'flask-caching',
'flask>=2.1.2',
Expand Down

0 comments on commit f91efc3

Please sign in to comment.