Merge pull request #28 from nyu-devops/su24-updates

Changes for Summer 2024 Semester

Author: rofrano

.devcontainer/Dockerfile

@@ -1,12 +1,11 @@
 # Image for a Python 3 development environment
 FROM python:3.11-slim
 
-# Add any tools that are needed beyond Python 3.9
-RUN apt-get update \
-    && apt-get install -y sudo git make zip tree curl wget jq \
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+# Add any tools that are needed beyond Python 3.11
+RUN apt-get update && \
+    apt-get install -y sudo vim make git zip tree curl wget jq procps net-tools && \
+    apt-get autoremove -y && \
+    apt-get clean -y
 
 # Create a user for development
 ARG USERNAME=devops

.devcontainer/devcontainer.json

@@ -8,14 +8,21 @@
 	"customizations": {
 		"vscode": {
 			"settings": {
+				"cSpell.words": [
+					"sqlalchemy",
+					"psycopg",
+					"pytest",
+					"virtualenvs"
+				],
 				"[python]": {
 					"editor.defaultFormatter": "ms-python.black-formatter",
 					"editor.formatOnSave": true
 				},
+				"git.mergeEditor": true,
 				"markdown-preview-github-styles.colorTheme": "light",
 				"makefile.extensionOutputFolder": "/tmp",
 				"python.testing.unittestEnabled": false,
-				"python.testing.pytestEnabled": true,			
+				"python.testing.pytestEnabled": true,
 				"python.testing.pytestArgs": [
 					"tests"
 				],
@@ -31,29 +38,29 @@
 				"VisualStudioExptTeam.vscodeintellicode",
 				"ms-python.python",
 				"ms-python.vscode-pylance",
+				"ms-python.debugpy",
 				"ms-python.pylint",
 				"ms-python.flake8",
 				"ms-python.black-formatter",
+				"njpwerner.autodocstring",
+				"wholroyd.jinja",
 				"cstrap.flask-snippets",
+				"ms-vscode.makefile-tools",
 				"yzhang.markdown-all-in-one",
 				"bierner.github-markdown-preview",
-				"hnw.vscode-auto-open-markdown-preview",
 				"davidanson.vscode-markdownlint",
+				"hnw.vscode-auto-open-markdown-preview",
 				"bierner.markdown-preview-github-styles",
 				"tamasfe.even-better-toml",
 				"donjayamanne.githistory",
 				"GitHub.vscode-pull-request-github",
 				"hbenl.vscode-test-explorer",
 				"LittleFoxTeam.vscode-python-test-adapter",
-				"njpwerner.autodocstring",
-				"wholroyd.jinja",
 				"redhat.vscode-yaml",
 				"rangav.vscode-thunder-client",
-				"redhat.fabric8-analytics",
-				"streetsidesoftware.code-spell-checker",
 				"ms-azuretools.vscode-docker",
 				"github.vscode-github-actions",
-				"streetsidesoftware.code-spell-checker",				
+				"streetsidesoftware.code-spell-checker",
 				"bbenoist.vagrant"
 			]
 		}

.flaskenv

@@ -1,2 +1,2 @@
 FLASK_RUN_PORT=8080
-FLASK_APP=service:app
+FLASK_APP=wsgi:app

.gitignore

@@ -12,6 +12,9 @@ unittests.xml
 .scannerwork/
 .sonarlint/
 
+# PyTest
+.pytest_cache/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 
 language: python
 python:
-  - '3.7'
+  - '3.11'
 
 services:
   - docker
@@ -15,17 +15,20 @@ before_install:
   - docker ps -a
 
 env:
-  - BINDING_CLOUDANT='{"username": "admin","password": "pass","host": "localhost","port": 5984,"url": "http://admin:pass@localhost:5984"}'
+  - BINDING_CLOUDANT='{"username":"admin","password":"pass","host":"localhost","port":5984,"url":"http://admin:pass@localhost:5984"}'
 
 # command to install dependencies
-install: pip install -r requirements.txt
+install: 
+  - python -m pip install -U pip poetry
+  - poetry config virtualenvs.create false
+  - poetry install
 
 before_script:
   - curl -X GET http://localhost:5984/
   - curl -X PUT http://admin:pass@localhost:5984/test
 
 script:
-  - nosetests
+  - pytest
 
 after_success:
   - codecov