Merge pull request #43 from google/new-release

Ready 3.0.1 release
google · Oct 11, 2023 · 92a92eb · 92a92eb
2 parents c855208 + 6f5529b
commit 92a92eb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,47 +2,47 @@ version: 2
 jobs:
   Unit Test:
     docker:
-      - image: cimg/python:3.10.2
+      - image: cimg/python:3.12.0
     steps:
       - checkout
       - run:
           command: |
             pip install virtualenv
             pip install nox
             nox -f noxfile.py -s unit
-  Compatibility Test 3.10:
+  Compatibility Test 3.12.0:
     docker:
-      - image: cimg/python:3.10.2
+      - image: cimg/python:3.12.0
     steps:
       - checkout
       - run:
           command: |
             pip install virtualenv
             pip install nox
             nox -f noxfile.py -s compatibility
-  Compatibility Test 3.9:
+  Compatibility Test 3.11.6:
     docker:
-      - image: cimg/python:3.9.10
+      - image: cimg/python:3.11.6
     steps:
       - checkout
       - run:
           command: |
             pip install virtualenv
             pip install nox
             nox -f noxfile.py -s compatibility
-  Compatibility Test 3.8:
+  Compatibility Test 3.10:
     docker:
-      - image: cimg/python:3.8.12
+      - image: cimg/python:3.10.2
     steps:
       - checkout
       - run:
           command: |
             pip install virtualenv
             pip install nox
             nox -f noxfile.py -s compatibility
-  Compatibility Test 3.7:
+  Compatibility Test 3.9:
     docker:
-      - image: cimg/python:3.7.12
+      - image: cimg/python:3.9.10
     steps:
       - checkout
       - run:
@@ -52,7 +52,7 @@ jobs:
             nox -f noxfile.py -s compatibility
   Lint:
     docker:
-      - image: cimg/python:3.10.2
+      - image: cimg/python:3.12.0
     steps:
       - checkout
       - run:
@@ -62,7 +62,7 @@ jobs:
             nox -f noxfile.py -s lint
   Type Check:
     docker:
-      - image: cimg/python:3.7.12
+      - image: cimg/python:3.12.0
 
     steps:
       - checkout
@@ -73,7 +73,7 @@ jobs:
             nox -f noxfile.py -s type_check
   Release:
     docker:
-      - image: cimg/python:3.10.2
+      - image: cimg/python:3.12.0
 
     steps:
       - checkout
@@ -92,10 +92,10 @@ workflows:
       - Lint
       - Unit Test
       - Type Check
+      - Compatibility Test 3.12
+      - Compatibility Test 3.11
       - Compatibility Test 3.10
       - Compatibility Test 3.9
-      - Compatibility Test 3.8
-      - Compatibility Test 3.7
   release:
     jobs:
       - Release:

diff --git a/noxfile.py b/noxfile.py
@@ -58,7 +58,7 @@ def compatibility(session, install):
     _run_tests(session)
 
 
-@nox.session(python=['3.7'])
+@nox.session(python=['3.12'])
 def type_check(session):
     """Run type checking using pytype."""
     if sys.platform.startswith('win'):

diff --git a/pybadges/__init__.py b/pybadges/__init__.py
@@ -64,6 +64,11 @@
     'gray': '#555',
     'lightgrey': '#9f9f9f',
     'lightgray': '#9f9f9f',
+    'critical': '#e05d44',
+    'important': '#fe7d37',
+    'success': '#4c1',
+    'informational': '#007ec6',
+    'inactive': '#9f9f9f',
 }
 
 
@@ -160,12 +165,12 @@ def badge(
             text. Can be an valid CSS color
             (see https://developer.mozilla.org/en-US/docs/Web/CSS/color) or a
             color name defined here:
-            https://github.com/badges/shields/blob/master/lib/colorscheme.json
+            https://github.com/badges/shields/blob/master/badge-maker/lib/color.js
         right_color: The color of the part of the badge containing the
             right-hand text. Can be an valid CSS color
             (see https://developer.mozilla.org/en-US/docs/Web/CSS/color) or a
             color name defined here:
-            https://github.com/badges/shields/blob/master/lib/colorscheme.json
+            https://github.com/badges/shields/blob/master/badge-maker/lib/color.js
         measurer: A text_measurer.TextMeasurer that can be used to measure the
             width of left_text and right_text.
         embed_logo: If True then embed the logo image directly in the badge.

diff --git a/pybadges/version.py b/pybadges/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '3.0.0'  # Also change in setup.py.
+__version__ = '3.0.1'  # Also change in setup.py.
diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@ def replace_relative_with_absolute(match):
 
 setup(
     name='pybadges',
-    version='3.0.0',  # Also change in version.py.
+    version='3.0.1',  # Also change in version.py.
     author='Brian Quinlan',
     author_email='brian@sweetapp.com',
     classifiers=[
@@ -53,6 +53,8 @@ def replace_relative_with_absolute(match):
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Operating System :: OS Independent',
     ],
     description='A library and command-line tool for generating Github-style ' +