Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
image: mysql:latest
env:
MYSQL_DATABASE: uweb_test
MYSQL_USER: stef
MYSQL_PASSWORD: password
MYSQL_USER: uweb3test
MYSQL_PASSWORD: uweb3test
MYSQL_ALLOW_EMPTY_PASSWORD: yes
ports:
- 3306:3306
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
pip install flake8 requests
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Lint with flake8
run: |
Expand All @@ -47,3 +47,4 @@ jobs:
python3 -m unittest test.test_model
python3 -m unittest test.test_request
python3 -m unittest test.test_templateparser
python3 -m test.uweb3tests.serve & sleep 5 && python3 -m unittest test.test_uweb3tests
Binary file added aquarium.sqlite
Binary file not shown.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def Version():
"""Returns the version of the library as read from the __init__.py file"""
main_lib = os.path.join(os.path.dirname(__file__), "uweb3", "__init__.py")
with open(main_lib) as v_file:
return re.match(".*__version__ = \"(.*?)\"", v_file.read(), re.S).group(1)
return re.match('.*__version__ = "(.*?)"', v_file.read(), re.S).group(1)


setup(
Expand Down
Binary file added sqlite.db
Binary file not shown.
Empty file removed test/sqlite.db
Empty file.
6 changes: 5 additions & 1 deletion test/test_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,11 @@ def testMultipleCommits(self):
def DatabaseConnection():
"""Returns an SQLTalk database connection to 'uWeb3_model_test'."""
return mysql.Connect(
host="localhost", user="stef", passwd="password", db="uweb_test", charset="utf8"
host="localhost",
user="uweb3test",
passwd="uweb3test",
db="uweb_test",
charset="utf8",
)


Expand Down
2 changes: 1 addition & 1 deletion test/test_model_alchemy.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def DatabaseConnection():
"""Returns an SQLTalk database connection to 'uWeb3_model_test'."""
return create_engine(
"mysql://{user}:{passwd}@{host}/{db}".format(
host="localhost", user="stef", passwd="24192419", db="uweb_test"
host="localhost", user="uweb3test", passwd="uweb3test", db="uweb_test"
)
)

Expand Down
Loading