Skip to content

Commit 5400545

Browse files
authored
Merge pull request #436 from CosmiQ/rbavery/remove-framework-deps
Remove ML framework dependencies and refactor associated code, add gh actions, remove travis
2 parents 5315390 + 5fd1eb6 commit 5400545

File tree

492 files changed

+4059
-12939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

492 files changed

+4059
-12939
lines changed

.github/workflows/tests.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Test Python package
2+
3+
on:
4+
- push
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
name: Docker | GDAL=${{ matrix.gdal-version }} | python=${{ matrix.python-version }}
10+
container: osgeo/gdal:ubuntu-full-${{ matrix.gdal-version }}
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
python-version: ["3.8", "3.9"]
15+
gdal-version: ["3.4.0", "3.3.3"]
16+
include:
17+
- python-version: "3.8"
18+
gdal-version: "3.2.3"
19+
- python-version: "3.8"
20+
gdal-version: "3.1.3"
21+
- python-version: "3.7"
22+
gdal-version: "3.2.3"
23+
- python-version: "3.7"
24+
gdal-version: "3.1.3"
25+
26+
steps:
27+
- uses: actions/checkout@v1
28+
- name: Update
29+
run: |
30+
apt-get update
31+
apt-get -y install software-properties-common
32+
add-apt-repository -y ppa:deadsnakes/ppa
33+
apt-get update
34+
- name: Set up Python ${{ matrix.python-version }}
35+
run: |
36+
apt-get install -y --no-install-recommends \
37+
python${{ matrix.python-version }} \
38+
python${{ matrix.python-version }}-dev \
39+
python${{ matrix.python-version }}-venv \
40+
python3-pip \
41+
g++
42+
- name: Install dependencies
43+
run: |
44+
python -m pip install --upgrade pip
45+
python -m pip install tox tox-gh-actions
46+
- name: Test with tox
47+
run: tox

