Use 'nox' as the package name

wntrblm · Aug 24, 2018 · 8cd1e6c · 8cd1e6c
1 parent a2903d4
commit 8cd1e6c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ side of including lots of information, such as:
 Nox runs its own tests (it's recursive!). The best thing to do is start with
 a known-good nox installation, e.g. from PyPI:
 
-    pip install --pre --upgrade nox-automation
+    pip install --pre --upgrade nox
 
 To just check for lint errors, run:
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -62,7 +62,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = pkg_resources.get_distribution('nox-automation').version
+version = pkg_resources.get_distribution('nox').version
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -14,10 +14,10 @@ Welcome to Nox
 
 Install nox via `pip`_::
 
-    pip install --upgrade nox-automation
+    pip install --upgrade nox
 
 
-.. Note:: These docs are for a pre-release version of Nox, so you'll need to use ``pip install --pre nox-automation`` for now~
+.. Note:: These docs are for a pre-release version of Nox, so you'll need to use ``pip install --pre nox`` for now.
 
 
 Nox is configured via a ``nox.py`` file in your project's directory. Here's a simple noxfile that runs lint and some tests::

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
@@ -9,7 +9,7 @@ Installation
 
 Nox can be easily installed via `pip`_::
 
-    pip install --upgrade nox-automation
+    pip install --upgrade nox
 
 Usually you install this globally, similar to ``tox``, ``pip``, and other similar tools.
 

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -127,7 +127,7 @@ Nox has experimental support for converting ``tox.ini`` files into ``nox.py`` fi
 
 To use the converter, install ``nox`` with the ``tox_to_nox`` extra::
 
-    pip install --upgrade nox-automation[tox_to_nox]
+    pip install --upgrade nox[tox_to_nox]
 
 Then, just run ``tox-to-nox`` in the directory where your ``tox.ini`` resides::
 

diff --git a/nox/main.py b/nox/main.py
@@ -90,7 +90,7 @@ def main():
     args = parser.parse_args()
 
     if args.version:
-        dist = pkg_resources.get_distribution('nox-automation')
+        dist = pkg_resources.get_distribution('nox')
         print(dist.version, file=sys.stderr)
         return
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
 
 
 setup(
-    name='nox-automation',
+    name='nox',
 
     version='2018.7.31dev1',
 
@@ -69,7 +69,6 @@
         'virtualenv>=14.0.0'],
 
     extras_require={
-        ':python_version<"3.4"': ['enum34'],
         'tox_to_nox': ['jinja2', 'tox']
     },
 

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -27,7 +27,7 @@
 
 
 RESOURCES = os.path.join(os.path.dirname(__file__), 'resources')
-VERSION = pkg_resources.get_distribution('nox-automation').version
+VERSION = pkg_resources.get_distribution('nox').version
 
 
 def test_global_config_constructor():