From 5913a9ea6aa4b8768b865d537ef1a9f26ab0e9ce Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Fri, 6 Aug 2021 11:19:33 -0700 Subject: [PATCH] switch oauth_dropins symlink to oauth_dropins_static, drop it from repo it's now local clone only. this avoids import confusion, ie whether importing oauth_dropins uses the virtualenv's installed version or the symlinked files directly, which eg ran oauth-dropins's tests along with granary's/bridgy's, and caused Circle breakages like https://app.circleci.com/pipelines/github/snarfed/granary/767/workflows/21608f75-bb99-47dc-83ef-78d4f4793ed1/jobs/2819 corresponds to snarfed/granary@00294822d61765235a17eeb72ccd74dc2c231abb, snarfed/bridgy@b3f50d82489e85b14a8ef58a3abd0714cae85b4d --- README.md | 2 +- app.yaml | 14 ++------------ oauth_dropins | 1 - oauth_dropins_static | 1 + static/index.html | 2 +- templates/responses.html | 2 +- 6 files changed, 6 insertions(+), 16 deletions(-) delete mode 120000 oauth_dropins create mode 120000 oauth_dropins_static diff --git a/README.md b/README.md index 022944e..2389a46 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ TweepError: must be _socket.socket, not socket error: option --home not recognized ``` -You may need to change [granary](https://github.com/snarfed/granary), [oauth-dropins](https://github.com/snarfed/oauth-dropins), [webmention-tools](https://github.com/snarfed/webmention-tools), [mf2util](https://github.com/kylewm/mf2util), or other dependencies as well as as Bridgy Fed. To do that, clone their repo locally, then install them in "source" mode with e.g.: +You may need to change [granary](https://github.com/snarfed/granary), [oauth-dropins](https://github.com/snarfed/oauth-dropins), [mf2util](https://github.com/kylewm/mf2util), or other dependencies as well as as Bridgy Fed. To do that, clone their repo locally, then install them in "source" mode with e.g.: ```sh pip uninstall -y granary diff --git a/app.yaml b/app.yaml index 7d7f021..82211f1 100644 --- a/app.yaml +++ b/app.yaml @@ -21,22 +21,12 @@ automatic_scaling: handlers: # static -- url: /(static/bootstrap.*\.css) - static_files: oauth_dropins/\1 - upload: oauth_dropins/static/bootstrap.*\.css - secure: always - - url: /static static_dir: static secure: always -- url: /oauth_dropins/static - static_dir: oauth_dropins/static - secure: always - -- url: /.well-known/acme-challenge - static_dir: .well-known/acme-challenge - secure: always +- url: /oauth_dropins_static + static_dir: oauth_dropins_static - url: / static_files: static/index.html diff --git a/oauth_dropins b/oauth_dropins deleted file mode 120000 index 249dcd3..0000000 --- a/oauth_dropins +++ /dev/null @@ -1 +0,0 @@ -../oauth-dropins/oauth_dropins \ No newline at end of file diff --git a/oauth_dropins_static b/oauth_dropins_static new file mode 120000 index 0000000..9b867b1 --- /dev/null +++ b/oauth_dropins_static @@ -0,0 +1 @@ +../oauth-dropins/oauth_dropins/static \ No newline at end of file diff --git a/static/index.html b/static/index.html index cae56d8..eae6b07 100644 --- a/static/index.html +++ b/static/index.html @@ -10,7 +10,7 @@ - + diff --git a/templates/responses.html b/templates/responses.html index 2882810..6ecd3d4 100644 --- a/templates/responses.html +++ b/templates/responses.html @@ -5,7 +5,7 @@ Bridgy Fed: Logs - +