Skip to content

Commit

Permalink
backed out model changes and upgraded python version
Browse files Browse the repository at this point in the history
  • Loading branch information
xavanx committed Dec 22, 2022
1 parent 643f5a1 commit 8a91f56
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 59 deletions.
10 changes: 5 additions & 5 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ USER 0
RUN set -eux; \
yum update -y; \
yum install -y \
wget gcc zlib-devel openssl-devel libffi-devel \
wget gcc zlib-devel openssl-devel libffi-devel libpq-devel \
; \
# add perms
chown -R 1001:0 ${APP_HOME}; \
Expand All @@ -25,13 +25,13 @@ RUN set -eux; \
chmod +x /sbin/tini \
; \

wget https://www.python.org/ftp/python/3.10.6/Python-3.10.6.tgz; \
tar xzf Python-3.10.6.tgz; \
cd Python-3.10.6; \
wget https://www.python.org/ftp/python/3.11.1/Python-3.11.1.tgz; \
tar xzf Python-3.11.1.tgz; \
cd Python-3.11.1; \
./configure --enable-optimizations; \
make install ; \
cd ../; \
rm Python-3.10.6.tgz ; \
rm Python-3.11.1.tgz ; \

/usr/local/bin/python3 -m venv ${APP_HOME}; \
chmod +x ${APP_HOME}/bin/activate ; \
Expand Down
71 changes: 35 additions & 36 deletions api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
asgiref==3.5.0; python_version >= "3.7"
asgiref==3.6.0; python_version >= "3.7"
cachetools==5.0.0; python_version ~= "3.7"
certifi==2021.10.8
cffi==1.15.0
charset-normalizer==2.0.12; python_version >= "3"
cryptography==36.0.1
cryptography==38.0.4
defusedxml==0.7.1; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
django==4.0.2
django-allauth==0.48.0
django-debug-toolbar==3.2.4
django-environ==0.8.1
django-extensions==3.1.5
django-health-check==3.16.5
django-sendgrid-v5==1.2.0
django-simple-history==3.0.0
django==4.1.4
django-allauth==0.51.0
django-debug-toolbar==3.8.1
django-environ==0.9.0
django-extensions==3.2.1
django-health-check==3.17.0
django-sendgrid-v5==1.2.1
django-simple-history==3.2.0
django-widget-tweaks==1.4.12
google-api-core[grpc]==2.5.0; python_version >= "3.6"
google-auth==2.6.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
google-cloud-secret-manager==2.8.0
googleapis-common-protos==1.54.0; python_version >= "3.6"
grpc-google-iam-v1==0.12.3
grpcio==1.44.0
grpcio-status==1.44.0
idna==3.3; python_version >= "3"
libcst==0.4.1; python_version >= "3.6"
google-api-core[grpc]==2.11.0; python_version >= "3.7"
google-auth==2.15.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
google-cloud-secret-manager==2.13.0
googleapis-common-protos==1.57.0; python_version >= "3.6"
grpc-google-iam-v1==0.12.4
grpcio==1.51.0
grpcio-status==1.51.0
idna==3.4; python_version >= "3"
libcst==0.4.9; python_version >= "3.6"
mypy-extensions==0.4.3
oauthlib==3.2.0; python_version >= "3.6"
proto-plus==1.20.3; python_version >= "3.6"
protobuf==3.19.4; python_version >= "3.5"
psycopg2-binary==2.9.3
oauthlib==3.2.2; python_version >= "3.6"
proto-plus==1.22.1; python_version >= "3.6"
protobuf==4.21.12; python_version >= "3.5"
psycopg2-binary==2.9.5
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.21
pyjwt[crypto]==2.3.0; python_version >= "3.6"
python-dotenv==0.19.2
python-http-client==3.3.6; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
pyjwt[crypto]==2.6.0; python_version >= "3.6"
python-dotenv==0.21.0
python-http-client==3.3.7; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
python3-openid==3.2.0
pyyaml==6.0; python_version >= "3.6"
requests==2.27.1; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
requests==2.28.1; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4, 3.5"
requests-oauthlib==1.3.1; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
rsa==4.8; python_version >= "3.6"
sendgrid==6.9.6; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
rsa==4.9; python_version >= "3.6"
sendgrid==6.9.7; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4"
six==1.16.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
sqlparse==0.4.2; python_version >= "3.5"
starkbank-ecdsa==2.0.3
typing-extensions==4.1.1; python_version >= "3.6"
typing-inspect==0.7.1
urllib3==1.26.8; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4" and python_version < "4"
whitenoise==6.0.0
sqlparse==0.4.3; python_version >= "3.5"
starkbank-ecdsa==2.2.0
typing-extensions==4.4.0; python_version >= "3.6"
typing-inspect==0.8.0
urllib3==1.26.13; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3, 3.4" and python_version < "4"
whitenoise==6.2.0
18 changes: 0 additions & 18 deletions api/tracker/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,24 +201,6 @@ class Ticket(models.Model):
)
data_accepted_by = models.EmailField(verbose_name="Data accepted by", default="")

# Bucket Names
data_bucket_name = models.CharField(
max_length=250,
verbose_name="Data Bucket Name",
help_text="Name of Cloud Data Bucket",
blank=True,
default="",
)

# Ticket Jira ID
jira_id = models.CharField(
max_length=100,
verbose_name="Associated Jira Ticket ID",
help_text="Associated Jira Ticket ID",
blank=True,
default="",
)

# django-simple-history
history = HistoricalRecords()

Expand Down

0 comments on commit 8a91f56

Please sign in to comment.