Merge branch 'fix-readme-on-pypi'

thread · Jan 8, 2021 · a4d350a · a4d350a
2 parents b9f2188 + 8efd83e
commit a4d350a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 50 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,27 +18,36 @@ references:
     TOXENV: py36
     COVERALLS: true
 
+  # Set up a cached virtualenv in which to install our CI dependencies
+  restore-build-dependency-cache: &restore-build-dependency-cache
+    restore_cache:
+      name: Restore build dependency cache
+      key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
+
+  install-build-dependencies: &install-build-dependencies
+    run:
+      name: Install build dependencies
+      command: |
+        python3 -m venv venv
+        . venv/bin/activate
+        pip install -r .circleci/requirements.txt
+
+  save-build-dependency-cache: &save-build-dependency-cache
+    save_cache:
+      name: Save build dependency cache
+      key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
+      paths:
+        - "venv"
+
   test-template: &test-template
     working_directory: ~/routemaster
 
     steps:
       - checkout
 
-        # Set up a cached virtualenv in which to install tox
-      - restore_cache:
-          name: Restore build dependency cache
-          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
-      - run:
-          name: Install tox
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install -r .circleci/requirements.txt
-      - save_cache:
-          name: Save build dependency cache
-          key: deps-venv-{{ .Branch }}-{{ .Environment.CIRCLE_STAGE }}-{{ checksum ".circleci/requirements.txt" }}
-          paths:
-            - "venv"
+      - *restore-build-dependency-cache
+      - *install-build-dependencies
+      - *save-build-dependency-cache
 
       - run:
           name: Wait for Database with Dockerize
@@ -126,21 +135,11 @@ jobs:
       - image: circleci/python:3.6.3
     steps:
       - checkout
-      - restore_cache:
-          name: Restore build dependency cache
-          key: deps-venv-18.0-2.9.1
-      - run:
-          name: Install tox
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install pip==18.0
-            pip install tox==2.9.1
-      - save_cache:
-          name: Save build dependency cache
-          key: deps-venv-18.0-2.9.1
-          paths:
-            - "venv"
+
+      - *restore-build-dependency-cache
+      - *install-build-dependencies
+      - *save-build-dependency-cache
+
       - restore_cache:
           name: Restore .tox cache
           key: deps-tox-{{ checksum "scripts/linting/requirements.txt" }}
@@ -163,21 +162,11 @@ jobs:
       - image: circleci/python:3.6.3
     steps:
       - checkout
-      - restore_cache:
-          name: Restore build dependency cache
-          key: deps-venv-18.0-2.9.1
-      - run:
-          name: Install tox
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install pip==18.0
-            pip install tox==2.9.1
-      - save_cache:
-          name: Save build dependency cache
-          key: deps-venv-18.0-2.9.1
-          paths:
-            - "venv"
+
+      - *restore-build-dependency-cache
+      - *install-build-dependencies
+      - *save-build-dependency-cache
+
       - restore_cache:
           name: Restore .tox cache
           key: deps-tox-{{ checksum "scripts/typechecking/requirements.txt" }}

diff --git a/.circleci/requirements.txt b/.circleci/requirements.txt
@@ -1,5 +1,6 @@
 # Requirements for top level CI operations.
 # Don't include Routemaster's own requirements here.
 pip==18.0
+setuptools>=36.4
 tox==2.9.1
 coveralls==1.10.0
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,2 @@
-include README.md
 include version.py
 include routemaster/config/schema.yaml
diff --git a/plugins/routemaster-prometheus/MANIFEST.in b/plugins/routemaster-prometheus/MANIFEST.in
@@ -1,2 +1 @@
-include README.md
-include version.py
+include version.py
diff --git a/plugins/routemaster-sentry/MANIFEST.in b/plugins/routemaster-sentry/MANIFEST.in
@@ -1,2 +1 @@
-include README.md
-include version.py
+include version.py