diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b855dbb48..20051a894 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,9 +1,9 @@
## Code of Conduct
-BeeWare operates under a [Code of Conduct](https://pybee.org/community/behavior/code-of-conduct/)
+BeeWare operates under a [Code of Conduct](https://beewareorg/community/behavior/code-of-conduct/)
-If a member of the BeeWare community has made you feel uncomfortable, we have mechanisms for [reporting a problem](https://pybee.org/community/behavior/making-a-coc-complaint/)
+If a member of the BeeWare community has made you feel uncomfortable, we have mechanisms for [reporting a problem](https://beeware.org/community/behavior/making-a-coc-complaint/)
-Changes to our behaviour documentation [are also documented](https://pybee.org/community/behavior/changes/)
+Changes to our behaviour documentation [are also documented](https://beeware.org/community/behavior/changes/)
-See the [Community Behaviour](https://pybee.org/community/behavior/) section of the PyBee.org website for more information.
+See the [Community Behaviour](https://beeware.org/community/behavior/) section of the beeware.org website for more information.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6e289d62f..ff5256a42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,5 +4,5 @@ BeeWare <3's contributions!
Please be aware, BeeWare operates under a Code of Conduct.
-See [CONTRIBUTING to BeeWare](http://pybee.org/contributing) for details.
+See [CONTRIBUTING to BeeWare](http://beeware.org/contributing) for details.
diff --git a/README.rst b/README.rst
index 028131499..265a0fbd1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
-.. image:: http://pybee.org/project/projects/bridges/batavia/batavia.png
+.. image:: http://beeware.org/project/projects/bridges/batavia/batavia.png
:width: 72px
- :target: https://pybee.org/batavia
+ :target: https://beeware.org/batavia
=======
Batavia
@@ -14,11 +14,11 @@ Batavia
.. |pypi-status| image:: https://img.shields.io/pypi/status/batavia.svg
:target: https://pypi.python.org/pypi/batavia
.. |license| image:: https://img.shields.io/pypi/l/batavia.svg
- :target: https://github.com/pybee/batavia/blob/master/LICENSE
+ :target: https://github.com/beeware/batavia/blob/master/LICENSE
.. |build-status| image:: https://beekeeper.beeware.org/projects/pybee/batavia/shield
:target: https://beekeeper.beeware.org/projects/pybee/batavia
-.. |gitter| image:: https://badges.gitter.im/pybee/general.svg
- :target: https://gitter.im/pybee/general
+.. |gitter| image:: https://badges.gitter.im/beeware/general.svg
+ :target: https://gitter.im/beeware/general
**Batavia is an early alpha project. If it breaks, you get to keep all the shiny pieces.**
@@ -45,7 +45,7 @@ your version of npm is outdated, you can update it using the command::
$ npm install npm@latest -g
Check the `Setting up your environment
-`_ for configuration help.
+`_ for configuration help.
Downloading and Installing
@@ -54,9 +54,9 @@ Downloading and Installing
1. Clone the code repositories
::
- $ mkdir pybee
- $ cd pybee
- $ git clone https://github.com/pybee/batavia
+ $ mkdir beeware
+ $ cd beeware
+ $ git clone https://github.com/beeware/batavia
2. Setup a virtualenv:
@@ -160,19 +160,19 @@ Documentation
Contributing
------------
-If you'd like to contribute to Batavia development, our `guide for first time contributors `_ will help you get started.
+If you'd like to contribute to Batavia development, our `guide for first time contributors `_ will help you get started.
-If you experience problems with Batavia, `log them on GitHub `_.
+If you experience problems with Batavia, `log them on GitHub `_.
Community
---------
-Batavia is part of the `BeeWare suite `_. You can talk to the community through:
+Batavia is part of the `BeeWare suite `_. You can talk to the community through:
* `@pybeeware on Twitter `_
-* The `pybee/general `_ channel on Gitter.
+* The `beeware/general `_ channel on Gitter.
We foster a welcoming and respectful community as described in our
-`BeeWare Community Code of Conduct `_.
+`BeeWare Community Code of Conduct `_.
diff --git a/batavia/builtins/credits.js b/batavia/builtins/credits.js
index ab047c68b..cc236a01e 100755
--- a/batavia/builtins/credits.js
+++ b/batavia/builtins/credits.js
@@ -1,7 +1,7 @@
function credits(args, kwargs) {
var sys = require('../modules/sys')
- sys.stdout.write('Thanks to all contributors, including those in AUTHORS, for supporting Batavia development. See https://github.com/pybee/batavia for more information\n')
+ sys.stdout.write('Thanks to all contributors, including those in AUTHORS, for supporting Batavia development. See https://github.com/beeware/batavia for more information\n')
}
credits.__doc__ = 'credits()\n\ninteractive prompt objects for printing the license text, a list of\n contributors and the copyright notice.'
diff --git a/batavia/builtins/help.js b/batavia/builtins/help.js
index 19c248297..4166165ff 100755
--- a/batavia/builtins/help.js
+++ b/batavia/builtins/help.js
@@ -1,7 +1,7 @@
function help(args, kwargs) {
var sys = require('../modules/sys')
- sys.stdout.write('For help, please see: https://github.com/pybee/batavia.')
+ sys.stdout.write('For help, please see: https://github.com/beeware/batavia.')
}
help.__doc__ = 'In Python, this is a wrapper around pydoc.help. In Batavia, this is a link to the README.'
diff --git a/batavia/builtins/license.js b/batavia/builtins/license.js
index d95c2c52c..93a3db662 100755
--- a/batavia/builtins/license.js
+++ b/batavia/builtins/license.js
@@ -3,7 +3,7 @@ var copyright = require('./copyright')
function license() {
var sys = require('../modules/sys')
- sys.stdout.write('LICENSE file is available at https://github.com/pybee/batavia/blob/master/LICENSE\n')
+ sys.stdout.write('LICENSE file is available at https://github.com/beeware/batavia/blob/master/LICENSE\n')
sys.stdout.write('\n')
credits()
sys.stdout.write('\n')
diff --git a/docs/background/community.rst b/docs/background/community.rst
index d585b8b34..5ed985502 100644
--- a/docs/background/community.rst
+++ b/docs/background/community.rst
@@ -30,15 +30,15 @@ Contributing
If you experience problems with Batavia, `log them on GitHub`_. If you
want to contribute code, please `fork the code`_ and `submit a pull request`_.
-.. _BeeWare suite: http://pybee.org
+.. _BeeWare suite: http://beeware.org
.. _@pybeeware on Twitter: https://twitter.com/pybeeware
-.. _Getting Help: https://pybee.org/community/getting-help/
+.. _Getting Help: https://beeware.org/community/getting-help/
.. _announcement: https://groups.google.com/forum/#!topic/beeware-users/iUm-EDgypTg
.. _BeeWare Users: https://groups.google.com/forum/#!forum/beeware-users
.. _BeeWare Developers: https://groups.google.com/forum/#!forum/beeware-developers
-.. _log them on Github: https://github.com/pybee/batavia/issues
-.. _fork the code: https://github.com/pybee/batavia
-.. _submit a pull request: https://github.com/pybee/batavia/pulls
+.. _log them on Github: https://github.com/beeware/batavia/issues
+.. _fork the code: https://github.com/beeware/batavia
+.. _submit a pull request: https://github.com/beeware/batavia/pulls
-.. _Code of Conduct: http://pybee.org/contributing/index.html
+.. _Code of Conduct: http://beeware.org/contributing/index.html
.. _Russell Keith-Magee: mailto:russell@keith-magee.com
diff --git a/docs/how-to/contribute-code.rst b/docs/how-to/contribute-code.rst
index ec29eb928..b76ad9509 100644
--- a/docs/how-to/contribute-code.rst
+++ b/docs/how-to/contribute-code.rst
@@ -3,10 +3,10 @@ Contributing to Batavia
If you experience problems with Batavia, `log them on GitHub`_. If you want to contribute code, please `fork the code`_ and `submit a pull request`_.
-.. _log them on Github: https://github.com/pybee/batavia/issues
+.. _log them on Github: https://github.com/beeware/batavia/issues
.. _forking Batavia:
-.. _fork the code: https://github.com/pybee/batavia
-.. _submit a pull request: https://github.com/pybee/batavia/pulls
+.. _fork the code: https://github.com/beeware/batavia
+.. _submit a pull request: https://github.com/beeware/batavia/pulls
Setting up your development environment
@@ -14,7 +14,7 @@ Setting up your development environment
The process of setting up a development environment is very similar to
the :doc:`/tutorial/tutorial-0` process. The biggest difference is that
-instead of using the official PyBee repository, you'll be using your own
+instead of using the official BeeWare repository, you'll be using your own
Github fork.
As with the getting started guide, these instructions will assume that you
@@ -142,7 +142,7 @@ failures, errors, or unexpected successes, please check out the
`troubleshooting section <#troubleshooting>`_ or get in touch, because you
may have found a problem.
-.. _continuous integration: https://travis-ci.org/pybee/batavia
+.. _continuous integration: https://travis-ci.org/beeware/batavia
If you just want to run a single test, or a single group of tests with the text runner, you can provide command-line arguments.
@@ -183,7 +183,7 @@ Troubleshooting
- set your upstream remote::
- $ git remote add upstream https://github.com/pybee/batavia.git
+ $ git remote add upstream https://github.com/beeware/batavia.git
- make sure you have the latest changes from upstream::
diff --git a/docs/index.rst b/docs/index.rst
index 8f12057d7..f422da53e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -87,12 +87,12 @@ Batavia is part of the `BeeWare suite`_. You can talk to the community through:
* `@pybeeware on Twitter`_
- * `pybee/general on Gitter`_
+ * `beeware/general on Gitter`_
-.. _BeeWare suite: http://pybee.org
+.. _BeeWare suite: http://beeware.org
.. _Read The Docs: https://batavia.readthedocs.io
.. _@pybeeware on Twitter: https://twitter.com/pybeeware
-.. _pybee/general on Gitter: https://gitter.im/pybee/general
+.. _beeware/general on Gitter: https://gitter.im/beeware/general
.. toctree::
diff --git a/docs/tutorial/tutorial-0.rst b/docs/tutorial/tutorial-0.rst
index f79ab4e20..49d78421c 100644
--- a/docs/tutorial/tutorial-0.rst
+++ b/docs/tutorial/tutorial-0.rst
@@ -6,16 +6,16 @@ the Batavia code, and the ouroboros dependency within a virtual environment.
You'll need to have Python 3.5 available for Batavia to work. Instructions on
how to set this up are `on our Environment setup guide
-`_.
+`_.
-1. Setup a `pybee` folder to store everything::
+1. Setup a `beeware` folder to store everything::
- $ mkdir pybee
- $ cd pybee
+ $ mkdir beeware
+ $ cd beeware
2. Get a copy of the Batavia code by running a :code:`git clone`::
- $ git clone https://github.com/pybee/batavia
+ $ git clone https://github.com/beeware/batavia
3. We'll need to create a virtual environment, and install Batavia into it.
@@ -85,7 +85,7 @@ how to set this up are `on our Environment setup guide
Your final setup should end up looking like this::
- _ pybee
+ _ beeware
\_ batavia
\_ venv (if using virtualenv)
diff --git a/docs/tutorial/tutorial-1.rst b/docs/tutorial/tutorial-1.rst
index 3ecf83f7a..75d00ec9e 100644
--- a/docs/tutorial/tutorial-1.rst
+++ b/docs/tutorial/tutorial-1.rst
@@ -10,7 +10,7 @@ Prerequisites
This tutorial assumes you've read and followed the instructions in
:doc:`the previous tutorial `. If you've done this, you should have:
-* A ``pybee`` directory with a Batavia checkout,
+* A ``beeware`` directory with a Batavia checkout,
* An activated Python 3.5 virtual environment, and
* Batavia installed in that virtual environment
@@ -128,7 +128,7 @@ up a new window and load the `BeeWare website`_. If you close that window and
go back to the Batavia testbed, you should see a lot of output in the console
section of the screen.
-.. _BeeWare website: http://pybee.org
+.. _BeeWare website: http://beeware.org
Inside the button
^^^^^^^^^^^^^^^^^
@@ -143,7 +143,7 @@ browser window:
print('Open a new web page...')
- dom.window.open('http://pybee.org', '_blank')
+ dom.window.open('http://beeware.org', '_blank')
print('Set the page title')
dom.document.title = 'Hello world'
@@ -162,7 +162,7 @@ Batavia.
You can even use this code in the sample code window: copy and paste this code into the "run code" text box, click "Run your code!", and you get a popup window.
-.. _inspect the source code: https://github.com/pybee/batavia/blob/master/testserver/sample.py
+.. _inspect the source code: https://github.com/beeware/batavia/blob/master/testserver/sample.py
Push the *other* button...
--------------------------
diff --git a/package.json b/package.json
index c7e9129d1..d266e5b9d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
},
"repository": {
"type": "git",
- "url": "git://github.com/pybee/batavia.git"
+ "url": "git://github.com/beeware/batavia.git"
},
"keywords": [
"python"
@@ -28,9 +28,9 @@
"author": "Russell Keith-Magee",
"license": "BSD-3-Clause",
"bugs": {
- "url": "https://github.com/pybee/batavia/issues"
+ "url": "https://github.com/beeware/batavia/issues"
},
- "homepage": "http://pybee.org/batavia",
+ "homepage": "http://beeware.org/batavia",
"devDependencies": {
"@pybee/ouroboros": "~3.4.1-dev.5",
"codemirror": "^5.42.2",
diff --git a/setup.py b/setup.py
index e0bbd7d60..7c2ed2be6 100644
--- a/setup.py
+++ b/setup.py
@@ -36,9 +36,9 @@
],
test_suite='tests',
package_urls={
- 'Funding': 'https://pybee.org/contributing/membership/',
+ 'Funding': 'https://beeware.org/contributing/membership/',
'Documentation': 'http://batavia.readthedocs.io/en/latest/',
'Tracker': data['bugs']['url'],
- 'Source': 'https://github.com/pybee/batavia',
+ 'Source': 'https://github.com/beeware/batavia',
},
)
diff --git a/testserver/sample.py b/testserver/sample.py
index a6e6caad7..b8a492db6 100644
--- a/testserver/sample.py
+++ b/testserver/sample.py
@@ -62,7 +62,7 @@ def main(argv):
print('Manipulate the DOM...')
print('Open a new web page...')
- dom.window.open('http://pybee.org', '_blank')
+ dom.window.open('http://beeware.org', '_blank')
print('Set the page title')
dom.document.title = 'Hello world'
print('Find an element on the page...')
diff --git a/testserver/testbed.html b/testserver/testbed.html
index e8809b91e..df39a7da6 100644
--- a/testserver/testbed.html
+++ b/testserver/testbed.html
@@ -227,7 +227,7 @@
Console output
More about Batavia
-
Batavia, and the larger BeeWare project, is open source and welcomes contributions!
+
Batavia, and the larger BeeWare project, is open source and welcomes contributions!