.travis.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 0 additions & 106 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
_These contributing guidelines are adapted from [scikit-image](https://github.com/scikit-image/scikit-image) - Copyright 2019, the scikit-image team._
22

3-
# How to contribute to `Solaris`
3+
# How to contribute to `solaris`
44

55
We welcome contributions from the open source community! From creating issues to describe bugs or request new features, to PRs to improve the codebase or documentation, we encourage you to dive in, even if you're a novice.
66

7-
- To find things to work on, check out the [open issues on GitHub](https://github.com/cosmiq/solaris/issues?state=open)
7+
- To find things to work on, check out the [open issues on GitHub](https://github.com/CosmiQ/solaris/issues?state=open)
88
- The technical detail of the development process is summed up below.
99

1010
## Contributing through issues to identify bugs or request features
1111

1212
We welcome bug reports or feature requests through issues.
1313

14-
1. Go to https://github.com/cosmiq/solaris/issues and search the issues to see if your bug/feature is already present in the list. If not,
14+
1. Go to https://github.com/CosmiQ/solaris/issues and search the issues to see if your bug/feature is already present in the list. If not,
1515
2. Create a new issue, using the template appropriate for the type of issue you're creating (bug report/feature request/etc.)
1616
- Please don't change the labels associated with the issue when you create it - maintainers will do so during triage.
1717
- If you wish to work on resolving the issue yourself, you're welcome to do so! proceed to the next session for guidelines.
1818

19+
For general discussion, questions on usage of solaris, or other general questions that relate to solaris, please use this repo's Github Discussions page.
20+
1921
## Contributing through pull requests (PRs) to improve the codebase
2022

2123
1. If you are a first-time contributor:
22-
- Go to [https://github.com/cosmiq/solaris](https://github.com/cosmiq/solaris) and click the "fork" button to create your own copy of the project.
24+
- Go to [https://github.com/CosmiQ/solaris](https://github.com/CosmiQ/solaris) and click the "fork" button to create your own copy of the project.
2325
- Clone the project to your local computer:
2426
```
2527
git clone https://github.com/your-username/solaris.git
@@ -30,10 +32,10 @@ We welcome bug reports or feature requests through issues.
3032
```
3133
- Add the upstream repository:
3234
```
33-
git remote add upstream https://github.com/cosmiq/solaris.git
35+
git remote add upstream https://github.com/CosmiQ/solaris.git
3436
```
3537
- Now, you have remote repositories named:
36-
- `upstream`, which refers to the CosmiQ repository
38+
- `upstream`, which refers to the main solaris Github repository
3739
- `origin`, which refers to your personal fork
3840
3941
2. Develop your contribution:
@@ -61,23 +63,25 @@ We welcome bug reports or feature requests through issues.
6163
- To update your pull request, make your changes on your local repository, commit, and push to the same branch on your fork of the repository. As soon as those changes are pushed up (to the same branch as before) the pull request will update automatically.
6264
6365
### Continuing integration
64-
`Travis-CI <https://travis-ci.org/>` (soon to be replaced with GitHub actions), a continuous integration service, is triggered after each Pull Request or new branch push. CI runs unit tests, measures code coverage, and checks coding style (PEP8) of your branch. The Travis tests must pass before your PR can be merged. If Travis fails, you can find out why by clicking on the "failed" icon (red cross) and inspecting the build and test log. The PR will not be merged until the CI run succeeds.
66+
`Github Actions <https://github.com/features/actions>` is a continuous integration service, triggering tests and other processes automatically after each Pull Request or new branch push. CI runs unit tests, measures code coverage, and checks coding style (PEP8) of your branch. The tests must pass before your PR can be merged. If CI fails, you can find out why by clicking on the "failed" icon (red cross) and inspecting the build and test log. The PR will not be merged until the CI run succeeds.
67+
68+
The easiest way to test your code locally prior to pushing to Github is to use `act <https://github.com/nektos/act>`, a CLI that allows you to run Github actions locally. Using act, you can run the same suite of tests in the same suite of environments that are used when a push is made to a branch on Github. To use `act`, follow the installation instructions and then run `act` in the root directory of this repository.
6569
66-
A pull request must be approved by a core team members before merging.
70+
A pull request must be approved by a core team member before merging.
6771
6872
### Unit tests
6973
70-
Our codebase is tested by `pytest` unit tests [in the tests directory](https://github.com/CosmiQ/solaris/tree/master/tests). Those tests run during the pull request CI, and if they fail, the CI fails and the PR will not be merged until it is fixed. When adding new functionality, you are encouraged to extend existing tests or implement new tests to test the functionality you added. As a rule of thumb, any PR should increase code coverage on the repository. If substantial changes are made without accompanying tests, maintainers may ask you to add tests before a PR is merged.
74+
Our codebase is tested by `pytest` unit tests [in the tests directory](https://github.com/CosmiQ/solaris/tree/main/tests). Those tests run during the pull request CI, and if they fail, the CI fails and the PR will not be merged until it is fixed. When adding new functionality, you are encouraged to extend existing tests or implement new tests to test the functionality you added. As a rule of thumb, any PR should increase code coverage on the repository. If substantial changes are made without accompanying tests, maintainers may ask you to add tests before a PR is merged.
7175
7276
### Document changes
7377
74-
Every pull request must include an update to the "Unreleased" portion of [the changelog](https://github.com/CosmiQ/solaris/blob/master/CHANGELOG.md).
78+
Every pull request must include an update to the "Unreleased" portion of [the changelog](https://github.com/CosmiQ/solaris/blob/main/CHANGELOG.md).
7579
76-
Divergence between ``upstream master`` and your feature branch
80+
Divergence between ``upstream main`` and your feature branch
7781
--------------------------------------------------------------
7882
7983
If GitHub indicates that the branch of your Pull Request can no longer
80-
be merged automatically, merge the CosmiQ dev branch into yours:
84+
be merged automatically, merge the main solaris repo dev branch into yours:
8185
```
8286
git fetch upstream dev
8387
git merge upstream/dev
@@ -97,7 +101,7 @@ Inside the conflicted file, you'll find sections like these:
97101
<<<<<<< HEAD
98102
The way the text looks in your branch
99103
=======
100-
The way the text looks in the master branch
104+
The way the text looks in the main branch
101105
>>>>>>> dev
102106
```
103107
Choose one version of the text that should be kept, and delete the
@@ -135,24 +139,6 @@ $ make coverage
135139
This will print a report with one line for each file in `solaris`,
136140
detailing the test coverage.
137141
138-
### Activate Travis-CI for your fork (optional)
139-
140-
Travis-CI checks all unit tests in the project to prevent breakage.
141-
142-
Before sending a pull request, you may want to check that Travis-CI
143-
successfully passes all tests. To do so,
144-
145-
- Go to [Travis-CI](https://travis-ci.org/) and follow the Sign In link at
146-
the top
147-
148-
- Go to your [profile page](https://travis-ci.org/profile) and switch on
149-
your `solaris` fork
150-
151-
As soon as you push your code to your fork, it will trigger Travis-CI,
152-
and you will receive an email notification when the process is done.
153-
154-
Every time Travis is triggered, it also calls on [Codecov](https://codecov.io) to inspect the current test overage.
155-
156142
157143
### Building docs
158144

0 commit comments

Comments
 (0)