Skip to content

Commit

Permalink
refactor: remove bazel (DEV-735) (#172)
Browse files Browse the repository at this point in the history
* remove bazel

* Update requirements.txt

* remove java from daily test

* Update .gitignore

* update location for test output files

* fix typo in makefile

* Update README.md

* improve code
  • Loading branch information
irinaschubert committed Mar 31, 2022
1 parent 5921c5c commit e12e9dd
Show file tree
Hide file tree
Showing 25 changed files with 258 additions and 742 deletions.
1 change: 0 additions & 1 deletion .bazelversion

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/daily-test.yml
Expand Up @@ -13,19 +13,6 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Set up JDK
uses: joschi/setup-jdk@v2
with:
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Install dependencies
run: |
sudo apt-get install ca-certificates-java expect
npm install --global @bazel/bazelisk
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: '3.9'
# install pythonn dependencies
# install python dependencies
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/test.yml
Expand Up @@ -17,19 +17,6 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Set up JDK
uses: joschi/setup-jdk@v2
with:
java-version: '11' # The OpenJDK version to make available on the path
architecture: 'x64' # defaults to 'x64'
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '12'
- name: Install dependencies
run: |
sudo apt-get install ca-certificates-java expect
npm install --global @bazel/bazelisk
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
Expand Down
7 changes: 2 additions & 5 deletions .gitignore
Expand Up @@ -68,11 +68,8 @@ lists.json
out.json
id2iri_*
**/~$*.*
testdata/tmp/lists_output.json

# bazel
/bazel-*
/.ijwb/
testdata/tmp/_*.json
testdata/tmp/_*.xml

# for testing in development
tmp/
Empty file removed BUILD.bazel
Empty file.
9 changes: 4 additions & 5 deletions Makefile
Expand Up @@ -28,7 +28,7 @@ upload: ## upload distribution package to PyPI
python3 -m twine upload dist/*

.PHONY: upgrade-dist-tools
upgrade-dist-tool: ## upgrade packages necessary for testing, building, packaging and uploading to PyPI
upgrade-dist-tools: ## upgrade packages necessary for testing, building, packaging and uploading to PyPI
python3 -m pip install --upgrade pip setuptools wheel tqdm twine pytest mkdocs

.PHONY: docs-build
Expand Down Expand Up @@ -56,16 +56,15 @@ install: ## install from source (runs setup.py)

.PHONY: test
test: clean local-tmp clone-dsp-repo dsp-stack ## run all tests
# to run only one test, replace //test/... with p.ex. //test/e2e:test_tools
bazel test --test_summary=detailed --test_output=all //test/...
pytest test/

.PHONY: test-end-to-end
test-end-to-end: clean local-tmp clone-dsp-repo dsp-stack ## run e2e tests
bazel test --test_summary=detailed --test_output=all //test/e2e/...
pytest test/e2e/

.PHONY: test-unittests
test-unittests: ## run unit tests
bazel test --test_summary=detailed --test_output=all //test/unittests/...
pytest test/unittests/

.PHONY: local-tmp
local-tmp: ## create local .tmp folder
Expand Down
25 changes: 9 additions & 16 deletions README.md
Expand Up @@ -8,7 +8,13 @@ Go to [Full Documentation](https://dasch-swiss.github.io/dsp-tools/)

## Information for developers

There is a `Makefile` for all the following tasks (and more). Type `make` to print the available targets.
There is a `Makefile` for all the following tasks (and more). Type `make` to print the available targets. For a quick
start use:
```bash
make upgrade-dist-tools
make install-requirements
make run
```

## Install from source

Expand Down Expand Up @@ -49,21 +55,8 @@ When contributing to the project please make sure you use the same code style ru
[autopep8](https://pypi.org/project/autopep8/) and [mypy](https://pypi.org/project/mypy/). The configuration is defined
in `pyproject.toml` in the root directory of the project.

```toml
[tool.autopep8]
max_line_length = 180
experimental = true

[tool.mypy]
ignore_missing_imports = true
follow_imports = "silent"
show_column_numbers = true
strict = true
```

You can use the configuration with `autopep8 --global-config pyproject.toml [file path]`
and `mypy --config-file pyproject.toml
[file path]`.
You can use the configuration with `autopep8 --global-config pyproject.toml [file path]` and
`mypy --config-file pyproject.toml [file path]`.

If you are using PyCharm we recommend installing autopep8 as external tool. You can then use it with right-click on the
file > `External Tools` > `autopep8` to reformat files in-place. Due to compatibility issues with VSCode, the argument
Expand Down
24 changes: 0 additions & 24 deletions WORKSPACE

This file was deleted.

61 changes: 0 additions & 61 deletions knora/BUILD.bazel

This file was deleted.

Empty file removed knora/dsplib/BUILD.bazel
Empty file.

0 comments on commit e12e9dd

Please sign in to comment.