From 923cdc05e5b662da5f78f9e9500f46efb4865630 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Tue, 3 May 2022 10:03:02 -0400 Subject: [PATCH 1/9] Update Chore --- cppython/console.py | 20 ++-- cppython/project.py | 2 - pdm.lock | 166 ++++++++++++++-------------- pyproject.toml | 2 +- tests/integration/test_interface.py | 4 +- tests/unit/test_interface.py | 4 +- tests/unit/test_project.py | 2 +- 7 files changed, 103 insertions(+), 97 deletions(-) diff --git a/cppython/console.py b/cppython/console.py index 62f1bb1..922c5a8 100644 --- a/cppython/console.py +++ b/cppython/console.py @@ -8,7 +8,7 @@ import click import tomlkit -from cppython_core.schema import GeneratorDataType, Interface +from cppython_core.schema import GeneratorDataT, Interface, InterfaceConfiguration from cppython.project import Project, ProjectConfiguration @@ -40,7 +40,9 @@ class Config: def __init__(self): self.pyproject_data = _create_pyproject() - self.interface = ConsoleInterface() + + configuration = InterfaceConfiguration() + self.interface = ConsoleInterface(configuration) self.configuration = ProjectConfiguration() def create_project(self) -> Project: @@ -107,7 +109,14 @@ class ConsoleInterface(Interface): Interface implementation to pass to the project """ - def read_generator_data(self, generator_data_type: Type[GeneratorDataType]) -> GeneratorDataType: + def __init__(self, configuration: InterfaceConfiguration) -> None: + super().__init__(configuration) + + @staticmethod + def name() -> str: + return "console" + + def read_generator_data(self, generator_data_type: Type[GeneratorDataT]) -> GeneratorDataT: """ Requests generator information """ @@ -117,8 +126,3 @@ def write_pyproject(self) -> None: """ Write output """ - - def register_logger(self, logger: Logger) -> None: - """ - TODO - """ diff --git a/cppython/project.py b/cppython/project.py index 64cb7bd..19b9dec 100644 --- a/cppython/project.py +++ b/cppython/project.py @@ -124,8 +124,6 @@ def __init__( self._logger = logging.getLogger("cppython") self._logger.setLevel(levels[configuration.verbosity]) - interface.register_logger(self._logger) - self._logger.info("Initializing project") builder = ProjectBuilder(self.configuration) diff --git a/pdm.lock b/pdm.lock index d453217..b08af64 100644 --- a/pdm.lock +++ b/pdm.lock @@ -1,6 +1,6 @@ [[package]] name = "astroid" -version = "2.11.3" +version = "2.11.4" requires_python = ">=3.6.2" summary = "An abstract syntax tree for Python with inference support." dependencies = [ @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "cppython-core" -version = "0.3.3.dev0" +version = "0.3.3.dev7" requires_python = ">=3.10" summary = "Data definitions for CPPython" dependencies = [ @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "pylint" -version = "2.13.7" +version = "2.13.8" requires_python = ">=3.6.2" summary = "python code static checker" dependencies = [ @@ -200,7 +200,7 @@ dependencies = [ [[package]] name = "pytest-cppython" -version = "0.1.7.dev0" +version = "0.1.7.dev5" requires_python = ">=3.10" summary = "A pytest plugin that imports CPPython testing types" dependencies = [ @@ -243,18 +243,18 @@ summary = "Backported and Experimental Type Hints for Python 3.7+" [[package]] name = "wrapt" -version = "1.14.0" +version = "1.14.1" requires_python = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" summary = "Module for decorators, wrappers and monkey patching." [metadata] lock_version = "3.1" -content_hash = "sha256:f0f83bc774902223916236b1cf03239ba70ebfae99961ebf2f1d3ec0801aafe4" +content_hash = "sha256:9842348d0ddc71440b500499ed71e9b60aea9edcf388f5d8ef170c125c802e99" [metadata.files] -"astroid 2.11.3" = [ - {file = "astroid-2.11.3-py3-none-any.whl", hash = "sha256:f1af57483cd17e963b2eddce8361e00fc593d1520fe19948488e94ff6476bd71"}, - {file = "astroid-2.11.3.tar.gz", hash = "sha256:4e5ba10571e197785e312966ea5efb2f5783176d4c1a73fa922d474ae2be59f7"}, +"astroid 2.11.4" = [ + {file = "astroid-2.11.4-py3-none-any.whl", hash = "sha256:da0632b7c046d8361dfe1b1abb2e085a38624961fabe2997565a9c06c1be9d9a"}, + {file = "astroid-2.11.4.tar.gz", hash = "sha256:561dc6015eecce7e696ff7e3b40434bc56831afeff783f0ea853e19c4f635c06"}, ] "atomicwrites 1.4.0" = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, @@ -340,9 +340,9 @@ content_hash = "sha256:f0f83bc774902223916236b1cf03239ba70ebfae99961ebf2f1d3ec08 {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"}, {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"}, ] -"cppython-core 0.3.3.dev0" = [ - {file = "cppython_core-0.3.3.dev0-py3-none-any.whl", hash = "sha256:ad8b23058bb8d0e4f1999a2ad197f539860a56c7da230c2e215f2234eb40cf5c"}, - {file = "cppython-core-0.3.3.dev0.tar.gz", hash = "sha256:af4e8b312dae02d495ccd4544c0d38517fa48bc09808f8bf38d22be106cf320f"}, +"cppython-core 0.3.3.dev7" = [ + {file = "cppython_core-0.3.3.dev7-py3-none-any.whl", hash = "sha256:b9dfff49688a6e45d28a07e7658a13783068e59dc6420518b7dcce3aa97a9ad4"}, + {file = "cppython-core-0.3.3.dev7.tar.gz", hash = "sha256:c9cb09f1cde50ca3d53531c6abcc873cdc0be1f9c90b77956e59406f640edae4"}, ] "dill 0.3.4" = [ {file = "dill-0.3.4-py2.py3-none-any.whl", hash = "sha256:7e40e4a70304fd9ceab3535d36e58791d9c4a776b38ec7f7ec9afc8d3dca4d4f"}, @@ -460,9 +460,9 @@ content_hash = "sha256:f0f83bc774902223916236b1cf03239ba70ebfae99961ebf2f1d3ec08 {file = "pydantic-1.9.0-py3-none-any.whl", hash = "sha256:085ca1de245782e9b46cefcf99deecc67d418737a1fd3f6a4f511344b613a5b3"}, {file = "pydantic-1.9.0.tar.gz", hash = "sha256:742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a"}, ] -"pylint 2.13.7" = [ - {file = "pylint-2.13.7-py3-none-any.whl", hash = "sha256:13ddbbd8872c804574149e81197c28877eba75224ba6b76cd8652fc31df55c1c"}, - {file = "pylint-2.13.7.tar.gz", hash = "sha256:911d3a97c808f7554643bcc5416028cfdc42eae34ed129b150741888c688d5d5"}, +"pylint 2.13.8" = [ + {file = "pylint-2.13.8-py3-none-any.whl", hash = "sha256:f87e863a0b08f64b5230e7e779bcb75276346995737b2c0dc2793070487b1ff6"}, + {file = "pylint-2.13.8.tar.gz", hash = "sha256:ced8968c3b699df0615e2a709554dec3ddac2f5cd06efadb69554a69eeca364a"}, ] "pyparsing 3.0.8" = [ {file = "pyparsing-3.0.8-py3-none-any.whl", hash = "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06"}, @@ -476,9 +476,9 @@ content_hash = "sha256:f0f83bc774902223916236b1cf03239ba70ebfae99961ebf2f1d3ec08 {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, ] -"pytest-cppython 0.1.7.dev0" = [ - {file = "pytest_cppython-0.1.7.dev0-py3-none-any.whl", hash = "sha256:92b5812f6f7ed9deb55ee45086273315cd310e7ebd12030db7e412b889dc500b"}, - {file = "pytest-cppython-0.1.7.dev0.tar.gz", hash = "sha256:634d2111df4127d6f280ee2f8f236fefb47135cf1d272031cd22eddd0be844e9"}, +"pytest-cppython 0.1.7.dev5" = [ + {file = "pytest_cppython-0.1.7.dev5-py3-none-any.whl", hash = "sha256:c750583c9032a2bc16a0e2d498a99b3f822cbb5999118a109e4237e81af05977"}, + {file = "pytest-cppython-0.1.7.dev5.tar.gz", hash = "sha256:8627722a9445a3f8964d7433edfeedbd472c6661e330b4f7caed72debbef0ebd"}, ] "pytest-mock 3.7.0" = [ {file = "pytest_mock-3.7.0-py3-none-any.whl", hash = "sha256:6cff27cec936bf81dc5ee87f07132b807bcda51106b5ec4b90a04331cba76231"}, @@ -500,69 +500,69 @@ content_hash = "sha256:f0f83bc774902223916236b1cf03239ba70ebfae99961ebf2f1d3ec08 {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, ] -"wrapt 1.14.0" = [ - {file = "wrapt-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:5a9a1889cc01ed2ed5f34574c90745fab1dd06ec2eee663e8ebeefe363e8efd7"}, - {file = "wrapt-1.14.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:9a3ff5fb015f6feb78340143584d9f8a0b91b6293d6b5cf4295b3e95d179b88c"}, - {file = "wrapt-1.14.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4b847029e2d5e11fd536c9ac3136ddc3f54bc9488a75ef7d040a3900406a91eb"}, - {file = "wrapt-1.14.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:9a5a544861b21e0e7575b6023adebe7a8c6321127bb1d238eb40d99803a0e8bd"}, - {file = "wrapt-1.14.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:88236b90dda77f0394f878324cfbae05ae6fde8a84d548cfe73a75278d760291"}, - {file = "wrapt-1.14.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:f0408e2dbad9e82b4c960274214af533f856a199c9274bd4aff55d4634dedc33"}, - {file = "wrapt-1.14.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:9d8c68c4145041b4eeae96239802cfdfd9ef927754a5be3f50505f09f309d8c6"}, - {file = "wrapt-1.14.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:22626dca56fd7f55a0733e604f1027277eb0f4f3d95ff28f15d27ac25a45f71b"}, - {file = "wrapt-1.14.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:65bf3eb34721bf18b5a021a1ad7aa05947a1767d1aa272b725728014475ea7d5"}, - {file = "wrapt-1.14.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09d16ae7a13cff43660155383a2372b4aa09109c7127aa3f24c3cf99b891c330"}, - {file = "wrapt-1.14.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:debaf04f813ada978d7d16c7dfa16f3c9c2ec9adf4656efdc4defdf841fc2f0c"}, - {file = "wrapt-1.14.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:748df39ed634851350efa87690c2237a678ed794fe9ede3f0d79f071ee042561"}, - {file = "wrapt-1.14.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1807054aa7b61ad8d8103b3b30c9764de2e9d0c0978e9d3fc337e4e74bf25faa"}, - {file = "wrapt-1.14.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:763a73ab377390e2af26042f685a26787c402390f682443727b847e9496e4a2a"}, - {file = "wrapt-1.14.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:8529b07b49b2d89d6917cfa157d3ea1dfb4d319d51e23030664a827fe5fd2131"}, - {file = "wrapt-1.14.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:68aeefac31c1f73949662ba8affaf9950b9938b712fb9d428fa2a07e40ee57f8"}, - {file = "wrapt-1.14.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59d7d92cee84a547d91267f0fea381c363121d70fe90b12cd88241bd9b0e1763"}, - {file = "wrapt-1.14.0-cp310-cp310-win32.whl", hash = "sha256:3a88254881e8a8c4784ecc9cb2249ff757fd94b911d5df9a5984961b96113fff"}, - {file = "wrapt-1.14.0-cp310-cp310-win_amd64.whl", hash = "sha256:9a242871b3d8eecc56d350e5e03ea1854de47b17f040446da0e47dc3e0b9ad4d"}, - {file = "wrapt-1.14.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a65bffd24409454b889af33b6c49d0d9bcd1a219b972fba975ac935f17bdf627"}, - {file = "wrapt-1.14.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9d9fcd06c952efa4b6b95f3d788a819b7f33d11bea377be6b8980c95e7d10775"}, - {file = "wrapt-1.14.0-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:db6a0ddc1282ceb9032e41853e659c9b638789be38e5b8ad7498caac00231c23"}, - {file = "wrapt-1.14.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:14e7e2c5f5fca67e9a6d5f753d21f138398cad2b1159913ec9e9a67745f09ba3"}, - {file = "wrapt-1.14.0-cp35-cp35m-win32.whl", hash = "sha256:6d9810d4f697d58fd66039ab959e6d37e63ab377008ef1d63904df25956c7db0"}, - {file = "wrapt-1.14.0-cp35-cp35m-win_amd64.whl", hash = "sha256:d808a5a5411982a09fef6b49aac62986274ab050e9d3e9817ad65b2791ed1425"}, - {file = "wrapt-1.14.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b77159d9862374da213f741af0c361720200ab7ad21b9f12556e0eb95912cd48"}, - {file = "wrapt-1.14.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36a76a7527df8583112b24adc01748cd51a2d14e905b337a6fefa8b96fc708fb"}, - {file = "wrapt-1.14.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0057b5435a65b933cbf5d859cd4956624df37b8bf0917c71756e4b3d9958b9e"}, - {file = "wrapt-1.14.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a0a4ca02752ced5f37498827e49c414d694ad7cf451ee850e3ff160f2bee9d3"}, - {file = "wrapt-1.14.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8c6be72eac3c14baa473620e04f74186c5d8f45d80f8f2b4eda6e1d18af808e8"}, - {file = "wrapt-1.14.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:21b1106bff6ece8cb203ef45b4f5778d7226c941c83aaaa1e1f0f4f32cc148cd"}, - {file = "wrapt-1.14.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:493da1f8b1bb8a623c16552fb4a1e164c0200447eb83d3f68b44315ead3f9036"}, - {file = "wrapt-1.14.0-cp36-cp36m-win32.whl", hash = "sha256:89ba3d548ee1e6291a20f3c7380c92f71e358ce8b9e48161401e087e0bc740f8"}, - {file = "wrapt-1.14.0-cp36-cp36m-win_amd64.whl", hash = "sha256:729d5e96566f44fccac6c4447ec2332636b4fe273f03da128fff8d5559782b06"}, - {file = "wrapt-1.14.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:891c353e95bb11abb548ca95c8b98050f3620a7378332eb90d6acdef35b401d4"}, - {file = "wrapt-1.14.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23f96134a3aa24cc50614920cc087e22f87439053d886e474638c68c8d15dc80"}, - {file = "wrapt-1.14.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6807bcee549a8cb2f38f73f469703a1d8d5d990815c3004f21ddb68a567385ce"}, - {file = "wrapt-1.14.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6915682f9a9bc4cf2908e83caf5895a685da1fbd20b6d485dafb8e218a338279"}, - {file = "wrapt-1.14.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:f2f3bc7cd9c9fcd39143f11342eb5963317bd54ecc98e3650ca22704b69d9653"}, - {file = "wrapt-1.14.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:3a71dbd792cc7a3d772ef8cd08d3048593f13d6f40a11f3427c000cf0a5b36a0"}, - {file = "wrapt-1.14.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:5a0898a640559dec00f3614ffb11d97a2666ee9a2a6bad1259c9facd01a1d4d9"}, - {file = "wrapt-1.14.0-cp37-cp37m-win32.whl", hash = "sha256:167e4793dc987f77fd476862d32fa404d42b71f6a85d3b38cbce711dba5e6b68"}, - {file = "wrapt-1.14.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d066ffc5ed0be00cd0352c95800a519cf9e4b5dd34a028d301bdc7177c72daf3"}, - {file = "wrapt-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d9bdfa74d369256e4218000a629978590fd7cb6cf6893251dad13d051090436d"}, - {file = "wrapt-1.14.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2498762814dd7dd2a1d0248eda2afbc3dd9c11537bc8200a4b21789b6df6cd38"}, - {file = "wrapt-1.14.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f24ca7953f2643d59a9c87d6e272d8adddd4a53bb62b9208f36db408d7aafc7"}, - {file = "wrapt-1.14.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b835b86bd5a1bdbe257d610eecab07bf685b1af2a7563093e0e69180c1d4af1"}, - {file = "wrapt-1.14.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b21650fa6907e523869e0396c5bd591cc326e5c1dd594dcdccac089561cacfb8"}, - {file = "wrapt-1.14.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:354d9fc6b1e44750e2a67b4b108841f5f5ea08853453ecbf44c81fdc2e0d50bd"}, - {file = "wrapt-1.14.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1f83e9c21cd5275991076b2ba1cd35418af3504667affb4745b48937e214bafe"}, - {file = "wrapt-1.14.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:61e1a064906ccba038aa3c4a5a82f6199749efbbb3cef0804ae5c37f550eded0"}, - {file = "wrapt-1.14.0-cp38-cp38-win32.whl", hash = "sha256:28c659878f684365d53cf59dc9a1929ea2eecd7ac65da762be8b1ba193f7e84f"}, - {file = "wrapt-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:b0ed6ad6c9640671689c2dbe6244680fe8b897c08fd1fab2228429b66c518e5e"}, - {file = "wrapt-1.14.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b3f7e671fb19734c872566e57ce7fc235fa953d7c181bb4ef138e17d607dc8a1"}, - {file = "wrapt-1.14.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:87fa943e8bbe40c8c1ba4086971a6fefbf75e9991217c55ed1bcb2f1985bd3d4"}, - {file = "wrapt-1.14.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4775a574e9d84e0212f5b18886cace049a42e13e12009bb0491562a48bb2b758"}, - {file = "wrapt-1.14.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9d57677238a0c5411c76097b8b93bdebb02eb845814c90f0b01727527a179e4d"}, - {file = "wrapt-1.14.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00108411e0f34c52ce16f81f1d308a571df7784932cc7491d1e94be2ee93374b"}, - {file = "wrapt-1.14.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d332eecf307fca852d02b63f35a7872de32d5ba8b4ec32da82f45df986b39ff6"}, - {file = "wrapt-1.14.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:01f799def9b96a8ec1ef6b9c1bbaf2bbc859b87545efbecc4a78faea13d0e3a0"}, - {file = "wrapt-1.14.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47045ed35481e857918ae78b54891fac0c1d197f22c95778e66302668309336c"}, - {file = "wrapt-1.14.0-cp39-cp39-win32.whl", hash = "sha256:2eca15d6b947cfff51ed76b2d60fd172c6ecd418ddab1c5126032d27f74bc350"}, - {file = "wrapt-1.14.0-cp39-cp39-win_amd64.whl", hash = "sha256:bb36fbb48b22985d13a6b496ea5fb9bb2a076fea943831643836c9f6febbcfdc"}, - {file = "wrapt-1.14.0.tar.gz", hash = "sha256:8323a43bd9c91f62bb7d4be74cc9ff10090e7ef820e27bfe8815c57e68261311"}, +"wrapt 1.14.1" = [ + {file = "wrapt-1.14.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1b376b3f4896e7930f1f772ac4b064ac12598d1c38d04907e696cc4d794b43d3"}, + {file = "wrapt-1.14.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:903500616422a40a98a5a3c4ff4ed9d0066f3b4c951fa286018ecdf0750194ef"}, + {file = "wrapt-1.14.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:5a9a0d155deafd9448baff28c08e150d9b24ff010e899311ddd63c45c2445e28"}, + {file = "wrapt-1.14.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ddaea91abf8b0d13443f6dac52e89051a5063c7d014710dcb4d4abb2ff811a59"}, + {file = "wrapt-1.14.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:36f582d0c6bc99d5f39cd3ac2a9062e57f3cf606ade29a0a0d6b323462f4dd87"}, + {file = "wrapt-1.14.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:7ef58fb89674095bfc57c4069e95d7a31cfdc0939e2a579882ac7d55aadfd2a1"}, + {file = "wrapt-1.14.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e2f83e18fe2f4c9e7db597e988f72712c0c3676d337d8b101f6758107c42425b"}, + {file = "wrapt-1.14.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ee2b1b1769f6707a8a445162ea16dddf74285c3964f605877a20e38545c3c462"}, + {file = "wrapt-1.14.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:833b58d5d0b7e5b9832869f039203389ac7cbf01765639c7309fd50ef619e0b1"}, + {file = "wrapt-1.14.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:80bb5c256f1415f747011dc3604b59bc1f91c6e7150bd7db03b19170ee06b320"}, + {file = "wrapt-1.14.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:07f7a7d0f388028b2df1d916e94bbb40624c59b48ecc6cbc232546706fac74c2"}, + {file = "wrapt-1.14.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:02b41b633c6261feff8ddd8d11c711df6842aba629fdd3da10249a53211a72c4"}, + {file = "wrapt-1.14.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2fe803deacd09a233e4762a1adcea5db5d31e6be577a43352936179d14d90069"}, + {file = "wrapt-1.14.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:257fd78c513e0fb5cdbe058c27a0624c9884e735bbd131935fd49e9fe719d310"}, + {file = "wrapt-1.14.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4fcc4649dc762cddacd193e6b55bc02edca674067f5f98166d7713b193932b7f"}, + {file = "wrapt-1.14.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:11871514607b15cfeb87c547a49bca19fde402f32e2b1c24a632506c0a756656"}, + {file = "wrapt-1.14.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8ad85f7f4e20964db4daadcab70b47ab05c7c1cf2a7c1e51087bfaa83831854c"}, + {file = "wrapt-1.14.1-cp310-cp310-win32.whl", hash = "sha256:a9a52172be0b5aae932bef82a79ec0a0ce87288c7d132946d645eba03f0ad8a8"}, + {file = "wrapt-1.14.1-cp310-cp310-win_amd64.whl", hash = "sha256:6d323e1554b3d22cfc03cd3243b5bb815a51f5249fdcbb86fda4bf62bab9e164"}, + {file = "wrapt-1.14.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:43ca3bbbe97af00f49efb06e352eae40434ca9d915906f77def219b88e85d907"}, + {file = "wrapt-1.14.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:6b1a564e6cb69922c7fe3a678b9f9a3c54e72b469875aa8018f18b4d1dd1adf3"}, + {file = "wrapt-1.14.1-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:00b6d4ea20a906c0ca56d84f93065b398ab74b927a7a3dbd470f6fc503f95dc3"}, + {file = "wrapt-1.14.1-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:a85d2b46be66a71bedde836d9e41859879cc54a2a04fad1191eb50c2066f6e9d"}, + {file = "wrapt-1.14.1-cp35-cp35m-win32.whl", hash = "sha256:dbcda74c67263139358f4d188ae5faae95c30929281bc6866d00573783c422b7"}, + {file = "wrapt-1.14.1-cp35-cp35m-win_amd64.whl", hash = "sha256:b21bb4c09ffabfa0e85e3a6b623e19b80e7acd709b9f91452b8297ace2a8ab00"}, + {file = "wrapt-1.14.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:9e0fd32e0148dd5dea6af5fee42beb949098564cc23211a88d799e434255a1f4"}, + {file = "wrapt-1.14.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9736af4641846491aedb3c3f56b9bc5568d92b0692303b5a305301a95dfd38b1"}, + {file = "wrapt-1.14.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b02d65b9ccf0ef6c34cba6cf5bf2aab1bb2f49c6090bafeecc9cd81ad4ea1c1"}, + {file = "wrapt-1.14.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21ac0156c4b089b330b7666db40feee30a5d52634cc4560e1905d6529a3897ff"}, + {file = "wrapt-1.14.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9f3e6f9e05148ff90002b884fbc2a86bd303ae847e472f44ecc06c2cd2fcdb2d"}, + {file = "wrapt-1.14.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:6e743de5e9c3d1b7185870f480587b75b1cb604832e380d64f9504a0535912d1"}, + {file = "wrapt-1.14.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d79d7d5dc8a32b7093e81e97dad755127ff77bcc899e845f41bf71747af0c569"}, + {file = "wrapt-1.14.1-cp36-cp36m-win32.whl", hash = "sha256:81b19725065dcb43df02b37e03278c011a09e49757287dca60c5aecdd5a0b8ed"}, + {file = "wrapt-1.14.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b014c23646a467558be7da3d6b9fa409b2c567d2110599b7cf9a0c5992b3b471"}, + {file = "wrapt-1.14.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:88bd7b6bd70a5b6803c1abf6bca012f7ed963e58c68d76ee20b9d751c74a3248"}, + {file = "wrapt-1.14.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5901a312f4d14c59918c221323068fad0540e34324925c8475263841dbdfe68"}, + {file = "wrapt-1.14.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d77c85fedff92cf788face9bfa3ebaa364448ebb1d765302e9af11bf449ca36d"}, + {file = "wrapt-1.14.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d649d616e5c6a678b26d15ece345354f7c2286acd6db868e65fcc5ff7c24a77"}, + {file = "wrapt-1.14.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7d2872609603cb35ca513d7404a94d6d608fc13211563571117046c9d2bcc3d7"}, + {file = "wrapt-1.14.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:ee6acae74a2b91865910eef5e7de37dc6895ad96fa23603d1d27ea69df545015"}, + {file = "wrapt-1.14.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2b39d38039a1fdad98c87279b48bc5dce2c0ca0d73483b12cb72aa9609278e8a"}, + {file = "wrapt-1.14.1-cp37-cp37m-win32.whl", hash = "sha256:60db23fa423575eeb65ea430cee741acb7c26a1365d103f7b0f6ec412b893853"}, + {file = "wrapt-1.14.1-cp37-cp37m-win_amd64.whl", hash = "sha256:709fe01086a55cf79d20f741f39325018f4df051ef39fe921b1ebe780a66184c"}, + {file = "wrapt-1.14.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8c0ce1e99116d5ab21355d8ebe53d9460366704ea38ae4d9f6933188f327b456"}, + {file = "wrapt-1.14.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e3fb1677c720409d5f671e39bac6c9e0e422584e5f518bfd50aa4cbbea02433f"}, + {file = "wrapt-1.14.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:642c2e7a804fcf18c222e1060df25fc210b9c58db7c91416fb055897fc27e8cc"}, + {file = "wrapt-1.14.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b7c050ae976e286906dd3f26009e117eb000fb2cf3533398c5ad9ccc86867b1"}, + {file = "wrapt-1.14.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef3f72c9666bba2bab70d2a8b79f2c6d2c1a42a7f7e2b0ec83bb2f9e383950af"}, + {file = "wrapt-1.14.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:01c205616a89d09827986bc4e859bcabd64f5a0662a7fe95e0d359424e0e071b"}, + {file = "wrapt-1.14.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5a0f54ce2c092aaf439813735584b9537cad479575a09892b8352fea5e988dc0"}, + {file = "wrapt-1.14.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2cf71233a0ed05ccdabe209c606fe0bac7379fdcf687f39b944420d2a09fdb57"}, + {file = "wrapt-1.14.1-cp38-cp38-win32.whl", hash = "sha256:aa31fdcc33fef9eb2552cbcbfee7773d5a6792c137b359e82879c101e98584c5"}, + {file = "wrapt-1.14.1-cp38-cp38-win_amd64.whl", hash = "sha256:d1967f46ea8f2db647c786e78d8cc7e4313dbd1b0aca360592d8027b8508e24d"}, + {file = "wrapt-1.14.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3232822c7d98d23895ccc443bbdf57c7412c5a65996c30442ebe6ed3df335383"}, + {file = "wrapt-1.14.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:988635d122aaf2bdcef9e795435662bcd65b02f4f4c1ae37fbee7401c440b3a7"}, + {file = "wrapt-1.14.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cca3c2cdadb362116235fdbd411735de4328c61425b0aa9f872fd76d02c4e86"}, + {file = "wrapt-1.14.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d52a25136894c63de15a35bc0bdc5adb4b0e173b9c0d07a2be9d3ca64a332735"}, + {file = "wrapt-1.14.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40e7bc81c9e2b2734ea4bc1aceb8a8f0ceaac7c5299bc5d69e37c44d9081d43b"}, + {file = "wrapt-1.14.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b9b7a708dd92306328117d8c4b62e2194d00c365f18eff11a9b53c6f923b01e3"}, + {file = "wrapt-1.14.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:6a9a25751acb379b466ff6be78a315e2b439d4c94c1e99cb7266d40a537995d3"}, + {file = "wrapt-1.14.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:34aa51c45f28ba7f12accd624225e2b1e5a3a45206aa191f6f9aac931d9d56fe"}, + {file = "wrapt-1.14.1-cp39-cp39-win32.whl", hash = "sha256:dee0ce50c6a2dd9056c20db781e9c1cfd33e77d2d569f5d1d9321c641bb903d5"}, + {file = "wrapt-1.14.1-cp39-cp39-win_amd64.whl", hash = "sha256:dee60e1de1898bde3b238f18340eec6148986da0455d8ba7848d50470a7a32fb"}, + {file = "wrapt-1.14.1.tar.gz", hash = "sha256:380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d"}, ] diff --git a/pyproject.toml b/pyproject.toml index a8b1de0..4ba051c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ version = {use_scm = true} [tool.pdm.dev-dependencies] lint = [ "black>=22.3.0", - "pylint>=2.13.7", + "pylint>=2.13.8", "isort>=5.10.1", ] test = [ diff --git a/tests/integration/test_interface.py b/tests/integration/test_interface.py index b05391b..fe4725d 100644 --- a/tests/integration/test_interface.py +++ b/tests/integration/test_interface.py @@ -3,6 +3,7 @@ """ import pytest +from cppython_core.schema import InterfaceConfiguration from pytest_cppython.plugin import InterfaceIntegrationTests from cppython.console import ConsoleInterface @@ -21,4 +22,5 @@ def fixture_interface(self): Returns: ConsoleInterface -- The Interface object to use for the CPPython defined tests """ - return ConsoleInterface() + configuration = InterfaceConfiguration() + return ConsoleInterface(configuration) diff --git a/tests/unit/test_interface.py b/tests/unit/test_interface.py index 55e61fd..a241ee8 100644 --- a/tests/unit/test_interface.py +++ b/tests/unit/test_interface.py @@ -8,6 +8,7 @@ API, PEP621, CPPythonData, + InterfaceConfiguration, PyProject, TargetEnum, ToolData, @@ -36,7 +37,8 @@ def fixture_interface(self) -> ConsoleInterface: Returns: ConsoleInterface -- The Interface object to use for the CPPython defined tests """ - return ConsoleInterface() + configuration = InterfaceConfiguration() + return ConsoleInterface(configuration) # Grab the API methods and parameterize them for automatic testing of the entry_points method_list = [func for func in dir(API) if callable(getattr(API, func)) and not func.startswith("__")] diff --git a/tests/unit/test_project.py b/tests/unit/test_project.py index 1398550..fe4c15a 100644 --- a/tests/unit/test_project.py +++ b/tests/unit/test_project.py @@ -99,7 +99,7 @@ def test_generator_creation(self, mocker: MockerFixture): configuration = ProjectConfiguration() builder = ProjectBuilder(configuration) - generator_configuration = GeneratorConfiguration(logging.getLogger(__name__)) + generator_configuration = GeneratorConfiguration() generators = builder.create_generators([], generator_configuration, default_pyproject) assert not generators From ac44347e53bae50e5d0aaa339ba1c250fc348f32 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Tue, 3 May 2022 21:22:01 -0400 Subject: [PATCH 2/9] Add Secret Inheritance --- .github/workflows/python-publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 8b8afcb..3088f75 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -9,5 +9,4 @@ jobs: uses: synodic-software/.github/.github/workflows/python-publish.yml@stable with: repository_url: https://upload.pypi.org/legacy/ - secrets: - token: ${{ secrets.PYPI_API_TOKEN }} + secrets: inherit From 8031f0fe5f4229131f8446529840e6b2b992b90f Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Wed, 4 May 2022 11:34:54 -0400 Subject: [PATCH 3/9] Remove Logger --- cppython/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppython/project.py b/cppython/project.py index 19b9dec..909ec5d 100644 --- a/cppython/project.py +++ b/cppython/project.py @@ -152,7 +152,7 @@ def __init__( self._interface = interface - generator_configuration = GeneratorConfiguration(self._logger) + generator_configuration = GeneratorConfiguration() self._generators = builder.create_generators(plugins, generator_configuration, self.pyproject) self._logger.info("Initialized project") From df585386cc5455379228ed22143e9560818b0f18 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 03:48:59 -0400 Subject: [PATCH 4/9] Replace Workflows --- .github/workflows/python-check.yml | 2 ++ .github/workflows/python-merge.yml | 4 +--- .github/workflows/python-publish.yml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-check.yml b/.github/workflows/python-check.yml index 9e3ec6a..1557b4e 100644 --- a/.github/workflows/python-check.yml +++ b/.github/workflows/python-check.yml @@ -5,3 +5,5 @@ on: jobs: check: uses: synodic-software/.github/.github/workflows/python-check.yml@stable + with: + secrets: inherit diff --git a/.github/workflows/python-merge.yml b/.github/workflows/python-merge.yml index 19bff6e..d46a4d5 100644 --- a/.github/workflows/python-merge.yml +++ b/.github/workflows/python-merge.yml @@ -2,11 +2,9 @@ name: Update Python Development Release on: - push - jobs: publish_release: uses: synodic-software/.github/.github/workflows/python-merge.yml@stable with: repository_url: https://upload.pypi.org/legacy/ - secrets: - token: ${{ secrets.PYPI_API_TOKEN }} + secrets: inherit diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 3088f75..f03626b 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -5,7 +5,6 @@ on: jobs: publish_release: - if: github.event_name == 'release' && github.event.action == 'published' uses: synodic-software/.github/.github/workflows/python-publish.yml@stable with: repository_url: https://upload.pypi.org/legacy/ From ffa1fceb08896a325f32f46d46853e6ae711baa2 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 04:24:09 -0400 Subject: [PATCH 5/9] Update Fork Condition --- .github/workflows/python-merge.yml | 1 + .github/workflows/python-publish.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/python-merge.yml b/.github/workflows/python-merge.yml index d46a4d5..e3db392 100644 --- a/.github/workflows/python-merge.yml +++ b/.github/workflows/python-merge.yml @@ -4,6 +4,7 @@ on: jobs: publish_release: + if: "github.repository_owner == 'Synodic-Software" uses: synodic-software/.github/.github/workflows/python-merge.yml@stable with: repository_url: https://upload.pypi.org/legacy/ diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index f03626b..3aad61a 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -5,6 +5,7 @@ on: jobs: publish_release: + if: "github.repository_owner == 'Synodic-Software" uses: synodic-software/.github/.github/workflows/python-publish.yml@stable with: repository_url: https://upload.pypi.org/legacy/ From 784eb778d3eba36738e99a77c7638af41181d75b Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 05:03:12 -0400 Subject: [PATCH 6/9] Typo --- .github/workflows/python-merge.yml | 2 +- .github/workflows/python-publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-merge.yml b/.github/workflows/python-merge.yml index e3db392..cbbe4a2 100644 --- a/.github/workflows/python-merge.yml +++ b/.github/workflows/python-merge.yml @@ -4,7 +4,7 @@ on: jobs: publish_release: - if: "github.repository_owner == 'Synodic-Software" + if: github.repository_owner == 'Synodic-Software' uses: synodic-software/.github/.github/workflows/python-merge.yml@stable with: repository_url: https://upload.pypi.org/legacy/ diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 3aad61a..b06b8f5 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -5,7 +5,7 @@ on: jobs: publish_release: - if: "github.repository_owner == 'Synodic-Software" + if: github.repository_owner == 'Synodic-Software' uses: synodic-software/.github/.github/workflows/python-publish.yml@stable with: repository_url: https://upload.pypi.org/legacy/ From 1c6447f9c3dad9171ea1e5c95f9b1538cb950eb1 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 05:15:31 -0400 Subject: [PATCH 7/9] Update Template --- .github/workflows/python-check.yml | 2 -- .github/workflows/python-merge.yml | 3 ++- .github/workflows/python-publish.yml | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-check.yml b/.github/workflows/python-check.yml index 1557b4e..9e3ec6a 100644 --- a/.github/workflows/python-check.yml +++ b/.github/workflows/python-check.yml @@ -5,5 +5,3 @@ on: jobs: check: uses: synodic-software/.github/.github/workflows/python-check.yml@stable - with: - secrets: inherit diff --git a/.github/workflows/python-merge.yml b/.github/workflows/python-merge.yml index cbbe4a2..bd34aba 100644 --- a/.github/workflows/python-merge.yml +++ b/.github/workflows/python-merge.yml @@ -8,4 +8,5 @@ jobs: uses: synodic-software/.github/.github/workflows/python-merge.yml@stable with: repository_url: https://upload.pypi.org/legacy/ - secrets: inherit + secrets: + PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }} diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index b06b8f5..fa978b6 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -9,4 +9,5 @@ jobs: uses: synodic-software/.github/.github/workflows/python-publish.yml@stable with: repository_url: https://upload.pypi.org/legacy/ - secrets: inherit + secrets: + PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }} From 4b32b4d4a158d894d778a27c2ba74d1773453bd4 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 06:00:51 -0400 Subject: [PATCH 8/9] Update Chore --- pdm.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pdm.lock b/pdm.lock index b08af64..aa11766 100644 --- a/pdm.lock +++ b/pdm.lock @@ -68,7 +68,7 @@ dependencies = [ [[package]] name = "cppython-core" -version = "0.3.3.dev7" +version = "0.3.3.dev9" requires_python = ">=3.10" summary = "Data definitions for CPPython" dependencies = [ @@ -340,9 +340,9 @@ content_hash = "sha256:9842348d0ddc71440b500499ed71e9b60aea9edcf388f5d8ef170c125 {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"}, {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"}, ] -"cppython-core 0.3.3.dev7" = [ - {file = "cppython_core-0.3.3.dev7-py3-none-any.whl", hash = "sha256:b9dfff49688a6e45d28a07e7658a13783068e59dc6420518b7dcce3aa97a9ad4"}, - {file = "cppython-core-0.3.3.dev7.tar.gz", hash = "sha256:c9cb09f1cde50ca3d53531c6abcc873cdc0be1f9c90b77956e59406f640edae4"}, +"cppython-core 0.3.3.dev9" = [ + {file = "cppython_core-0.3.3.dev9-py3-none-any.whl", hash = "sha256:4131d749f2e5e6f79bed6899e05f3b98ba314347c4c38f6215a927b9857d1be3"}, + {file = "cppython-core-0.3.3.dev9.tar.gz", hash = "sha256:24ff5742afc4bd67ec9aaf05d547f08f4d41a24c9b932507aa8c0cbccc81f1e8"}, ] "dill 0.3.4" = [ {file = "dill-0.3.4-py2.py3-none-any.whl", hash = "sha256:7e40e4a70304fd9ceab3535d36e58791d9c4a776b38ec7f7ec9afc8d3dca4d4f"}, From bc7d28803dcde3bc3618d55e36a2373f946443d1 Mon Sep 17 00:00:00 2001 From: Asher Norland Date: Thu, 5 May 2022 06:06:52 -0400 Subject: [PATCH 9/9] Add Log Handler --- cppython/project.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cppython/project.py b/cppython/project.py index 909ec5d..bd46e2d 100644 --- a/cppython/project.py +++ b/cppython/project.py @@ -122,6 +122,10 @@ def __init__( levels = [logging.WARNING, logging.INFO, logging.DEBUG] self._logger = logging.getLogger("cppython") + + # Add default output stream + console_handler = logging.StreamHandler() + self._logger.addHandler(console_handler) self._logger.setLevel(levels[configuration.verbosity]) self._logger.info("Initializing project")