diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 13e97cfc..364066ee 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,2 +1,2 @@ FROM python -WORKDIR ~/ \ No newline at end of file +WORKDIR ~/ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c5276a59..8084ac04 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -19,4 +19,5 @@ "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint", "python.testing.pytestPath": "/usr/local/py-utils/bin/pytest" }, + "postCreateCommand": "pip install -r analysis-master/analysis-amd64/requirements.txt" } \ No newline at end of file diff --git a/analysis-master/analysis-amd64/build.sh b/analysis-master/analysis-amd64/build.sh old mode 100644 new mode 100755 diff --git a/analysis-master/analysis-amd64/dist/analysis-1.0.0.9-py3-none-any.whl b/analysis-master/analysis-amd64/dist/analysis-1.0.0.9-py3-none-any.whl index 7c150b66..24f78782 100644 Binary files a/analysis-master/analysis-amd64/dist/analysis-1.0.0.9-py3-none-any.whl and b/analysis-master/analysis-amd64/dist/analysis-1.0.0.9-py3-none-any.whl differ diff --git a/analysis-master/analysis-amd64/dist/analysis-1.0.0.9.tar.gz b/analysis-master/analysis-amd64/dist/analysis-1.0.0.9.tar.gz index 45b57eab..542898be 100644 Binary files a/analysis-master/analysis-amd64/dist/analysis-1.0.0.9.tar.gz and b/analysis-master/analysis-amd64/dist/analysis-1.0.0.9.tar.gz differ diff --git a/analysis-master/analysis-amd64/docker/Dockerfile b/analysis-master/analysis-amd64/docker/Dockerfile index b00c4b65..aaa49e55 100644 --- a/analysis-master/analysis-amd64/docker/Dockerfile +++ b/analysis-master/analysis-amd64/docker/Dockerfile @@ -1,4 +1,5 @@ FROM python WORKDIR ~/ COPY ./ ./ +RUN pip install -r requirements.txt CMD ["bash"] \ No newline at end of file diff --git a/analysis-master/analysis-amd64/requirements.txt b/analysis-master/analysis-amd64/requirements.txt new file mode 100644 index 00000000..1ecfd056 --- /dev/null +++ b/analysis-master/analysis-amd64/requirements.txt @@ -0,0 +1,6 @@ +numba +numpy +scipy +scikit-learn +six +matplotlib \ No newline at end of file diff --git a/analysis-master/analysis-amd64/setup.py b/analysis-master/analysis-amd64/setup.py index 0fa8c9d8..eb497dfc 100644 --- a/analysis-master/analysis-amd64/setup.py +++ b/analysis-master/analysis-amd64/setup.py @@ -1,5 +1,11 @@ import setuptools +requirements = [] + +with open("requirements.txt", 'r') as file: + for line in file: + requirements.append(line) + setuptools.setup( name="analysis", version="1.0.0.009", @@ -10,14 +16,7 @@ setuptools.setup( long_description_content_type="text/markdown", url="https://github.com/titanscout2022/tr2022-strategy", packages=setuptools.find_packages(), - install_requires=[ - "numba", - "numpy", - "scipy", - "scikit-learn", - "six", - "matplotlib" - ], + install_requires=requirements, license = "GNU General Public License v3.0", classifiers=[ "Programming Language :: Python :: 3", diff --git a/analysis-master/analysis-arm64/docker/Dockerfile b/analysis-master/analysis-arm64/docker/Dockerfile new file mode 100644 index 00000000..e69de29b diff --git a/analysis-master/analysis-arm64/docker/start-docker.sh b/analysis-master/analysis-arm64/docker/start-docker.sh new file mode 100755 index 00000000..baf16097 --- /dev/null +++ b/analysis-master/analysis-arm64/docker/start-docker.sh @@ -0,0 +1,3 @@ +cd .. +docker build -t tra-analysis-amd64-dev -f docker/Dockerfile . +docker run -it tra-analysis-amd64-dev \ No newline at end of file