Remove Git from DockerFile

.github/workflows/dockerhub-main-push.yml

@@ -23,5 +23,4 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: oislen/randomtelecompayments:latest
-          build-args: GIT_BRANCH=main
+          tags: oislen/randomtelecompayments:latest

Dockerfile

@@ -4,23 +4,19 @@ FROM ubuntu:latest
 # set environment variables
 ENV user=ubuntu
 ENV DEBIAN_FRONTEND=noninteractive
-# set git branch for cloning
-ARG GIT_BRANCH
-ENV GIT_BRANCH=${GIT_BRANCH}
 # set python version
 ARG PYTHON_VERSION="3.12"
 ENV PYTHON_VERSION=${PYTHON_VERSION}
 
 # install required software and programmes for development environment
 RUN apt-get update 
-RUN apt-get install -y apt-utils vim curl wget unzip git tree htop
+RUN apt-get install -y apt-utils vim curl wget unzip tree htop
 
 # set up home environment
 RUN mkdir -p /home/${user} && chown -R ${user}: /home/${user}
 
-# clone git repo
-RUN git clone https://github.com/oislen/RandomTelecomPayments.git --branch ${GIT_BRANCH} /home/ubuntu/RandomTelecomPayments
-#COPY . /home/ubuntu/RandomTelecomPayments
+# copy repo
+COPY . /home/ubuntu/RandomTelecomPayments
 
 # add deadsnakes ppa
 RUN apt-get install -y software-properties-common

exeDocker.cmd

@@ -4,13 +4,12 @@ SET DOCKER_REPO=randomtelecompayments
 SET DOCKER_TAG=latest
 SET DOCKER_IMAGE=%DOCKER_USER%/%DOCKER_REPO%:%DOCKER_TAG%
 SET DOCKER_CONTAINER_NAME=rtp
-SET GIT_BRANCH=v0.1.0
 
 :: remove existing docker containers and images
 docker image rm -f %DOCKER_IMAGE%
 
 :: build docker image
-call docker build --no-cache -t %DOCKER_IMAGE% . --build-arg GIT_BRANCH=%GIT_BRANCH%
+call docker build --no-cache -t %DOCKER_IMAGE% .
 
 :: run docker container
 SET UBUNTU_DIR=/home/ubuntu

generator/cons.py

@@ -24,8 +24,8 @@
 fpath_llama_firstnames = os.path.join(subdir_data, 'ref', 'llama_firstnames.csv')
 fpath_llama_lastnames = os.path.join(subdir_data, 'ref', 'llama_lastnames.csv')
 fpath_smartphones = os.path.join(subdir_data, 'ref', 'smartphones.csv')
-fpath_unittest_user_data = os.path.join(subdir_unittest, 'user_data.pickle')
-fpath_unittest_transaction_data = os.path.join(subdir_unittest, 'transaction_data.pickle')
+fpath_unittest_user_data = os.path.join(subdir_unittest, 'user_data.parquet')
+fpath_unittest_transaction_data = os.path.join(subdir_unittest, 'transaction_data.parquet')
 fpath_aws_session_token = os.path.join(subdir_creds,'sessionToken.json')
 
 # set url links to files available online

generator/exeGenNames.cmd

@@ -0,0 +1 @@
+call python -m pdb utilities\gen_user_names_file.py

generator/exeMain.cmd

@@ -0,0 +1,2 @@
+call python -m pdb main.py --n_users 100 --use_random_seed 1 --n_itr 1
+:: call python -m pdb main.py --n_users 13000 --use_random_seed 1 --n_itr 2

generator/exeMain.sh

@@ -0,0 +1,2 @@
+python3 -m pdb main.py --n_users 100 --use_random_seed 1 --n_itr 1
+# python3 -m pdb main.py --n_users 13000 --use_random_seed 1 --n_itr 2

exeUnittests.cmd → generator/exeUnittests.cmd

@@ -1,3 +1,5 @@
+call cd ..
 call python -m unittest discover generator\unittests\utilities
 call python -m unittest discover generator\unittests\objects
-call python -m unittest discover generator\unittests\app
+call python -m unittest discover generator\unittests\app
+call cd generator

generator/exeUnittests.sh

@@ -0,0 +1,5 @@
+cd ..
+python3 -m unittest discover unittests/utilities
+python3 -m unittest discover unittests/objects
+python3 -m unittest discover unittests/app
+cd generator

generator/unittests/app/test_gen_user_trans_data.py

@@ -88,12 +88,12 @@
 # if writing observed data to unittest data directory
 if cons.unittest_gen_test_dfs:
     print(f"WARNING: cons.unittest_gen_test_dfs == {cons.unittest_gen_test_dfs}")
-    obs_user_data.to_pickle(fpath_unittest_user_data)
-    obs_trans_data.to_pickle(fpath_unittest_transaction_data)
+    obs_user_data.to_parquet(fpath_unittest_user_data)
+    obs_trans_data.to_parquet(fpath_unittest_transaction_data)
 
 # load in expected user level data
-exp_user_data = pd.read_pickle(fpath_unittest_user_data)
-exp_trans_data = pd.read_pickle(fpath_unittest_transaction_data)
+exp_user_data = pd.read_parquet(fpath_unittest_user_data)
+exp_trans_data = pd.read_parquet(fpath_unittest_transaction_data)
 
 class Test_gen_user_trans_data(unittest.TestCase):
     """"""