Change CI setup

3 files changed, 23 insertions, 54 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53df33f9..f5253583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,11 @@
-image: python:latest
+image: "python:3.8"
 
-#variables:
-#  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-#
-#cache:
-#  paths:
-#    - .cache/pip
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+
+cache:
+  paths:
+    - .cache/pip
 
 stages:
   - build
@@ -16,7 +16,7 @@ build:
   stage: build
   script:
     - python --version
-    - python setup.py install
+    - pip install -r requirements.txt
 
 static-analysis:
   stage: static-analysis
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..b84c1b64
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,15 @@
+flask==1.0.2
+flask-socketio==3.0.2
+oauth2client==4.1.3
+eventlet==0.24.1
+flask-compress==1.4.0
+flask-cors==3.0.8
+pyasn1-modules==0.2.2
+six==1.15.0
+pymongo==3.10.1
+bson==0.5.10
+yapf==0.30.0
+pytest==5.4.3
+pytest-mock==3.1.1
+pytest-env==0.6.2
+pylint==2.5.3
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 3bc7c808..00000000
--- a/setup.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from codecs import open
-from os import path
-
-from setuptools import setup
-
-# Get the long description from the README file
-here = path.abspath(path.dirname(__file__))
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name='opendc-web-server',
-    version='0.2.0',
-    description='Python web server for the OpenDC project',
-    long_description=long_description,
-    url='http://opendc.org',
-    author='The OpenDC team',
-    author_email='opendc@atlarge-research.com',
-    license='MIT',
-    classifiers=[
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
-    ],
-    keywords='opendc datacenter simulation web-server',
-    packages=['opendc'],
-    # yapf: disable
-    install_requires=[
-        'flask==1.0.2',
-        'flask-socketio==3.0.2',
-        'oauth2client==4.1.3',
-        'eventlet==0.24.1',
-        'flask-compress==1.4.0',
-        'flask-cors==3.0.8',
-        'pyasn1-modules==0.2.2',
-        'six==1.15.0',
-        'pymongo==3.10.1',
-        'bson==0.5.10',
-        'yapf==0.30.0',
-        'pytest==5.4.3',
-        'pytest-mock==3.1.1',
-        'pytest-env==0.6.2',
-        'pylint==2.5.3',
-    ],
-    # yapf: enable
-)