Skip to content

Commit

Permalink
Merge pull request #105 from unt-libraries/py3
Browse files Browse the repository at this point in the history
Py3
  • Loading branch information
ldko committed May 20, 2020
2 parents aec9168 + 24961b3 commit 8cc3d81
Show file tree
Hide file tree
Showing 20 changed files with 339 additions and 288 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
language: python
sudo: false
python: 2.7
env:
- TOX_ENV=py27-django111
- TOX_ENV=flake8
matrix:
include:
- python: 3.6
env: TOX_ENV=py36-django111
- python: 3.7
env: TOX_ENV=py37-django111
- python: 3.7
env: TOX_ENV=py37-flake8
install:
- pip install tox
script:
Expand Down
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
x.x.x
2.0.0
------

* Support Django 1.11
* Dropped support for Django 1.7-1.10
* Changed the base image in Dockerfile from python:2.7 to python:2.7-stretch
* Used pipenv to manage requirements

* Upgraded to Python 3

1.2.5
-----

* Added Django 1.11 support
* Dropped support for Django 1.7-1.10
* Changed the base image in Dockerfile from python:2.7 to python:2.7-stretch
* Used pipenv to manage requirements
* Removed bare excepts for flake8 ([#89](
https://github.com/unt-libraries/django-premis-event-service/pull/89))

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim: set ft=conf
FROM python:2.7-stretch
FROM python:3.7-stretch

RUN echo "US/Central" > /etc/timezone
RUN dpkg-reconfigure -f noninteractive tzdata
Expand All @@ -17,7 +17,7 @@ RUN apt-get update -qq && apt-get install -y mysql-client netcat

RUN pip install -U pip setuptools
RUN pip install pipenv
RUN pipenv install --dev --system
RUN pipenv install --dev --system --deploy --ignore-pipfile

ADD wait-for-mysqld.sh /wait-for-mysqld.sh
ADD appstart.sh /appstart.sh
11 changes: 5 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ verify_ssl = true
name = "pypi"

[packages]
lxml = "~=3.3.0"
codalib = "==1.0.3"
lxml = "~=4.2.0"
codalib = {git='https://github.com/unt-libraries/codalib'}
sqlparse = "*"
mysql-python = "*"
Django = "~=1.11.0"
mysqlclient = "~=1.3.14"
Django = "~=1.11.28"

[dev-packages]
django-debug-toolbar = "<=1.9"
tox = ">=3.13.0"
pytest-django = ">=3.2.1"
mock = "==1.3.0"
factory-boy = "==2.5.2"
"flake8" = "*"

[requires]
python_version = "2.7"
python_version = "3.7"

0 comments on commit 8cc3d81

Please sign in to comment.