Merge pull request #18 from nyu-devops/sp25-updates

Updates for Sprint 2025 Semester

Author: rofrano

.devcontainer/Dockerfile

@@ -1,9 +1,8 @@
 # Image for a NYU Lab development environment
-FROM rofrano/nyu-devops-base
+FROM rofrano/nyu-devops-base:sp25
 
 # Set up the Python development environment
 WORKDIR /app
-COPY pyproject.toml poetry.lock ./
-RUN sudo python -m pip install --upgrade pip poetry && \
-    sudo poetry config virtualenvs.create false && \
-    sudo poetry install
+COPY Pipfile Pipfile.lock ./
+RUN sudo python -m pip install --upgrade pip pipenv && \
+    sudo pipenv install --system --dev

.devcontainer/devcontainer.json

@@ -9,9 +9,12 @@
 		"vscode": {
 			"settings": {
 				"cSpell.words": [
+					"wsgi",
 					"sqlalchemy",
 					"psycopg",
-					"pytest"
+					"pytest",
+					"onupdate",
+					"testdb"
 				],				
 				"[python]": {
 					"editor.defaultFormatter": "ms-python.black-formatter",
@@ -34,28 +37,29 @@
 			},
 			"extensions": [
 				"ms-python.python",
-				"ms-python.pylint",
 				"ms-python.vscode-pylance",
+				"ms-python.pylint",
 				"ms-python.flake8",
 				"ms-python.black-formatter",
+				"njpwerner.autodocstring",
+				"wholroyd.jinja",
 				"ms-vscode.makefile-tools",
 				"yzhang.markdown-all-in-one",
-				"hnw.vscode-auto-open-markdown-preview",
 				"davidanson.vscode-markdownlint",
+				"bierner.github-markdown-preview",
+				"hnw.vscode-auto-open-markdown-preview",
 				"bierner.markdown-preview-github-styles",
 				"tamasfe.even-better-toml",
 				"donjayamanne.githistory",
 				"GitHub.vscode-pull-request-github",
-				"github.vscode-github-actions",
 				"hbenl.vscode-test-explorer",
 				"LittleFoxTeam.vscode-python-test-adapter",
-				"njpwerner.autodocstring",
-				"wholroyd.jinja",
 				"redhat.vscode-yaml",
+				"unjinjang.rest-api-client",
 				"ms-azuretools.vscode-docker",
-				"rangav.vscode-thunder-client",
-				"bbenoist.vagrant",
-				"streetsidesoftware.code-spell-checker"
+				"github.vscode-github-actions",
+				"streetsidesoftware.code-spell-checker",				
+				"bbenoist.vagrant"
 			]
 		}
 	}

.github/workflows/ci.yml

@@ -40,11 +40,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install dependencies
+      - name: Install Python package dependencies
         run: |
-          python -m pip install poetry
-          poetry config virtualenvs.create false
-          poetry install
+          python -m pip install -U pip pipenv
+          pipenv install --system --dev
 
       - name: Linting
         run: |

.gitignore

@@ -2,6 +2,9 @@
 .DS_Store
 Thumbs.db
 
+# Pytest
+.pytest_cache/
+
 # Nose
 .noseids
 

Makefile

@@ -20,14 +20,12 @@ clean:	## Removes all dangling docker images
 .PHONY: venv
 venv: ## Create a Python virtual environment
 	$(info Creating Python 3 virtual environment...)
-	poetry config virtualenvs.in-project true
-	poetry shell
+	pipenv shell
 
 .PHONY: install
 install: ## Install dependencies
 	$(info Installing dependencies...)
-	sudo poetry config virtualenvs.create false
-	sudo poetry install
+	pipenv install
 
 .PHONY: lint
 lint: ## Run the linter

Pipfile

@@ -0,0 +1,27 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+flask = "==3.1.0"
+flask-sqlalchemy = "==3.1.1"
+psycopg = {extras = ["binary"], version = "==3.2.4"}
+retry2 = "==0.9.5"
+python-dotenv = "==1.0.1"
+gunicorn = "==23.0.0"
+
+[dev-packages]
+honcho = "~=2.0.0"
+pylint = "~=3.3.4"
+flake8 = "~=7.1.1"
+black = "~=25.1.0"
+pytest = "~=8.3.4"
+pytest-pspec = "~=0.0.4"
+pytest-cov = "~=6.0.0"
+factory-boy = "~=3.3.3"
+coverage = "~=7.6.12"
+httpie = "~=3.2.4"
+
+[requires]
+python_version = "3.11"

Pipfile.lock

@@ -46,7 +46,7 @@ The test cases have 95% test coverage and can be run with `pytest`
 
 ## License
 
-Copyright (c) 2016, 2024 [John Rofrano](https://www.linkedin.com/in/JohnRofrano/). All rights reserved.
+Copyright (c) 2016, 2025 [John Rofrano](https://www.linkedin.com/in/JohnRofrano/). All rights reserved.
 
 Licensed under the Apache License. See [LICENSE](LICENSE)