yhttp 8.4.2__tar.gz → 9.0.0__tar.gz

{yhttp-8.4.2 → yhttp-9.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 8.4.2
+Version: 9.0.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pymlconf<4,>=3.0.1
+Requires-Dist: pymlconf<5,>=4.0.1
 Requires-Dist: easycli<2,>=1.10.1
 Requires-Dist: ujson
 Requires-Dist: inotify-simple
@@ -52,10 +52,6 @@ Dynamic: summary
 ### python-makelib
 Install [python-makelib](https://github.com/pylover/python-makelib).
 
-### Clone 
-```bash
-git clone git@github.com:yhttp/yhttp.git
-```
 
 ### Virtualenv
 
@@ -119,12 +115,6 @@ make sdist
 make wheel
 ```
 
-Or 
-```bash
-make dist
-```
-to create both `sdidst` and `wheel` packages.
-
 
 ### Clean build directory
 Execute: 
@@ -150,14 +140,16 @@ to upload `sdists` and `wheel` packages on [PyPI](https://pypi.org).
 ## Documentation
 
 ```bash
+source activate.sh
 make doc
-make livedoc
+make doclive
 make doctest
 ```
 
 Or 
 
 ```bash
+source activate.sh
 cd sphinx
 make doctest
 make html

{yhttp-8.4.2 → yhttp-9.0.0}/README.md

@@ -13,10 +13,6 @@
 ### python-makelib
 Install [python-makelib](https://github.com/pylover/python-makelib).
 
-### Clone 
-```bash
-git clone git@github.com:yhttp/yhttp.git
-```
 
 ### Virtualenv
 
@@ -80,12 +76,6 @@ make sdist
 make wheel
 ```
 
-Or 
-```bash
-make dist
-```
-to create both `sdidst` and `wheel` packages.
-
 
 ### Clean build directory
 Execute: 
@@ -111,14 +101,16 @@ to upload `sdists` and `wheel` packages on [PyPI](https://pypi.org).
 ## Documentation
 
 ```bash
+source activate.sh
 make doc
-make livedoc
+make doclive
 make doctest
 ```
 
 Or 
 
 ```bash
+source activate.sh
 cd sphinx
 make doctest
 make html

{yhttp-8.4.2 → yhttp-9.0.0}/setup.py

@@ -15,7 +15,7 @@ with open(
 
 
 dependencies = [
-    'pymlconf >= 3.0.1, < 4',
+    'pymlconf >= 4.0.1, < 5',
     'easycli >= 1.10.1, < 2',
     'ujson',
     'inotify-simple',

{yhttp-8.4.2 → yhttp-9.0.0}/tests/test_applicationcli.py

@@ -1,5 +1,4 @@
 import os
-import tempfile
 import platform
 
 from bddcli import Application as CLIApplication, Given, stdout, status, \
@@ -30,7 +29,7 @@ class Foo(SubCommand):
         else:
             print(os.curdir)
         if app.settings.title == 'bar':
-            return 73  # The best number ever, as Sheldon says.
+            return 73  # Best number ever, as the Sheldon Cooper told already.
 
         return 0
 
@@ -46,16 +45,17 @@ class Bar(SubCommand):
 app = Application('0.1.0', 'foo')
 app.cliarguments.append(Foo)
 app.cliarguments.append(Bar)
-app.settings.merge('title: foo')
-app.settings.merge('''
+app.settings |= '''
+title: foo
 foo:
   bar:
     baz: qux
-''')
+'''
 
 
-def test_applicationcli():
+def test_applicationcli(mktmpfile):
     cliapp = CLIApplication('foo', 'tests.test_applicationcli:app.climain')
+    configfile = mktmpfile(content='title: bar')
     with Given(cliapp, '--help'):
         assert status == 0
 
@@ -63,20 +63,17 @@ def test_applicationcli():
         assert status == 0
         assert stdout == 'foo\n.\n'
 
-        with tempfile.NamedTemporaryFile() as f:
-            f.write(b'title: bar')
-            f.flush()
-            when(f'--configuration-file {f.name} foo')
-            assert status == 73
-            assert stdout == 'bar\n.\n'
+        when(f'--configuration-file {configfile} foo')
+        assert status == 73
+        assert stdout == 'bar\n.\n'
 
-            when('--directory /tmp foo')
-            assert status == 0
-            assert stdout == 'foo\n/tmp\n'
+        when('--directory /tmp foo')
+        assert status == 0
+        assert stdout == 'foo\n/tmp\n'
 
-            when('--option title=\'baz\' foo')
-            assert status == 0
-            assert stdout == 'baz\n.\n'
+        when('--option title=\'baz\' foo')
+        assert status == 0
+        assert stdout == 'baz\n.\n'
 
 
 def test_applicationcli_option():

{yhttp-8.4.2 → yhttp-9.0.0}/tests/test_rewritecli.py

@@ -19,7 +19,7 @@ class Foo(SubCommand):
 
 
 app = Rewrite()
-app.settings.merge('title: foo')
+app.settings |= 'title: foo'
 app.cliarguments.append(Foo)
 
 

{yhttp-8.4.2 → yhttp-9.0.0}/yhttp/core/application.py

@@ -39,7 +39,7 @@ class BaseApplication:
     debug: true
     '''
 
-    #: Instance of :class:`pymlconf.Root` as the global configuration instance.
+    #: Instance of :class:`pymlconf.Meld` as the global configuration instance.
     settings = None
 
     #: A list of :class:`easycli.Argument` or :class:`easycli.SubCommand`.
@@ -62,7 +62,7 @@ class BaseApplication:
         self.name = name
         self.events = {}
         self.cliarguments = []
-        self.settings = pymlconf.Root(self._builtinsettings)
+        self.settings = pymlconf.Meld(self._builtinsettings)
         self.request_middlewares = []
 
     def when(self, func):

{yhttp-8.4.2 → yhttp-9.0.0}/yhttp/core/cli.py

@@ -207,7 +207,7 @@ class Main(Root):
             os.chdir(args.directory)
 
         if args.configurationfile:
-            self.application.settings.loadfile(args.configurationfile)
+            self.application.settings.load(args.configurationfile)
 
         else:  # pragma: no cover
             # try to find user specific config file
@@ -219,7 +219,7 @@ class Main(Root):
 
             if os.path.exists(filename):
                 print(f'loading config file: {filename}')
-                self.application.settings.loadfile(filename)
+                self.application.settings.load(filename)
 
         for o in args.option:
             try:
@@ -240,7 +240,7 @@ class Main(Root):
                 indent += 2
 
             yml += f' {value}'
-            self.application.settings.merge(yml)
+            self.application.settings |= yml
 
         return super()._execute_subcommand(args)
 

yhttp-9.0.0/yhttp/core/version.py

@@ -0,0 +1 @@
+__version__ = '9.0.0'

{yhttp-8.4.2 → yhttp-9.0.0}/yhttp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 8.4.2
+Version: 9.0.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pymlconf<4,>=3.0.1
+Requires-Dist: pymlconf<5,>=4.0.1
 Requires-Dist: easycli<2,>=1.10.1
 Requires-Dist: ujson
 Requires-Dist: inotify-simple
@@ -52,10 +52,6 @@ Dynamic: summary
 ### python-makelib
 Install [python-makelib](https://github.com/pylover/python-makelib).
 
-### Clone 
-```bash
-git clone git@github.com:yhttp/yhttp.git
-```
 
 ### Virtualenv
 
@@ -119,12 +115,6 @@ make sdist
 make wheel
 ```
 
-Or 
-```bash
-make dist
-```
-to create both `sdidst` and `wheel` packages.
-
 
 ### Clean build directory
 Execute: 
@@ -150,14 +140,16 @@ to upload `sdists` and `wheel` packages on [PyPI](https://pypi.org).
 ## Documentation
 
 ```bash
+source activate.sh
 make doc
-make livedoc
+make doclive
 make doctest
 ```
 
 Or 
 
 ```bash
+source activate.sh
 cd sphinx
 make doctest
 make html

{yhttp-8.4.2 → yhttp-9.0.0}/yhttp.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pymlconf<4,>=3.0.1
+pymlconf<5,>=4.0.1
 easycli<2,>=1.10.1
 ujson
 inotify-simple

yhttp-8.4.2/yhttp/core/version.py

@@ -1 +0,0 @@
-__version__ = '8.4.2'