Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/Flask/flask-2.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jbcodeforce authored Jul 28, 2023
2 parents 2295540 + 8fbff1e commit b325acc
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 7 deletions.
4 changes: 2 additions & 2 deletions DockerfileForEnv
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM python:3.9
FROM python:latest
ENV PATH=/root/.local/bin:$PATH

ENV PYTHONPATH=/app

RUN pip install --upgrade pip \
&& pip install pipenv requests pytest numpy pandas flask gunicorn boto3

RUN apt-get update && apt-get install vim
RUN apt-get update

WORKDIR /app
EXPOSE 5000
Expand Down
2 changes: 1 addition & 1 deletion Flask/boilerPlate/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
attrs==20.3.0
click==7.1.2
flasgger==0.9.5
flask==2.2.5
flask==2.3.2
importlib-metadata==3.7.3 ; python_version < '3.8'
itsdangerous==1.1.0
jinja2==2.11.3
Expand Down
2 changes: 1 addition & 1 deletion Flask/flask-tdd-docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ sqlalchemy==1.4.9
toml==0.10.2
typing-extensions==3.7.4.3 ; python_version < '3.8'
wcwidth==0.2.5
werkzeug==1.0.1
werkzeug==2.2.3
wtforms==2.3.3
zipp==3.4.1
2 changes: 1 addition & 1 deletion docs/python/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipenv acts as pip + virtual environment. It uses Pipfile to replace requirement

```python
import sys,getopt
USER="boyerje@us.ibm.com"
USER="jbcodeforce"
FILE="./data/export-questions.json"
try:
opts, args = getopt.getopt(argv,"hi:u:",["inputfile=","user="])
Expand Down
2 changes: 1 addition & 1 deletion matplotlib/MatPlotLib.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'''
import matplotlib.pyplot as plt
import numpy as np
import random



plt.plot([1,2,3,2])
Expand Down
Binary file modified matplotlib/normal_curve.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions python-bible/csvtojson.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import json

def csvtojson(csvstring):
'''
Input string is the form of k:v,k:v,...
'''
keyvaluepairs = csvstring.split(',')
jsonOut = {}
for pair in keyvaluepairs:
key, value = pair.split(':')
jsonOut[key] = value
return jsonOut



if __name__ == "__main__":
testString1 = "a:b,c:d"
testString2 = "a:b,c:d,e:f"
jsonOut1 = csvtojson(testString1)
print(jsonOut1["a"])
jsonOut2 = csvtojson(testString2)
print(jsonOut2)

3 changes: 2 additions & 1 deletion python-bible/readAssetFromFolder.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#
# Read a root folder like code and search for each directory and sub directories, and assess if this is a git hub repo
# Read a root folder like code and search for each directory and sub directories,
# to assess if this is a git hub repo
#

import os,sys
Expand Down

0 comments on commit b325acc

Please sign in to comment.