update
This commit is contained in:
commit
cd9ea45b19
|
@ -47,9 +47,18 @@ def market_data(
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
data = market_data(instrument="eurusd",
|
data = market_data(instrument="eurusd",
|
||||||
|
<<<<<<< HEAD
|
||||||
startdate="2020-01-01",
|
startdate="2020-01-01",
|
||||||
enddate="2021-01-01",
|
enddate="2021-01-01",
|
||||||
timeframe="d1",
|
timeframe="d1",
|
||||||
pricetype="bid",
|
pricetype="bid",
|
||||||
volume=True,
|
volume=True,
|
||||||
flat=True)
|
flat=True)
|
||||||
|
=======
|
||||||
|
startdate="2020-01-01",
|
||||||
|
enddate="2021-01-01",
|
||||||
|
timeframe="d1",
|
||||||
|
pricetype="bid",
|
||||||
|
volume=True,
|
||||||
|
flat=True)
|
||||||
|
>>>>>>> master
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -2,7 +2,11 @@ from setuptools import setup, find_packages
|
||||||
import os
|
import os
|
||||||
setup(
|
setup(
|
||||||
name = "CEDApy",
|
name = "CEDApy",
|
||||||
|
<<<<<<< HEAD
|
||||||
version = "1.0.3",
|
version = "1.0.3",
|
||||||
|
=======
|
||||||
|
version = "1.0.3",
|
||||||
|
>>>>>>> master
|
||||||
keywords = "quantitative economic data",
|
keywords = "quantitative economic data",
|
||||||
long_description = open(
|
long_description = open(
|
||||||
os.path.join(
|
os.path.join(
|
||||||
|
|
Loading…
Reference in New Issue