Skip to content

Commit

Permalink
[Release 0.07.6] Release of version 0.07.6
Browse files Browse the repository at this point in the history
  • Loading branch information
da115115 committed May 16, 2020
1 parent 44682b6 commit c7e7ea4
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 18 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include (config/project_config_embeddable.cmake)
project (opentrep)
set_project_names (opentrep OpenTREP)
set_project_brief ("C++ Open Travel Request Parsing Library")
set_project_versions (0 07 5)
set_project_versions (0 07 6)

##
# Project options
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Sat May 16 2020 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.07.6
- Improved how the Python module is delivered

* Mon Mar 02 2020 Denis Arnaud <denis.arnaud_fedora at m4x.org> 0.07.5
- Updated the code for the new OPTD data format (Geonames coordinates
have been added)
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* 2020-05-16:
- Version 0.07.6
- Improved how the Python module is delivered

* 2020-03-02:
- Version 0.07.5
- Updated the code for the new OPTD data format (Geonames coordinates
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ GitHub generates
[tar-balls on the fly for every tagged release](https://github.com/trep/opentrep/releases).
For instance:
```bash
$ wget https://github.com/trep/opentrep/archive/opentrep-0.07.5.tar.gz
$ wget https://github.com/trep/opentrep/archive/opentrep-0.07.6.tar.gz
```

Note that SourceForge also stores some
Expand Down Expand Up @@ -420,7 +420,7 @@ To customize OpenTREP to your environment, you can alter
the installation directory:
```bash
export INSTALL_BASEDIR="${HOME}/dev/deliveries"
export TREP_VER="0.07.5"
export TREP_VER="0.07.6"
if [ -d /usr/lib64 ]; then LIBSUFFIX="64"; else LIBSUFFIX=""; fi
export LIBSUFFIX_4_CMAKE="-DLIB_SUFFIX=$LIBSUFFIX"
```
Expand Down Expand Up @@ -815,17 +815,17 @@ $ python3 -m pip install pytest tox twine keyrings.alt
$ python3 -m pip install -U opentrep
Defaulting to user installation because normal site-packages is not writeable
Collecting opentrep
Using cached opentrep-0.7.5.post4.tar.gz (1.7 MB)
Using cached opentrep-0.7.6.post1.tar.gz (1.7 MB)
Installing build dependencies ... done
Getting requirements to build wheel ... done
Preparing wheel metadata ... done
Building wheels for collected packages: opentrep
Building wheel for opentrep (PEP 517) ... done
Created wheel for opentrep: filename=opentrep-0.7.5.post4-cp38-cp38-linux_x86_64.whl size=3060796 sha256=6362e3a86af016b251fe33b9f76db17322ec15a60575082f31f6b719ba2cf97f
Created wheel for opentrep: filename=opentrep-0.7.6.post1-cp38-cp38-linux_x86_64.whl size=3060796 sha256=6362e3a86af016b251fe33b9f76db17322ec15a60575082f31f6b719ba2cf97f
Stored in directory: ~/.cache/pip/wheels/82/b3/7c/f026b883cc204eefab1588f5e68661f78fec25395277bd221d
Successfully built opentrep
Installing collected packages: opentrep
Successfully installed opentrep-0.7.5.post4
Successfully installed opentrep-0.7.6.post1
```
+ Test the just installed OpenTREP Pythoh extension:
```bash
Expand Down Expand Up @@ -859,8 +859,8 @@ $ python3 setup.py --build-type=Debug build sdist bdist_wheel # the build takes
$ ls -lFh _skbuild/linux-x86_64-3.8/ dist/
dist/:
total 42M
-rw-rw-r-- 1 user staff 40M May 15 23:45 opentrep-0.7.5.post4-cp38-cp38-linux_x86_64.whl
-rw-rw-r-- 1 user staff 1.6M May 15 23:45 opentrep-0.7.5.post4.tar.gz
-rw-rw-r-- 1 user staff 40M May 15 23:45 opentrep-0.7.6.post1-cp38-cp38-linux_x86_64.whl
-rw-rw-r-- 1 user staff 1.6M May 15 23:45 opentrep-0.7.6.post1.tar.gz

_skbuild/linux-x86_64-3.8/:
total 12K
Expand All @@ -880,13 +880,13 @@ $ docker run --rm -e PLAT=manylinux2010_x86_64 -v `pwd`:/io scikitbuild/manylinu
user@laptop$ PYPIURL="https://test.pypi.org"
user@laptop$ twine upload -u __token__ --repository-url ${PYPIURL}/legacy/ dist/*
Uploading distributions to https://test.pypi.org/legacy/
Uploading opentrep-0.7.5-cp38-cp38-macosx_10_15_x86_64.whl
Uploading opentrep-0.7.6-cp38-cp38-macosx_10_15_x86_64.whl
100%|██████████████████████████████████████████████████████████████████████| 13.4M/13.4M [00:16<00:00, 853kB/s]
Uploading opentrep-0.7.5.macosx-10.15-x86_64.tar.gz
Uploading opentrep-0.7.6.macosx-10.15-x86_64.tar.gz
100%|██████████████████████████████████████████████████████████████████████| 13.2M/13.2M [00:13<00:00, 993kB/s]

View at:
https://test.pypi.org/project/opentrep/0.7.5/
https://test.pypi.org/project/opentrep/0.7.6/
```

* Upload/release the Python packages onto the
Expand All @@ -897,13 +897,13 @@ user@laptop$ keyring set ${PYPIURL}/ __token__
Password for '__token__' in '${PYPIURL}/':
user@laptop$ twine upload -u __token__ --non-interactive dist/*
Uploading distributions to https://upload.pypi.org/legacy/
Uploading opentrep-0.7.5-cp38-cp38-macosx_10_15_x86_64.whl
Uploading opentrep-0.7.6-cp38-cp38-macosx_10_15_x86_64.whl
100%|█████████████████████████████████████████████████████████████████████| 13.4M/13.4M [00:48<00:00, 293kB/s]
Uploading opentrep-0.7.5.macosx-10.15-x86_64.tar.gz
Uploading opentrep-0.7.6.macosx-10.15-x86_64.tar.gz
100%|█████████████████████████████████████████████████████████████████████| 13.2M/13.2M [00:49<00:00, 278kB/s]

View at:
https://pypi.org/project/opentrep/0.7.5/
https://pypi.org/project/opentrep/0.7.6/
```
## Use the OpenTREP Python extension
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
#
VERSION_MAJOR=0
VERSION_MINOR=07
VERSION_PATCH=5
VERSION_PATCH=6
VERSION_TMP_STRING=`grep "set_project_versions" CMakeLists.txt | sed -e "s/set_project_versions.*\([0-9]\+.\+[0-9]\+.\+[0-9]\+\).\+/\1/"`
VERSION_STRING=`echo "${VERSION_TMP_STRING}" | grep "^[0-9]\+.[0-9]\+.[0-9]\+$"`

Expand Down
9 changes: 8 additions & 1 deletion config/project_config_embeddable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,14 @@ macro (module_script_add _script_file)
add_custom_target (${_script_alone}_script ALL DEPENDS ${_full_script_srcs})

# Install the (Shell, Python, Perl, Ruby, etc) script file
install (PROGRAMS ${_full_script_path} DESTINATION bin COMPONENT devel)
if ("${_script_ext}" STREQUAL "py")
# The Python scripts have to be installed in the Python
# site-package/library dedicated directory
install (PROGRAMS ${_full_script_path}
DESTINATION "${INSTALL_PY_LIB_DIR}" COMPONENT devel)
else ("${_script_ext}" STREQUAL "py")
install (PROGRAMS ${_full_script_path} DESTINATION bin COMPONENT devel)
endif ("${_script_ext}" STREQUAL "py")

else (EXISTS ${_full_script_src_path})
message (FATAL_ERROR
Expand Down
2 changes: 1 addition & 1 deletion opentrep/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module_binary_add (ui/cmdline opentrep-dbmgr)
##
# Installing Python scripts
#python_module_add (python/pyopentrep.py)
module_script_add (python/pyopentrep)
module_script_add (python/pyopentrep.py)
python_module_add (python/__init__.py)

##
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup (
name='opentrep',
version='0.7.5-4',
version='0.7.6-1',
author='Denis Arnaud',
author_email='denis.arnaud_pypi@m4x.org',
description=('''Simple Python wrapper for OpenTREP'''),
Expand Down

0 comments on commit c7e7ea4

Please sign in to comment.