Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Repo URL #58

Merged
merged 1 commit into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

7 changes: 2 additions & 5 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Types of Contributions
Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/giswqs/whitebox/issues.
Report bugs at https://github.com/opengeos/whitebox/issues.

If you are reporting a bug, please include:

Expand Down Expand Up @@ -45,7 +45,7 @@ articles, and such.
Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at https://github.com/giswqs/whitebox/issues.
The best way to send feedback is to file an issue at https://github.com/opengeos/whitebox/issues.

If you are proposing a feature:

Expand Down Expand Up @@ -102,9 +102,6 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 3.4, 3.5 and 3.6, and for PyPy. Check
https://travis-ci.org/giswqs/whitebox/pull_requests
and make sure that the tests pass for all supported Python versions.

Tips
----
Expand Down
19 changes: 5 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,15 @@ whitebox-python
.. image:: https://anaconda.org/conda-forge/whitebox/badges/version.svg
:target: https://anaconda.org/conda-forge/whitebox

.. image:: https://img.shields.io/travis/giswqs/whitebox-python.svg
:target: https://travis-ci.org/giswqs/whitebox-python

.. image:: https://ci.appveyor.com/api/projects/status/a7r1hna30kjbsmk3?svg=true
:target: https://ci.appveyor.com/project/giswqs/whitebox-python

.. image:: https://readthedocs.org/projects/whitebox/badge/?version=latest
:target: https://whitebox.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

.. image:: https://img.shields.io/badge/License-MIT-yellow.svg
:target: https://opensource.org/licenses/MIT

.. image:: https://img.shields.io/twitter/follow/giswqs?style=social
:target: https://twitter.com/giswqs

.. image:: https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-yellowgreen.svg
:target: https://www.buymeacoffee.com/giswqs
:target: https://www.buymeacoffee.com/opengeos


Important Note
Expand All @@ -47,7 +38,7 @@ This repository is related to the WhiteboxTools Python Frontend only. You can re

