Skip to content

Commit d286b8c

Browse files
rokroskarjsam
authored andcommitted
build: use simplified version for pypi compatibility (#606)
* build: use simplified version for pypi compatibility closes #604 * build: update travis credentials
1 parent 7c1c34e commit d286b8c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ stages:
5454

5555
before_install:
5656
- git fetch --tags
57+
- git config --global --add user.name "Renku @ SDSC"
58+
- git config --global --add user.email "[email protected]"
5759
- if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
5860
sudo apt-get update;
5961
sudo apt-get -y install shellcheck;
@@ -69,8 +71,6 @@ before_install:
6971
brew link python;
7072
brew install git-lfs jq node pipenv shellcheck;
7173
brew upgrade node;
72-
git config --global --add user.name "John Doe";
73-
git config --global --add user.email "[email protected]";
7474
fi
7575

7676
install:
@@ -150,8 +150,10 @@ jobs:
150150
script: echo "Publishing on PyPI.io ..."
151151
deploy:
152152
- provider: pypi
153-
user: ${PYPI_USERNAME}
154-
password: ${PYPI_PASSWORD}
153+
user:
154+
secure: "RPxGYNL+N6LQy1/TbXCFy9IDgZ05u/Qj6my/p1hSoBWG304se28njZ0zpTv5AGZF8G3dBeVjYbf4s+ytwUPoxK+1fBWlnnSuw4QUXWf339rzcMU4dDO2QX8/SvMDZFbJdE/1/6arlbXa8dTZobm1V0Q3AUTkl2AwXIg9jCaRcYb6n9lASRIiR1M2BK/+FTJG2qywB9kSyQ3giuobwwhQa4CAwDg5MoqL5KLFm2CxejvS0vpleaWqA/LJxeHTQqqd0CIk6V2NBETZ6V78MqdISai88nRafijT0iQ5LSWsy7R6CCpK7OFjHnvA7hGSYzs/BRpdABAk5a2yFbKKZErXoLvatjflMlj2OhHy/0Hlv6xEt1db1pwnjQQIiS62R/Gpx4DZAO8hGp6pT9g9xiifzlj4km9iOD4GY1g+A5A+ssEneBTvExJja4yAqJzAVu+XVDVqxVj+MOmpIcQkzT983+cVceoeczJ61sDuftQaAgcVqQACRE02fLszEtSJVFaq3vKu8dX2eMdiCk7GLdqNF9kfygagNC8eja6Yvr+Ft8kTwrjTBMC/D3xC584I8OTzmpNE/tfZHppfhiKXoU+FySdIGCPcSTGKUgljiz3sFk1JjjEBkGqBLAMaD8l5FsgQqR4zO/2IiwSst1Wx8owF+tiLlerDAC9b/ZFcqDpUab4="
155+
password:
156+
secure: "f8f2175dg1FUt4mZCQ87tgwwUrFoxQ5CTcZkRnlCXJqagSMk9VmjR8/XXDE5cW48JPG0qdKQdvBtC81NCq+4MqC20HI9VtOdZWeT6Jej90XOZ742osC3pdIGMF4wrsd7+fs1AZkbzzjgB7FsJ42qW6rMa3vP4mXB4GJEel453Fs3Fw8tnR4PZ2ikOJ9fcmtMensjxh9oNMyAIMkYVGim5bWtpkpI1cddeThDBEKurj1IWEMonQw4lR2yLwZTEP6F/b43Cy4aNy+YkdJzJbM0KMJASLeeu8SxNTE7JCqrYc4irU3AzHzzy/FNVGdiw0F10kbK+yI7cPUqWfeoVjwqBJe8Hr0CXNNCsEYkjXkY9PE2m2x10z2UrTy+O1dNo/8sDoKvZBChuAPPtxp2I7/KujECWjzFvMunHEk3K940ZeSMo90xHKQllmA7umquNcPTXiM2l4nNHtolh5W2HdanvsEFhkY2Y2o9sRIytOa5bM+iS9RCL5GsZwLgGKdjfuqk0GF6KK4AIgi7WKtVM73vM7HQaAVRpyUWZ/h8Vu5IRdkORC20WwHZ/Jg6pUy3pkN1VlcKE5uanaPik/npq/uCGe9YC2bh5IoclmqdJUHrkzFPb+f8wRBvbof0zU1B6UMSdiug5oDk3a0Q8kk2AppfjTs7x8NHi3KYXdUphi9HrWQ="
155157
distributions: "sdist bdist_wheel"
156158
on:
157159
all_branches: true

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
'requests>=2.21.0',
8888
'ndg-httpsclient>=0.5.1',
8989
'idna>=2.8',
90+
'setuptools_scm>=3.1.0',
9091
'tabulate>=0.7.7',
9192
'tqdm>=4.31.1',
9293
'werkzeug>=0.12',
@@ -113,7 +114,6 @@
113114
# See the License for the specific language governing permissions and
114115
# limitations under the License.
115116
\"\"\"Version information for Renku.\"\"\"
116-
import re
117117
118118
__version__ = {version!r}
119119
@@ -126,14 +126,13 @@ def _get_disribution_url():
126126
return home_page[0].split(':', 1)[1].strip()
127127
128128
129-
_components = re.findall(r'(\d\.\d\.\d)(?:.+g(\w+))?', __version__)[0]
130-
_version = _components[1] or 'v' + _components[0]
131-
version_url = '{{}}/tree/{{}}'.format(_get_disribution_url(), _version)
129+
version_url = '{{}}/tree/{{}}'.format(_get_disribution_url(), 'v' + __version__)
132130
"""
133131

134132
setup(
135133
name='renku',
136134
use_scm_version={
135+
'local_scheme': 'dirty-tag',
137136
'write_to': os.path.join('renku', 'version.py'),
138137
'write_to_template': version_template,
139138
},

0 commit comments

Comments
 (0)