Skip to content

Commit

Permalink
Merge pull request #34 from Augugrumi/33-FunctionNotDefined
Browse files Browse the repository at this point in the history
Function time not defined
  • Loading branch information
mzanella authored Jan 3, 2018
2 parents 1595bff + e8e8548 commit 31301b4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,5 @@ ENV/
# Docker compose variables
bot-variables.env
bot-variables.env.prod
docker-compose.yml
docker-compose.yml.prod
ci_key
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Torre Archimede Bot is distributed via Docker Containers. Here you can find a ta
|[![](https://images.microbadger.com/badges/version/polpetta/torrearchimedebot:v0.1.3.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.1.3 "Get your own version badge on microbadger.com")|[![](https://images.microbadger.com/badges/image/polpetta/torrearchimedebot:v0.1.3.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.1.3 "Get your own image badge on microbadger.com")|
|[![](https://images.microbadger.com/badges/version/polpetta/torrearchimedebot:v0.2.0.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.2.0 "Get your own version badge on microbadger.com")|[![](https://images.microbadger.com/badges/image/polpetta/torrearchimedebot:v0.2.0.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.2.0 "Get your own image badge on microbadger.com")|
|[![](https://images.microbadger.com/badges/version/polpetta/torrearchimedebot:v0.3.0.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.0 "Get your own version badge on microbadger.com")|[![](https://images.microbadger.com/badges/image/polpetta/torrearchimedebot:v0.3.0.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.0 "Get your own image badge on microbadger.com")|
|[![](https://images.microbadger.com/badges/version/polpetta/torrearchimedebot:v0.3.4.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.4 "Get your own version badge on microbadger.com")|[![](https://images.microbadger.com/badges/image/polpetta/torrearchimedebot:v0.3.4.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.4 "Get your own image badge on microbadger.com")|
|[![](https://images.microbadger.com/badges/version/polpetta/torrearchimedebot:v0.3.5.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.5 "Get your own version badge on microbadger.com")|[![](https://images.microbadger.com/badges/image/polpetta/torrearchimedebot:v0.3.5.svg)](https://microbadger.com/images/polpetta/torrearchimedebot:v0.3.5 "Get your own image badge on microbadger.com")|

## Doc

Expand Down
6 changes: 6 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: '3'
services:
bot:
build: .
env_file:
- bot-variables.env
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

setup(
name='torrearchimedebot',
version='0.3.4',
version='0.3.5',
description='A useful bot for Torre Archimede schedule',
license="GPL3",
long_description=long_description,
Expand Down
2 changes: 1 addition & 1 deletion torrearchimedebot/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"""

__author__ = "Augugrumi Team"
__version__ = "0.3.4"
__version__ = "0.3.5"
__license__ = "GPL3"


Expand Down
2 changes: 1 addition & 1 deletion torrearchimedebot/bot/handlers/info_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(self):
self.github = "https://github.com/Augugrumi/TorreArchimedeBot"
self.url_donation = "http://paypal.me/DavidePolonio"
self.author = "Augugrumi Team"
self.version = "0.3.4"
self.version = "0.3.5"

def handleMessage(self):

Expand Down
6 changes: 4 additions & 2 deletions torrearchimedebot/bot/handlers/parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
import requests
import json
import html
from lxml import html as htmllxml
from .utility import *
import logging
import threading
import pytz

from lxml import html as htmllxml
from .utility import *
from datetime import time


class Results:
def __init__(self, time='', activity='', professor='', activityType=''):
Expand Down

0 comments on commit 31301b4

Please sign in to comment.