Skip to content

Commit

Permalink
common fix
Browse files Browse the repository at this point in the history
  • Loading branch information
InsonusK committed Dec 18, 2022
1 parent e11268d commit 3c92fd0
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/
# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
COPY requirements.txt /tmp/pip-tmp/
COPY requirements_dev.txt /tmp/pip-tmp/
RUN pip3 --no-cache-dir install -U -r /tmp/pip-tmp/requirements.txt
RUN pip3 --no-cache-dir install -U -r /tmp/pip-tmp/requirements_dev.txt \
RUN pip3 install -U -r /tmp/pip-tmp/requirements.txt
RUN pip3 install -U -r /tmp/pip-tmp/requirements_dev.txt \
&& rm -rf /tmp/pip-tmp

# [Optional] Uncomment this section to install additional OS packages.
Expand All @@ -21,4 +21,4 @@ RUN pip3 --no-cache-dir install -U -r /tmp/pip-tmp/requirements_dev.txt \
# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

RUN jupyter nbextension enable --py widgetsnbextension
#RUN jupyter nbextension enable --py widgetsnbextension
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# StopLossMetric
# Common
Базовые классы для проекта NNTrade

## Import
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
in pkg_resources.parse_requirements(requirements_txt)
]

lib = "NNTrade.commons"
lib = "NNTrade.common"

libs = [f"{lib}.{pkg}" for pkg in setuptools.find_packages(where="src")]
libs.append(lib)

setuptools.setup(
name=lib,
version=VERSION,
description="Commons classes",
author_email="",
url="",
keywords=["commons"],
description="Common classes",
author_email="[email protected]",
url="https://github.com/NNTrade/common",
keywords=["common"],
install_requires=install_requires,
packages=libs,
package_dir={lib: 'src'},
include_package_data=True,
long_description="""\
Commons classes for NNTrade
Common classes for NNTrade
"""
)
1 change: 1 addition & 0 deletions src/candle_col_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
CLOSE = "close"
OPEN = "open"
VOLUME = "volume"
INDEX = "start_date_time"

2 changes: 0 additions & 2 deletions src/data_pack.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
from __future__ import annotations
from argparse import ArgumentError
from tkinter import Y
from turtle import st
from typing import List
import pandas as pd

Expand Down
5 changes: 4 additions & 1 deletion test/candle_col_name_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@ def test_def_values(self):
self.assertEqual('open',ccn.OPEN)
self.assertEqual('close',ccn.CLOSE)
self.assertEqual('volume',ccn.VOLUME)
self.assertEqual("start_date_time", ccn.INDEX)

def test_rename_values(self):
ccn.LOW = "low1"
ccn.HIGH = "high1"
ccn.OPEN = "open1"
ccn.CLOSE = "close1"
ccn.VOLUME = "volume1"
ccn.INDEX = "start_date_time1"
self.assertEqual('low1',ccn.LOW)
self.assertEqual('high1',ccn.HIGH)
self.assertEqual('open1',ccn.OPEN)
self.assertEqual('close1',ccn.CLOSE)
self.assertEqual('volume1',ccn.VOLUME)
self.assertEqual('volume1',ccn.VOLUME)
self.assertEqual("start_date_time1", ccn.INDEX)

0 comments on commit 3c92fd0

Please sign in to comment.