You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2021/01/04 15:41:32 UTC
[allura] branch master updated (050d8e5 -> 72dcc7b)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git.
from 050d8e5 Youtube oembed needs to go on https now; handle any HTTP error more specifically; 404s encounter OEmbedError mime-type error first
new 0cb2f23 A bit more logging before phone validation
new 7c1a679 travis: fix pip cmd; enable py3 testing
new 72dcc7b remove old Makefile
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 28 ++++++++++++++++++++--------
Allura/allura/lib/plugin.py | 1 +
Allura/allura/tests/test_plugin.py | 1 +
Makefile | 36 ------------------------------------
4 files changed, 22 insertions(+), 44 deletions(-)
delete mode 100644 Makefile
[allura] 02/03: travis: fix pip cmd; enable py3 testing
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 7c1a679d4b310ba93871ad1404da7e01120f6d00
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Sat Jan 2 12:52:50 2021 -0500
travis: fix pip cmd; enable py3 testing
---
.travis.yml | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c335487..529efcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,12 +16,24 @@
# under the License.
language: python
-python:
- - "2.7"
-before_install:
- - sudo apt-get install -qq python-svn libjpeg8-dev zlib1g-dev
-install: "pip install -r requirements.txt --use-mirrors"
-before_script:
- - ln -s /usr/lib/python2.7/dist-packages/pysvn $VIRTUAL_ENV/lib/python2.7/site-packages/
+jobs:
+ include:
+ - python: "2.7"
+ dist: bionic # Ubuntu 18.04
+ before_install:
+ - sudo apt-get install -qq python-svn
+ virtualenv: # only works on stock python
+ system_site_packages: true
+ - python: "3.7"
+ dist: focal # Ubuntu 20.04
+ before_install:
+ - sudo apt-get install -qq python3-cxx-dev libsvn-dev # for building pysvn
+ before_script:
+ - pip install https://sourceforge.net/projects/pysvn/files/pysvn/V1.9.12/pysvn-1.9.12.tar.gz
+install:
+ - sudo apt-get install -qq libjpeg8-dev zlib1g-dev
+ - pip install -r requirements.txt
+ - npm install
+script:
- ./rebuild-all.bash
-script: ./run_tests
+ - ./run_tests
[allura] 01/03: A bit more logging before phone validation
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 0cb2f23651e3929adccbeb40b3440a714cdddc26
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Dec 30 17:40:32 2020 -0500
A bit more logging before phone validation
---
Allura/allura/lib/plugin.py | 1 +
Allura/allura/tests/test_plugin.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 8cae469..86806ee 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -910,6 +910,7 @@ class ProjectRegistrationProvider(object):
if not allow_reuse and M.User.query.find({'tool_data.phone_verification.number_hash': number_hash}).count():
return {'status': 'error',
'error': 'That phone number has already been used.'}
+ log.info('PhoneService going to send a verification for: %s', user.username)
return g.phone_service.verify(number)
def check_phone_verification(self, user, request_id, pin, number_hash):
diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py
index 04cd893..f7d8960 100644
--- a/Allura/allura/tests/test_plugin.py
+++ b/Allura/allura/tests/test_plugin.py
@@ -144,6 +144,7 @@ class UserMock(object):
def __init__(self):
self.tool_data = {}
self._projects = []
+ self.username = 'usermock'
def get_tool_data(self, tool, key):
return self.tool_data.get(tool, {}).get(key, None)
[allura] 03/03: remove old Makefile
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 72dcc7b88fbf375818b7a75145514f033cecfe1c
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Sat Jan 2 12:52:56 2021 -0500
remove old Makefile
---
Makefile | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8b2517d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Targets for buildbot
-test:
- # Supposed to run on buildbot. If you want to run tests locally use ./run_tests script
- # setup pysvn
- -[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
- -[ ! -d $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info ] && mkdir $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn-1.7.5-py2.7.egg-info
- # rebuild apps
- ./rebuild-all.bash
- # setup eslint
- npm install
- ./run_tests -n 2 -m 4
-
-
-# Helpers for local development
-run:
- paster serve --reload Allura/development.ini
-
-taskd:
- cd Allura && paster taskd development.ini