summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Dockerfile7
-rw-r--r--setup.json18
-rw-r--r--setup.py17
4 files changed, 15 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore
index 9bea433..ad71b0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.DS_Store
+.python-version
diff --git a/Dockerfile b/Dockerfile
index 78c1975..d029f7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
-ARG DOCKER_REGISTRY=docker.io
-FROM ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel
+# ARG DOCKER_REGISTRY=docker.io
+# FROM ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel
+FROM python:3.10
+RUN python3 -m pip install -U pip -v
WORKDIR /ACT4E
+RUN uname -a
COPY requirements.txt .
RUN python3 -m pip install -r requirements.txt
diff --git a/setup.json b/setup.json
deleted file mode 100644
index f6a4dd8..0000000
--- a/setup.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "install_requires": [],
- "tests_require": [],
- "srcdir": "src",
- "package_name": "ACT4E-MySolutions",
- "entry_points": {
- "console_scripts": []
- },
- "zip_safe": true,
- "include_package_data": true,
- "modules": [
- "act4e_solutions"
- ],
- "version": "7.1.2202211124",
- "author": "",
- "author_email": "",
- "url": ""
-} \ No newline at end of file
diff --git a/setup.py b/setup.py
index e64c8cc..e20c8f1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,11 @@
from setuptools import find_packages, setup
-setup(name='ACT4E-MySolutions',
- version="0.1",
- package_dir={'': 'src'},
- packages=find_packages('src'),
- entry_points={
- },
- extras_require={},
- )
+setup(
+name='ACT4E-MySolutions',
+version="0.1",
+package_dir={'': 'src'},
+packages=find_packages('src'),
+entry_points={},
+extras_require={},
+install_requires=['ACT4E-exercises'],
+)