Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MRG] Remove cfp start date #77

Merged
merged 2 commits into from
Nov 7, 2019
Merged

[MRG] Remove cfp start date #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03646d9
Remove cfp start date
vinayak-mehta Nov 6, 2019
075bf1d
Add by field
vinayak-mehta Nov 7, 2019
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
2 changes: 1 addition & 1 deletion conrad/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ def rebuild_events_table():
state=event["state"],
country=event["country"],
cfp_open=event["cfp_open"],
cfp_start_date=dt.datetime.strptime(event["cfp_start_date"], "%Y-%m-%d"),
cfp_end_date=dt.datetime.strptime(event["cfp_end_date"], "%Y-%m-%d"),
start_date=dt.datetime.strptime(event["start_date"], "%Y-%m-%d"),
end_date=dt.datetime.strptime(event["end_date"], "%Y-%m-%d"),
source=event["source"],
tags=event["tags"],
kind=event["kind"],
by=event["by"],
)
session.add(e)
session.commit()
Expand Down
1 change: 0 additions & 1 deletion conrad/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class Event(Base):
state = Column(String(STR_LEN))
country = Column(String(STR_LEN))
cfp_open = Column(Boolean, default=False)
cfp_start_date = Column(DateTime)
cfp_end_date = Column(DateTime)
start_date = Column(DateTime)
end_date = Column(DateTime)
Expand Down
2 changes: 1 addition & 1 deletion conrad/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ def validate(input_events):
"state",
"country",
"cfp_open",
"cfp_start_date",
"cfp_end_date",
"start_date",
"end_date",
"source",
"tags",
"kind",
"by",
]