* Authors: Dr. John Lindsay (https://jblindsay.github.io/ghrg/index.html)
* Contributors: Dr. Qiusheng Wu (https://wetlands.io)
* GitHub repo: https://github.com/giswqs/whitebox-python
* GitHub repo: https://github.com/opengeos/whitebox-python
* WhiteboxTools: https://github.com/jblindsay/whitebox-tools
* User Manual: https://www.whiteboxgeo.com/manual/wbt_book/intro.html
* PyPI: https://pypi.org/project/whitebox/
Expand Down Expand Up @@ -207,7 +198,7 @@ Contributing

If you would like to contribute to the project as a developer, follow these instructions to get started:

1. Fork the whitebox project (https://github.com/giswqs/whitebox-python)
1. Fork the whitebox project (https://github.com/opengeos/whitebox-python)
2. Create your feature branch (git checkout -b my-new-feature)
3. Commit your changes (git commit -am 'Add some feature')
4. Push to the branch (git push origin my-new-feature)
Expand All @@ -221,7 +212,7 @@ The **whitebox** package is distributed under the `MIT license`_, a permissive o

Reporting Bugs
--------------
Report bugs at https://github.com/giswqs/whitebox-python/issues.
Report bugs at https://github.com/opengeos/whitebox-python/issues.

If you are reporting a bug, please include:

Expand All @@ -236,7 +227,7 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack

.. _Cookiecutter: https://github.com/audreyr/cookiecutter
.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
.. _example.py: https://github.com/giswqs/whitebox/blob/master/whitebox/example.py
.. _example.py: https://github.com/opengeos/whitebox/blob/master/whitebox/example.py
.. _WhiteboxTools: https://github.com/jblindsay/whitebox-tools
.. _webpage: https://jblindsay.github.io/ghrg/index.html
.. _jblindsay: https://github.com/jblindsay
Expand Down
42 changes: 0 additions & 42 deletions appveyor.yml

This file was deleted.

4 changes: 2 additions & 2 deletions binder/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ tar -xvf WhiteboxTools_linux_amd64.tar.xz
mv WBT/whitebox_tools .
mkdir testdata
cd testdata
wget https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.tif
wget https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.dep
wget https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.tif
wget https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.dep
8 changes: 4 additions & 4 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ You can either clone the public repository:

.. code-block:: console

$ git clone git://github.com/giswqs/whitebox
$ git clone git://github.com/opengeos/whitebox

Or download the `tarball`_:

.. code-block:: console

$ curl -OL https://github.com/giswqs/whitebox/tarball/master
$ curl -OL https://github.com/opengeos/whitebox/tarball/master

Once you have a copy of the source, you can install it with:

Expand All @@ -47,5 +47,5 @@ Once you have a copy of the source, you can install it with:
$ python setup.py install


.. _Github repo: https://github.com/giswqs/whitebox
.. _tarball: https://github.com/giswqs/whitebox/tarball/master
.. _Github repo: https://github.com/opengeos/whitebox
.. _tarball: https://github.com/opengeos/whitebox/tarball/master
2 changes: 1 addition & 1 deletion docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ For example:

Check the example.py_ for more details.

.. _example.py: https://github.com/giswqs/whitebox/blob/master/whitebox/example.py
.. _example.py: https://github.com/opengeos/whitebox/blob/master/whitebox/example.py
12 changes: 6 additions & 6 deletions examples/whitebox.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"\n",
"This notebook demonstrates the usage of the **whitebox** Python package for geospatial analysis, which is built on a stand-alone executable command-line program called [WhiteboxTools](https://github.com/jblindsay/whitebox-tools).\n",
"\n",
"* GitHub repo: https://github.com/giswqs/whitebox-python\n",
"* GitHub repo: https://github.com/opengeos/whitebox-python\n",
"* WhiteboxTools: https://github.com/jblindsay/whitebox-tools\n",
"* WhiteboxGeo: https://www.whiteboxgeo.com\n",
"* User Manual: https://www.whiteboxgeo.com/manual/wbt_book/intro.html\n",
Expand Down Expand Up @@ -62,7 +62,7 @@
"\n",
"`pip install whitebox -U`\n",
"\n",
"If you encounter any installation issues, please check [Troubleshooting](https://github.com/giswqs/whitebox#troubleshooting) on the **whitebox** GitHub page and [Report Bugs](https://github.com/giswqs/whitebox#reporting-bugs)."
"If you encounter any installation issues, please check [Troubleshooting](https://github.com/opengeos/whitebox#troubleshooting) on the **whitebox** GitHub page and [Report Bugs](https://github.com/opengeos/whitebox#reporting-bugs)."
]
},
{
Expand Down Expand Up @@ -253,7 +253,7 @@
"source": [
"### Getting data from direct URLs\n",
"\n",
"If you have data hosted on your own HTTP server or GitHub, you should be able to get direct URLs. With a direct URL, users can automatically download the data when the URL is clicked. For example https://github.com/giswqs/whitebox/raw/master/examples/testdata.zip"
"If you have data hosted on your own HTTP server or GitHub, you should be able to get direct URLs. With a direct URL, users can automatically download the data when the URL is clicked. For example https://github.com/opengeos/whitebox/raw/master/examples/testdata.zip"
]
},
{
Expand Down Expand Up @@ -309,7 +309,7 @@
"metadata": {},
"outputs": [],
"source": [
"url = \"https://github.com/giswqs/whitebox/raw/master/examples/testdata.zip\""
"url = \"https://github.com/opengeos/whitebox/raw/master/examples/testdata.zip\""
]
},
{
Expand Down Expand Up @@ -442,7 +442,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Here you can specify where your data are located. In this example, we will use [DEM.tif](https://github.com/giswqs/whitebox/blob/master/examples/testdata/DEM.tif), which has been downloaded to the testdata folder."
"Here you can specify where your data are located. In this example, we will use [DEM.tif](https://github.com/opengeos/whitebox/blob/master/examples/testdata/DEM.tif), which has been downloaded to the testdata folder."
]
},
{
Expand All @@ -466,7 +466,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"In this simple example, we smooth [DEM.tif](https://github.com/giswqs/whitebox/blob/master/examples/testdata/DEM.tif) using a [feature preserving denoising](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/terrain_analysis/feature_preserving_denoise.rs) algorithm. Then, we fill depressions in the DEM using a [depression breaching](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/hydro_analysis/breach_depressions.rs) algorithm. Finally, we calculate [flow accumulation](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/hydro_analysis/dinf_flow_accum.rs) based on the depressionless DEM."
"In this simple example, we smooth [DEM.tif](https://github.com/opengeos/whitebox/blob/master/examples/testdata/DEM.tif) using a [feature preserving denoising](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/terrain_analysis/feature_preserving_denoise.rs) algorithm. Then, we fill depressions in the DEM using a [depression breaching](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/hydro_analysis/breach_depressions.rs) algorithm. Finally, we calculate [flow accumulation](https://github.com/jblindsay/whitebox-tools/blob/master/src/tools/hydro_analysis/dinf_flow_accum.rs) based on the depressionless DEM."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
setup_requires=setup_requirements,
test_suite='tests',
tests_require=test_requirements,
url='https://github.com/giswqs/whitebox',
url='https://github.com/opengeos/whitebox',
version='2.3.1',
zip_safe=False,
)
2 changes: 1 addition & 1 deletion whitebox/automation.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

if not os.path.exists(zip_path):
print("Downloading WhiteboxTools binary ...")
# url = "https://github.com/giswqs/whitebox-bin/raw/master/WhiteboxTools_linux_amd64.zip"
# url = "https://github.com/opengeos/whitebox-bin/raw/master/WhiteboxTools_linux_amd64.zip"
url = "https://www.whiteboxgeo.com/WBT_Linux/WhiteboxTools_linux_amd64.zip"
urllib.request.urlretrieve(url, zip_path) # Download WhiteboxTools
else:
Expand Down
4 changes: 2 additions & 2 deletions whitebox/download_wbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ def safe_extract(
if verbose:
print("Downloading testdata ...")
os.mkdir(work_dir)
dem_url = "https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.tif"
dep_url = "https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.dep"
dem_url = "https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.tif"
dep_url = "https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.dep"
urllib.request.urlretrieve(dem_url, os.path.join(work_dir, "DEM.tif"))
urllib.request.urlretrieve(dep_url, os.path.join(work_dir, "DEM.dep"))

Expand Down
4 changes: 2 additions & 2 deletions whitebox/whitebox_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ def safe_extract(
if verbose:
print("Downloading testdata ...")
os.mkdir(work_dir)
dem_url = "https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.tif"
dep_url = "https://github.com/giswqs/whitebox-python/raw/master/examples/testdata/DEM.dep"
dem_url = "https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.tif"
dep_url = "https://github.com/opengeos/whitebox-python/raw/master/examples/testdata/DEM.dep"
urllib.request.urlretrieve(dem_url, os.path.join(work_dir, "DEM.tif"))
urllib.request.urlretrieve(dep_url, os.path.join(work_dir, "DEM.dep"))

Expand Down