Merge pull request #134 from GeorgianaElena/clean-for-traefikv2

Cleanup the traefik-v2 branch
jupyterhub · Jul 8, 2021 · 3101914 · 3101914
2 parents d8d729c + 9e473df
commit 3101914
Show file tree

Hide file tree

Showing 31 changed files with 6 additions and 5,572 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,6 @@ jobs:
       #       steps as if would used `export MY_ENV=my-value`.
       - name: Configure environment variables
         run: |
-          echo "ETCDCTL_API=3" >> $GITHUB_ENV
           echo "PATH=$PWD/bin:$PATH" >> $GITHUB_ENV
       - uses: actions/checkout@v2
       # NOTE: actions/setup-python@v2 make use of a cache within the GitHub base
@@ -57,7 +56,7 @@ jobs:
         run: |
           pip install --upgrade setuptools pip
           pip install -r dev-requirements.txt --upgrade .
-          python -m jupyterhub_traefik_proxy.install --traefik --etcd --consul --output=./bin
+          python -m jupyterhub_traefik_proxy.install --traefik --output=./bin
           pip freeze
       - name: Run tests
         run: |

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,6 @@
 myst-parser
 pydata-sphinx-theme
 sphinx-copybutton
+# Temporary fix of sphinx compatibility issue.
+# Revert back to released autodoc-traits when 0.1.0 released.
+https://github.com/jupyterhub/autodoc-traits/archive/d22282c1c18c6865436e06d8b329c06fe12a07f8.zip
diff --git a/docs/source/api/index.rst b/docs/source/api/index.rst
@@ -26,15 +26,3 @@ Module: :mod:`jupyterhub_traefik_proxy`
 
 .. autoconfigurable:: TKvProxy
     :members:
-
-:class:`TraefikEtcdProxy`
--------------------------
-
-.. autoconfigurable:: TraefikEtcdProxy
-    :members:
-
-:class:`TraefikConsulProxy`
----------------------------
-
-.. autoconfigurable:: TraefikConsulProxy
-    :members:
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -32,8 +32,6 @@
         os.pardir,
     )
 )
-# add sphinxext
-sys.path.append(os.path.join(docs, 'sphinxext'))
 
 import jupyterhub_traefik_proxy
 

diff --git a/docs/sphinxext/autodoc_traits.py b/docs/sphinxext/autodoc_traits.py
diff --git a/jupyterhub_traefik_proxy/__init__.py b/jupyterhub_traefik_proxy/__init__.py
@@ -2,8 +2,6 @@
 
 from .proxy import TraefikProxy  # noqa
 from .kv_proxy import TKvProxy  # noqa
-from .etcd import TraefikEtcdProxy
-from .consul import TraefikConsulProxy
 from .toml import TraefikTomlProxy
 
 from ._version import get_versions

diff --git a/performance/ProxyPerformance.ipynb b/performance/ProxyPerformance.ipynb
diff --git a/performance/__init__.py b/performance/__init__.py