Merge branch 'master' of https://github.com/xxh/xxh into 0.4.0

anki-code · anki-code · commit baf54a6844b6 · 2020-03-04T17:24:59.000+03:00
diff --git a/LICENSE b/LICENSE
@@ -22,4 +22,4 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The views and conclusions contained in the software and documentation are those of the
 authors and should not be interpreted as representing official policies, either expressed
-or implied, of the stakeholders of the xonssh project or the employers of xonssh developers.
+or implied, of the stakeholders of the xxh project or the employers of xxh developers.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ The xxh is for using the xonsh shell wherever you go through the ssh.
      ____  __________     @    @    
   ______  /          \     \__/     
    ____  /    ______  \   /   \           contribution
- _____  /    / __   \  \ /   _/   https://github.com/xonssh/xxh   
+ _____  /    / __   \  \ /   _/   https://github.com/xxh/xxh   
    ___ (    / /  /   \  \   /          
         \   \___/    /  /  /                plugins            
      ____\          /__/  /   https://github.com/search?q=xxh-plugin
@@ -45,13 +45,13 @@ The xxh is for using the xonsh shell wherever you go through the ssh.
 
 🔎 [Search xxh plugins on Github](https://github.com/search?q=xxh-plugin&type=Repositories) or [Bitbucket](https://bitbucket.org/repo/all?name=xxh-plugin)
 
-💡 [Create xxh plugin](https://github.com/xonssh/xxh-plugin-sample)
+💡 [Create xxh plugin](https://github.com/xxh/xxh-plugin-xonsh-sample)
 
-📌 [xxh-plugin-pipe-liner](https://github.com/xonssh/xxh-plugin-pipe-liner) — processing the lines easy with python and classic shell pipes
+📌 [xxh-plugin-xonsh-pipe-liner](https://github.com/xxh/xxh-plugin-xonsh-pipe-liner) — processing the lines easy with python and classic shell pipes
 
-📌 [xxh-plugin-theme-bar](https://github.com/xonssh/xxh-plugin-theme-bar) — theme to stay focused
+📌 [xxh-plugin-xonsh-theme-bar](https://github.com/xxh/xxh-plugin-xonsh-theme-bar) — theme to stay focused
 
-📌 [xxh-plugin-autojump](https://github.com/xonssh/xxh-plugin-autojump) — save time on moving thru directories
+📌 [xxh-plugin-xonsh-autojump](https://github.com/xxh/xxh-plugin-xonsh-autojump) — save time on moving thru directories
 
 ## Notes
 
@@ -66,10 +66,10 @@ To install [xontribs](https://xon.sh/xontribs.html) in xxh session use `xpip ins
 When you run `xxh myhost` command xxh download portable xonsh and store locally to future use. Then if it needed xxh upload the portable xonsh, init scripts and plugins to the host. Finally xxh make ssh connection to the host and run portable xonsh shell without any system installs and affection on the target host.
 
 ## Development
-🛠️ In the [xxh-dev](https://github.com/xonssh/xxh-dev) repo there is full [docker](https://www.docker.com/)ised environment for development, testing and contribution. The process of testing and development is orchestrated by `xde` tool and as easy as possible.
+🛠️ In the [xxh-dev](https://github.com/xxh/xxh-dev) repo there is full [docker](https://www.docker.com/)ised environment for development, testing and contribution. The process of testing and development is orchestrated by `xde` tool and as easy as possible.
 
 ## Spread the word
-If you like the idea of xxh help spread the word about xxh! Click ⭐ on the repo and <a href="https://twitter.com/intent/tweet?text=Python-powered%20shell%20wherever%20you%20go%20through%20the%20ssh&url=https%3A%2F%2Fgithub.com%2Fxonssh%2Fxxh&related=" target="_blank">tweet the link</a>! 
+If you like the idea of xxh help spread the word about xxh! Click ⭐ on the repo and <a href="https://twitter.com/intent/tweet?text=Python-powered%20shell%20wherever%20you%20go%20through%20the%20ssh&url=https%3A%2F%2Fgithub.com%2Fxxh%2Fxxh&related=" target="_blank">tweet the link</a>! 
 
 ## Thanks
 * @scopatz for https://github.com/xonsh/xonsh
diff --git a/setup.py b/setup.py
@@ -5,11 +5,11 @@
     name="xonssh-xxh",
     version=global_settings['XXH_VERSION'],
     description="xxh is for using portable xonsh shell wherever you go through the ssh",
-    url="https://github.com/xonssh/xxh",
+    url="https://github.com/xxh/xxh",
     project_urls={
-        "Documentation": "https://github.com/xonssh/xxh/blob/master/README.md",
-        "Code": "https://github.com/xonssh/xxh",
-        "Issue tracker": "https://github.com/xonssh/xxh/issues",
+        "Documentation": "https://github.com/xxh/xxh/blob/master/README.md",
+        "Code": "https://github.com/xxh/xxh",
+        "Issue tracker": "https://github.com/xxh/xxh/issues",
     },
     python_requires='>=3.6',
     install_requires=[
@@ -30,6 +30,6 @@
         "License :: OSI Approved :: BSD License"
     ],
     license="BSD",
-    author="xonssh",
+    author="xxh",
     author_email="author@example.com"
 )
diff --git a/xonssh_xxh/settings.py b/xonssh_xxh/settings.py
@@ -1,7 +1,7 @@
 import sys, os
 
 global_settings = {
-    'XXH_VERSION': '0.3.5'
+    'XXH_VERSION': '0.3.6'
 }
 
 if __name__ == "__main__":
diff --git a/xxh b/xxh
@@ -21,7 +21,7 @@ def eeprint(*args, **kwargs):
 class Xxh:
     def __init__(self):
         self.package_dir_path = pf"{xonssh_xxh.__file__}".parent
-        self.url_xxh_github = 'https://github.com/xonssh/xxh'
+        self.url_xxh_github = 'https://github.com/xxh/xxh'
         self.url_xxh_plugins_search = 'https://github.com/search?q=xxh-plugin'
         self.local_xxh_version = global_settings['XXH_VERSION']
         self.local_xxh_home = '~/.xxh'

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import sys, os`
`2`	`2`
`3`	`3`	`global_settings = {`
`4`		`- 'XXH_VERSION': '0.3.5'`
	`4`	`+ 'XXH_VERSION': '0.3.6'`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`if __name__ == "__main__":`