Merge master; use local thumbnail proxy by default instead of referen…

…cing it by container

.github/workflows/IssueAndPR.yml

@@ -0,0 +1,26 @@
+name: "Project Board Automation"
+
+on:
+  issues:
+    types: [ opened ]
+  pull_request:
+    types: [ opened ]
+jobs:
+  join_issue_pr_to_project:
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Automate adding issues to Backlog"
+      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
+      if: github.event_name == 'issues'
+      env:
+        GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }}
+        GITHUB_PROJECT_URL: https://github.com/orgs/creativecommons/projects/10
+        GITHUB_PROJECT_COLUMN_NAME: "Pending Review"
+    - name: "Automate adding PRs to Active Sprint"
+      uses: docker://takanabe/github-actions-automate-projects:v0.0.1
+      if: github.event_name == 'pull_request'
+      continue-on-error: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_TOKEN }}
+        GITHUB_PROJECT_URL: https://github.com/orgs/creativecommons/projects/7
+        GITHUB_PROJECT_COLUMN_NAME: "In Progress"

.travis.yml

@@ -8,13 +8,14 @@ addons:
 env:
   - CCCAPI_CONTAINER_NAME=cccatalog-api_web_1 ANALYTICS_CONTAINER_NAME=cccatalog-api_analytics_1
 python:
-- '3.6'
+- '3.7'
 services:
   - docker
 install:
   - pip3 install pipenv
   - cd cccatalog-api && pipenv install --system --deploy --dev && cd ..
   - cd ingestion_server && pipenv install --system --deploy --dev && cd ..
+  - cd image_get/worker && pipenv install --system --deploy && cd ../../
   - cd analytics && pipenv install && cd ..
 before_install:
   - "export PYTHONPATH=$PYTHONPATH:$(pwd)"
@@ -30,6 +31,7 @@ script:
   - pycodestyle ingestion_server/ingestion_server --max-line-length=80 --ignore=E402
   - cd cccatalog-api && test/run_test.sh
   - cd ../ingestion_server && pytest test/unit_tests.py
-  - cd ../ && docker-compose logs analytics
+  - cd ../image_get/worker && pipenv run pytest
+  - cd ../../ && docker-compose logs analytics
   - cd ./analytics && API_URL='analytics:8090' pytest tests.py --disable-pytest-warnings
   - cd ../ && docker-compose logs analytics

README.md

@@ -5,11 +5,7 @@
 
 The Creative Commons Catalog API ('cccatalog-api') is a system that allows programmatic access to public domain digital media. It is our ambition to index and catalog [billions of Creative Commons works](https://stateof.creativecommons.org/), including articles, songs, videos, photographs, paintings, and more. Using this API, developers will be able to access the digital commons in their own applications.
 
-This repository is primarily concerned with back end infrastructure like datastores, servers, and APIs. The pipeline that feeds data into this system can be found in the [cccatalog repository](https://github.com/creativecommons/cccatalog). A front end web application that interfaces with the API can be found at the [cccatalog-frontend repository](https://github.com/creativecommons/cccatalog).
-
-## Project Status
-
-The API is still in [semantic version](https://semver.org/) 0.\*.\*, meaning the API can be changed without notice. You should [contact us](https://creativecommons.org/about/contact/) if you are interested in using this API in production. No SLAs or warranties are provided to anonymous consumers of the API.
+This repository is primarily concerned with back end infrastructure like datastores, servers, and APIs. The pipeline that feeds data into this system can be found in the [cccatalog repository](https://github.com/creativecommons/cccatalog). A front end web application that interfaces with the API can be found at the [cccatalog-frontend repository](https://github.com/creativecommons/cccatalog-frontend).
 
 ## API Documentation
 
@@ -72,7 +68,6 @@ Every week, the latest version of the data is automatically bulk copied ("ingest
 You can check the health of a live deployment of the API by running the live integration tests.
 ```
 cd cccatalog-api
-virtualenv venv
 pipenv install
 pipenv shell
 ./test/run_test.sh
@@ -91,5 +86,9 @@ python3 test/integration_tests.py
 ## Deploying and monitoring the API
 The API infrastructure is orchestrated using Terraform hosted in creativecommons/ccsearch-infrastructure. More details can be found on the [this wiki page](https://wikijs.creativecommons.org/tech/cc-search/operations).
 
+## Django Admin
+
+Custom administration views can be viewed at the /admin/ endpoint.
+
 ## Contributing
-Pull requests are welcome! Feel free to [join us on Slack](https://slack-signup.creativecommons.org/) and discuss the project with the engineers on #cc-developers. You are welcome to take any open issue in the tracker labeled 'help wanted' or 'good first issue'; **there's no need to ask for permission in advance**. Other issues are open for contribution as well, but may be less accessible or well defined in comparison to those that are explicitly labeled; you should consider reaching out to us if you are interested in implementing these tickets.
+Pull requests are welcome! Feel free to [join us on Slack](https://slack-signup.creativecommons.org/) and discuss the project with the engineers on #cc-search. You are welcome to take any open issue in the tracker labeled 'help wanted' or 'good first issue'; **there's no need to ask for permission in advance**. See the [CONTRIBUTORS](https://github.com/creativecommons/cccatalog-api/blob/master/CONTRIBUTING.md) file for details. Other issues are open for contribution as well, but may be less accessible or well defined in comparison to those that are explicitly labeled; you should consider reaching out to us if you are interested in implementing these tickets.

cccatalog-api/Pipfile

@@ -10,7 +10,6 @@ pipdeptree = "*"
 pycodestyle = "*"
 
 [packages]
-future = {version = "*",python_version = "<=2.7"}
 psycopg2-binary = "*"
 redlock-py = "*"
 hvac = "*"
@@ -33,7 +32,10 @@ pytest-django = ">=3.5"
 djangorestframework = "*"
 drf-yasg = "*"
 elasticsearch-dsl = "==7.0.0"
-ipaddress = {version = "*",python_version = "<=2.7"}
 piexif = "*"
 python-xmp-toolkit = "*"
 deepdiff = "*"
+djangorestframework-xml = "*"
+gevent = "*"
+future = {version = "*",python_version = "<=2.7"}
+ipaddress = {version = "*",python_version = "<=2.7"}