diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 7 | ||||
| -rw-r--r-- | MANIFEST.in | 4 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | setup.json | 18 | ||||
| -rw-r--r-- | setup.py | 17 |
6 files changed, 20 insertions, 40 deletions
@@ -1,2 +1,3 @@ .DS_Store +.python-version @@ -1,8 +1,11 @@ -ARG DOCKER_REGISTRY -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/MANIFEST.in b/MANIFEST.in index dc1dc93..4e280e6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,10 +12,6 @@ exclude LICENSE* prune .* exclude .* exclude src/conf.py -recursive-exclude src *.rst -recursive-exclude src *.less -recursive-include src *.css -recursive-include src *.sql prune src/**/__pycache__ prune src/*_tests* prune out @@ -1,20 +1,17 @@ all: -DOCKER_REGISTRY ?= reg-z7-prod.zuper.ai - tag=mytag -pull: - docker pull ${DOCKER_REGISTRY}/act4e/act4e-tests:alphubel - -build: pull +build: docker build --build-arg DOCKER_REGISTRY=${DOCKER_REGISTRY} -t $(tag) . check: build - docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions + docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \ + act4e-test --collections act4e_checks --module act4e_solutions check-%: build - docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) act4e-tests --module act4e_solutions --group $* + docker run -it --rm -v $(PWD)/out-results:/ACT4E/out-results $(tag) \ + act4e-test --collections act4e_checks --module act4e_solutions --group $* diff --git a/setup.json b/setup.json deleted file mode 100644 index ad72186..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": "0.1", - "author": "", - "author_email": "", - "url": "" -}
\ No newline at end of file @@ -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'], +) |