Merge pull request #5 from artshumrc/update-requirements

Update requirements

LICENSE

@@ -0,0 +1,2 @@
+ © 2024 The President and Fellows of Harvard College. All rights reserved.
+

README.rst

@@ -40,7 +40,7 @@ Make sure you have docker_ installed to try this quickstart.
     $> docker compose up
     $> docker compose exec web python manage.py migrate
     $> docker compose exec web python manage.py createsuperuser
-    $> open http://localhost:8000/static/anno/index.html
+    $> open http://localhost:9000/static/anno/index.html
 
 
 This last command opens the API page, where you can try the `Web Annotation`_

catchpy/requirements/base.txt

@@ -1,12 +1,12 @@
-Django~=4.2
-iso8601~=2.0.0
-jsonschema==4.18.4
+Django>=4.2
+iso8601>=2.0.0
+jsonschema>=4.18.4
 psycopg>=3.1.8
-PyJWT==2.8.0
-PyLD==2.0.3
-python-dateutil==2.8.2
-python-dotenv==1.0.0
-pytz==2023.3
-requests~=2.31.0
-django-log-request-id==2.1.0
-django-cors-headers~=4.2.0
+PyJWT>=2.8.0
+PyLD>=2.0.4=3
+python-dateutil>=2.8.2
+python-dotenv>=1.0.0
+pytz>=2023.3
+requests>=2.31.0
+django-log-request-id>=2.1.0
+django-cors-headers>=4.2.0

docker-compose.yml

@@ -14,11 +14,11 @@ services:
       args:
         REQUIREMENTS_FILE: catchpy/requirements/dev.txt
     image: hx/catchpy:dev
-    command: ["./wait-for-it.sh", "db:5432", "--", "python", "manage.py", "runserver", "0.0.0.0:8000"]
+    command: ["./wait-for-it.sh", "db:5432", "--", "./docker_entrypoint.sh"]
     volumes:
       - .:/code
     ports:
-      - "8000:8000"
+      - "9000:8000"
     depends_on:
       - db
     environment:

docker_dotenv.env

@@ -16,3 +16,6 @@ CATCH_RESPONSE_LIMIT=200
 
 # print seach times in steps
 CATCH_LOG_SEARCH_TIME="true"
+
+# docker hostname for catchpy
+CATCHPY_ALLOWED_HOSTS='catchpy'

docker_entrypoint.sh

@@ -0,0 +1,6 @@
+python manage.py migrate
+python manage.py create_user --username user --password password --is_admin
+python manage.py create_consumer_pair --consumer consumer --secret secret --expire_in_weeks 520 --no-update
+python manage.py runserver 0.0.0.0:8000
+
+

test.Dockerfile

@@ -9,7 +9,7 @@ ENV PATH "$PATH:/usr/games"
 
 # Install all other versions of Python we want to test with tox
 RUN git clone https://github.com/pyenv/pyenv /root/.pyenv
-RUN for PYTHON_VERSION in 3.8.17 3.9.17 3.10.12 3.11.4 3.12.2; do \
+RUN for PYTHON_VERSION in 3.8.19 3.9.19 3.10.14 3.11.9 3.12.3; do \
   set -ex \
     && /root/.pyenv/bin/pyenv install ${PYTHON_VERSION} \
     && /root/.pyenv/versions/${PYTHON_VERSION}/bin/python -m pip install --upgrade pip \