Merge pull request #243 from mishaschwartz/v1.9.0

v1.9.0

.dockerfiles/Dockerfile

@@ -0,0 +1,19 @@
+ARG UBUNTU_VERSION
+
+FROM ubuntu:$UBUNTU_VERSION
+
+ARG LOGIN_USER
+
+RUN apt-get update && \
+    apt-get -y install sudo
+
+# Create a directory for the app code (keep the name generic)
+RUN mkdir -p /app
+
+RUN useradd -ms /bin/bash $LOGIN_USER && \
+    usermod -aG sudo $LOGIN_USER && \
+    echo "$LOGIN_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee "/etc/sudoers.d/$LOGIN_USER"
+
+USER $LOGIN_USER
+
+WORKDIR /app

.dockerfiles/docker-config.yml

@@ -0,0 +1,10 @@
+workers:
+  - users:
+      - name: autotst0
+      - name: autotst1
+      - name: autotst2
+      - name: autotst3
+    queues:
+      - student
+      - single
+      - batch

.dockerfiles/entrypoint-dev.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ ! -f /.installed ]; then
+  /app/bin/install.sh -p '3.8' --docker
+  sudo touch /.installed
+fi
+
+exec "$@"

.flake8.ini

@@ -1,3 +1,3 @@
 [flake8]
 max-line-length = 120
-ignore = E266
+ignore = E266

.gitignore

@@ -4,24 +4,28 @@ __pycache__
 .DS_Store
 .hypothesis/
 .pytest_cache/
+*.egg-info
+.eggs
+venv
 
+# bin
+bin/kill_worker_procs
 
 # server
-server/venv
-server/workspace
-server/bin/kill_worker_procs
-markus_config.rb
+src/autotester/server/venv
+src/autotester/server/workspace
+src/autotester/server/bin/kill_worker_procs
 
 # testers
-testers/testers/*/specs/.installed
-testers/testers/*/specs/install_settings.json
+src/autotester/testers/*/specs/.installed
+src/autotester/testers/*/specs/install_settings.json
 
 # java
-testers/testers/java/lib/.gradle
-testers/testers/java/lib/build
+src/autotester/testers/java/lib/.gradle
+src/autotester/testers/java/lib/build
 
 # racket
-testers/testers/racket/**/compiled/
+src/autotester/testers/racket/**/compiled/
 
 # haskell
 markus_cabal

.hound.yml

@@ -1,4 +1,3 @@
 flake8:
   enabled: true
   config_file: .flake8.ini
-

.travis.yml

@@ -4,11 +4,6 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
-# command to install dependencies
-install:
-  - pip install pytest
-  - pip install hypothesis
-  - pip install -r server/bin/requirements.txt
 # command to run tests
 script:
-  - pytest --ignore testers/testers/py/tests
+  - python setup.py test

Changelog.md

@@ -0,0 +1,21 @@
+# CHANGELOG
+All notable changes to this project will be documented here.
+
+## [unreleased]
+
+## [1.9.0]
+- allow tests to write to existing subdirectories but not overwrite existing test script files (#237).
+- add ability to create a docker container for the autotester in development mode (#236).
+- major reorganization of the structure of this package (#236).
+    - additional usage options for the server installation script (bin/install.sh).
+    - testers can/should now be installed using the server installation script instead of individually.
+    - configuration files now use yaml format.
+    - configuration file defaults are now included in the source code so the autotester can be run with or without a
+      user specific configuration file.
+    - changed the default location for the workspace directory.
+
+## [1.8.1]
+_NOTE: This changelog starts from version 1.8.1 (changes prior to this version are not documented)_
+### Added
+- changelog
+- for all changes prior to this version see https://github.com/MarkUsProject/markus-autotesting/pulls?utf8=%E2%9C%93&q=is%3Apr+created%3A%3C2019-12-19+

Layerfile

@@ -8,11 +8,8 @@ CHECKPOINT
 
 RUN python3 -m venv /tmp/venv
 
-RUN /tmp/venv/bin/pip install -U pip
-COPY server/bin/requirements.txt /tmp/
-RUN /tmp/venv/bin/pip install -U pytest hypothesis attrs -r /tmp/requirements.txt
 CHECKPOINT
 
 WORKDIR /app
 COPY . .
-RUN /tmp/venv/bin/pytest --ignore testers/testers/py/tests
+RUN /tmp/venv/bin/python setup.py test

MANIFEST.in

@@ -0,0 +1,3 @@
+include src/autotester/config_defaults/*
+include src/autotester/lib/*
+include src/autotester/testers/*/specs/*