updating code to python 3.12

.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build
+    - name: Build package
+      run: python -m build
+    - name: Publish package
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/tox.yml

@@ -0,0 +1,14 @@
+name: Test
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: tox
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install tox
+          tox

README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/internap/python-config-probe.svg?branch=master)](https://travis-ci.org/internap/python-config-probe)
-[![PyPI version](https://badge.fury.io/py/config-probe.svg)](http://badge.fury.io/py/config-probe)
+![Build Status](https://github.com/stephanerobert/config-mixin/actions/workflows/tox.yml/badge.svg?branch=master)
+[![PyPI version](https://badge.fury.io/py/config-mixin.svg)](http://badge.fury.io/py/config-mixin)
 
 
 Mission
@@ -25,7 +25,7 @@ Use it:
 
 - **path**
 
-    Initial path to probe.  Patterns will be tested against the file structure underneath the path
+    Initial path to probe.  Patterns will be tested against the file structure underneath the path,
     and it will be ignored in determining the namespacing.
 
 - **patterns**
@@ -58,7 +58,7 @@ Use it:
 
 ## Mocking the probing
 
-Your unit test can have your code use fake_probe instead to which to give a dict and it will appear as if it
+Your unit test can have your code use fake_probe instead to which to give a dict, and it will appear as if it
 was just probed. Example:
 
     config = fake_probe({

config-mixin.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

config_probe/__init__.py

@@ -4,7 +4,7 @@
 import os
 
 import yaml
-from munch import Munch, iteritems
+from munch import Munch
 
 from config_probe.exceptions import ConfigNotFound
 
@@ -46,7 +46,7 @@ def _deduce_namespaces(path_matchers, path_parts):
     namespaces = []
     path_parts, current_part = os.path.split(path_parts)
     path_matchers, matcher = os.path.split(path_matchers)
-    while current_part is not "":
+    while current_part != "":
         if matcher == NAMESPACE_PLACEHOLDER:
             namespaces.append(current_part)
 
@@ -67,7 +67,7 @@ def _add_to_configuration(config, namespaces, new_values):
 
 def _update(config, values):
     for k, v in values.items():
-        if k in config and isinstance(v, collections.Mapping):
+        if k in config and isinstance(v, collections.abc.Mapping):
             _update(config[k], v)
         else:
             config[k] = v
@@ -83,7 +83,7 @@ def __getattr__(self, k):
 
 def _munchify(x):
     if isinstance(x, dict):
-        return _Munch((k, _munchify(v)) for k,v in iteritems(x))
+        return _Munch((k, _munchify(v)) for k,v in x.items())
     elif isinstance(x, (list, tuple)):
         return type(x)(_munchify(v) for v in x)
     else:

setup.cfg

@@ -1,28 +1,22 @@
 [metadata]
-name = config-probe
-url = https://github.com/internap/python-config-probe
-author = Internap Hosting
-author-email = opensource@internap.com
+name = config-mixin
+url = https://github.com/stephanerobert/config-mixin
+author = Stephane Robert
+author-email = stephane.robert@gmail.com
 summary = Auto-discovery of configurations for easy inline use
 description-file =
     README.md
 classifier =
     Development Status :: 4 - Beta
     Intended Audience :: Developers
     Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    Intended Audience :: Telecommunications Industry
     License :: OSI Approved :: Apache Software License
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.12
 
 [files]
 packages =
-    config_probe
+    config_mixin
 
 [bdist_wheel]
 universal = 1
-
-[nosetests]
-no-path-adjustment = 1
-logging-level = DEBUG

setup.py

@@ -1,8 +1,32 @@
 #!/usr/bin/env python
-
 from setuptools import setup
 
+
+def readme():
+    with open('README.md') as readme:
+        return readme.read()
+
+
 setup(
     setup_requires=['pbr'],
     pbr=True,
+    name='Config Mixin',
+    description='Python Configuration File Helper',
+    long_description=readme(),
+    long_description_content_type='text/markdown',
+    classifiers=[
+        'Framework :: tox',
+        'Framework :: Pytest',
+        'Development Status :: 4 - Beta',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.12',
+        'Topic :: Software Development',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology'
+    ],
+    author='Stephane Robert',
+    author_email='[email protected]',
+    url='https://github.com/stephanerobert/config-mixin',
+    version='1.0.0'
 )

test-requirements.txt

@@ -1,2 +1,3 @@
-nose
+pytest
+pytest-cov
 pyhamcrest

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = py27,py34
+envlist = py34,p312
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
-commands = nosetests
+commands = pytest --cov --cov-report term-missing