Skip to content

Commit 21fbb16

Browse files
authored
Merge pull request #2333 from quantopian/new-domains
Add Another Batch of Domains
2 parents b4739f3 + 54c5513 commit 21fbb16

File tree

5 files changed

+31
-6
lines changed

5 files changed

+31
-6
lines changed

conda/trading-calendars/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% set name = "trading-calendars" %}
2-
{% set version = "1.2.0" %}
2+
{% set version = "1.3.1" %}
33
{% set file_ext = "tar.gz" %}
44
{% set hash_type = "sha256" %}
5-
{% set hash_value = "1253507ee48f6e5fabf7687393b92b6df174a9f2994066e6675db19e9e556b4b" %}
5+
{% set hash_value = "95463a259452cd8f2e051b88d3206f734f403278df8ba741f4e3bedb5011749d" %}
66

77
package:
88
name: '{{ name|lower }}'

etc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ empyrical==0.5.0
8282
tables==3.4.3
8383

8484
# For trading calendars
85-
trading-calendars==1.2.0
85+
trading-calendars==1.3.1
8686

8787
# Interface definitions.
8888
python-interface==1.4.0

tests/pipeline/test_domain.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,27 @@
1111
from zipline.pipeline.data.testing import TestingDataSet
1212
from zipline.pipeline.domain import (
1313
AmbiguousDomain,
14-
BUILT_IN_DOMAINS,
14+
AT_EQUITIES,
15+
AU_EQUITIES,
1516
BE_EQUITIES,
17+
BUILT_IN_DOMAINS,
1618
CA_EQUITIES,
1719
CH_EQUITIES,
1820
DE_EQUITIES,
21+
EquityCalendarDomain,
22+
EquitySessionDomain,
23+
ES_EQUITIES,
1924
FR_EQUITIES,
2025
GB_EQUITIES,
2126
GENERIC,
27+
HK_EQUITIES,
2228
infer_domain,
29+
IT_EQUITIES,
2330
JP_EQUITIES,
2431
NL_EQUITIES,
32+
NZ_EQUITIES,
2533
PT_EQUITIES,
2634
US_EQUITIES,
27-
EquityCalendarDomain,
28-
EquitySessionDomain,
2935
)
3036
from zipline.pipeline.factors import CustomFactor
3137
import zipline.testing.fixtures as zf
@@ -324,14 +330,20 @@ def _test_equity_calendar_domain(self,
324330
def test_built_in_equity_calendar_domain_defaults(self):
325331
# test the defaults
326332
expected_cutoff_times = {
333+
AT_EQUITIES: datetime.time(8, 15),
334+
AU_EQUITIES: datetime.time(9, 15),
327335
BE_EQUITIES: datetime.time(8, 15),
328336
CA_EQUITIES: datetime.time(8, 45),
329337
CH_EQUITIES: datetime.time(8, 15),
330338
DE_EQUITIES: datetime.time(8, 15),
339+
ES_EQUITIES: datetime.time(8, 15),
331340
FR_EQUITIES: datetime.time(8, 15),
332341
GB_EQUITIES: datetime.time(7, 15),
342+
HK_EQUITIES: datetime.time(9, 15),
343+
IT_EQUITIES: datetime.time(8, 15),
333344
JP_EQUITIES: datetime.time(8, 15),
334345
NL_EQUITIES: datetime.time(8, 15),
346+
NZ_EQUITIES: datetime.time(9, 15),
335347
PT_EQUITIES: datetime.time(7, 15),
336348
US_EQUITIES: datetime.time(8, 45),
337349
}

zipline/country.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class CountryCode(object):
2828
NORWAY = code('NORWAY')
2929
PORTUGAL = code('PORTUGAL')
3030
SINGAPORE = code('SINGAPORE')
31+
SPAIN = code('SPAIN')
3132
SWEDEN = code('SWEDEN')
3233
SWITZERLAND = code('SWITZERLAND')
3334
UNITED_KINGDOM = code(

zipline/pipeline/domain.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,38 @@ def __repr__(self):
184184
)
185185

186186

187+
AT_EQUITIES = EquityCalendarDomain(CountryCode.AUSTRIA, 'XWBO')
188+
AU_EQUITIES = EquityCalendarDomain(CountryCode.AUSTRALIA, 'XASX')
187189
BE_EQUITIES = EquityCalendarDomain(CountryCode.BELGIUM, 'XBRU')
188190
CA_EQUITIES = EquityCalendarDomain(CountryCode.CANADA, 'XTSE')
189191
CH_EQUITIES = EquityCalendarDomain(CountryCode.SWITZERLAND, 'XSWX')
190192
DE_EQUITIES = EquityCalendarDomain(CountryCode.GERMANY, 'XFRA')
193+
ES_EQUITIES = EquityCalendarDomain(CountryCode.SPAIN, 'XMAD')
191194
FR_EQUITIES = EquityCalendarDomain(CountryCode.FRANCE, 'XPAR')
192195
GB_EQUITIES = EquityCalendarDomain(CountryCode.UNITED_KINGDOM, 'XLON')
196+
HK_EQUITIES = EquityCalendarDomain(CountryCode.HONG_KONG, 'XHKG')
197+
IT_EQUITIES = EquityCalendarDomain(CountryCode.ITALY, 'XMIL')
193198
JP_EQUITIES = EquityCalendarDomain(CountryCode.JAPAN, 'XTKS')
194199
NL_EQUITIES = EquityCalendarDomain(CountryCode.NETHERLANDS, 'XAMS')
200+
NZ_EQUITIES = EquityCalendarDomain(CountryCode.NEW_ZEALAND, 'XNZE')
195201
PT_EQUITIES = EquityCalendarDomain(CountryCode.PORTUGAL, 'XLIS')
196202
US_EQUITIES = EquityCalendarDomain(CountryCode.UNITED_STATES, 'XNYS')
197203

198204
BUILT_IN_DOMAINS = [
205+
AT_EQUITIES,
206+
AU_EQUITIES,
199207
BE_EQUITIES,
200208
CA_EQUITIES,
201209
CH_EQUITIES,
202210
DE_EQUITIES,
211+
ES_EQUITIES,
203212
FR_EQUITIES,
204213
GB_EQUITIES,
214+
HK_EQUITIES,
215+
IT_EQUITIES,
205216
JP_EQUITIES,
206217
NL_EQUITIES,
218+
NZ_EQUITIES,
207219
PT_EQUITIES,
208220
US_EQUITIES,
209221
]

0 commit comments

Comments
 (0)