# check for duplicates
Expand Down
1 change: 0 additions & 1 deletion crawlers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"state": {"type": "string", "required": True, "nullable": True},
"country": {"type": "string", "minlength": 1, "required": True},
"cfp_open": {"type": "boolean", "required": True},
"cfp_start_date": {"is_date": True, "type": "string", "required": True},
"cfp_end_date": {"is_date": True, "type": "string", "required": True},
"start_date": {"is_date": True, "type": "string", "required": True},
"end_date": {"is_date": True, "type": "string", "required": True},
Expand Down
1 change: 0 additions & 1 deletion crawlers/papercall/papercall_crawler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ def parse_page(root):
"state": None,
"country": country,
"cfp_open": cfp_open,
"cfp_start_date": "1970-01-01",
"cfp_end_date": cfp_close.strftime("%Y-%m-%d")
if cfp_close is not None
else "1970-01-01",
Expand Down
1 change: 0 additions & 1 deletion crawlers/pycon/pycon_crawler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def get_events(self):
"state": state,
"country": country,
"cfp_open": cfp_open,
"cfp_start_date": "1970-01-01",
"cfp_end_date": cfp_end_date,
"start_date": event["Start Date"],
"end_date": event["End Date"],
Expand Down
2 changes: 0 additions & 2 deletions crawlers/pydata/pydata_crawler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def __init__(self, name, country, city, start_date, end_date, url):
self.country = country
self.cfp_open = False
self.cfp_end_date = "1970-01-01"
self.cfp_start_date = "1970-01-01"
self.start_date = start_date
self.end_date = end_date
self.source = PyDataCrawler.URL
Expand All @@ -34,7 +33,6 @@ def to_json(self):
"state": self.state,
"country": self.country,
"cfp_open": self.cfp_open,
"cfp_start_date": self.cfp_start_date,
"cfp_end_date": self.cfp_end_date,
"start_date": self.start_date.strftime(PyDataCrawler.DATE_FORMAT),
"end_date": self.end_date.strftime(PyDataCrawler.DATE_FORMAT),
Expand Down
36 changes: 18 additions & 18 deletions data/events.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Bordeaux",
"country": "France",
"end_date": "2019-11-04",
Expand All @@ -15,9 +15,9 @@
"url": "https://www.pycon.fr/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Stockholm",
"country": "Sweden",
"end_date": "2019-11-02",
Expand All @@ -30,9 +30,9 @@
"url": "http://www.pycon.se/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Saint Petersburg",
"country": "Russia",
"end_date": "2019-11-02",
Expand All @@ -45,9 +45,9 @@
"url": "https://piterpy.com/en"
},
{
"by": "human",
"cfp_end_date": "2019-10-02",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Portland",
"country": "USA",
"end_date": "2020-02-10",
Expand All @@ -60,9 +60,9 @@
"url": "https://2020.pycascades.com"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Austin",
"country": "USA",
"end_date": "2020-07-13",
Expand All @@ -75,9 +75,9 @@
"url": "https://www.scipy2020.scipy.org/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "TBA",
"country": "TBA",
"end_date": "2020-07-27",
Expand All @@ -90,9 +90,9 @@
"url": "https://www.europython.eu/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Bilbao",
"country": "Spain",
"end_date": "2020-08-01",
Expand All @@ -105,9 +105,9 @@
"url": "https://www.euroscipy.org/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Austin",
"country": "USA",
"end_date": "2021-07-19",
Expand All @@ -120,9 +120,9 @@
"url": "https://www.scipy2021.scipy.org/"
},
{
"by": "human",
"cfp_end_date": "2019-12-20",
"cfp_open": true,
"cfp_start_date": "2019-09-12",
"city": "Pittsburgh",
"country": "USA",
"end_date": "2020-04-23",
Expand All @@ -135,9 +135,9 @@
"url": "https://us.pycon.org"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Berlin",
"country": "Germany",
"end_date": "2020-10-16",
Expand All @@ -150,9 +150,9 @@
"url": "https://de.pycon.org/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Bilbao",
"country": "Spain",
"end_date": "2020-07-31",
Expand All @@ -165,9 +165,9 @@
"url": "http://2020.geopython.net"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Columbus",
"country": "USA",
"end_date": "2020-07-26",
Expand All @@ -180,9 +180,9 @@
"url": "https://www.pyohio.org/2020/"
},
{
"by": "human",
"cfp_end_date": "2019-09-02",
"cfp_open": false,
"cfp_start_date": "2019-10-13",
"city": "Nashville",
"country": "USA",
"end_date": "2020-03-08",
Expand All @@ -195,9 +195,9 @@
"url": "https://2020.pytennessee.org/"
},
{
"by": "human",
"cfp_end_date": "2019-11-07",
"cfp_open": true,
"cfp_start_date": "2019-10-01",
"city": "Hyderabad",
"country": "India",
"end_date": "2019-12-08",
Expand All @@ -210,9 +210,9 @@
"url": "https://pyconf.hydpy.org/2019/"
},
{
"by": "human",
"cfp_end_date": "2019-10-31",
"cfp_open": true,
"cfp_start_date": "2019-10-01",
"city": "Surabaya",
"country": "Indonesia",
"end_date": "2019-11-25",
Expand All @@ -225,9 +225,9 @@
"url": "https://pycon.id/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Toronto",
"country": "Canada",
"end_date": "2019-11-19",
Expand All @@ -240,9 +240,9 @@
"url": "https://2019.pycon.ca/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Buenos Aires",
"country": "Argentina",
"end_date": "2019-12-06",
Expand All @@ -255,9 +255,9 @@
"url": "https://eventos.python.org.ar/events/pyconar2019/"
},
{
"by": "human",
"cfp_end_date": "2019-10-01",
"cfp_open": false,
"cfp_start_date": "2019-10-01",
"city": "Austin",
"country": "USA",
"end_date": "2020-05-17",
Expand Down
1 change: 0 additions & 1 deletion docs/dev/adding-events.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ You can also add new events to ``conrad`` without writing a crawler for them. To
"state": "Pennsylvania",
"country": "USA",
"cfp_open": true,
"cfp_start_date": "2019-09-12",
"cfp_end_date": "2019-12-20",
"start_date": "2020-04-15",
"end_date": "2020-04-23",
Expand Down