Skip to content

Commit

Permalink
Draft 1.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Amudtogal committed Dec 17, 2019
2 parents aba14a7 + faab42d commit 0422004
Show file tree
Hide file tree
Showing 94 changed files with 1,082 additions and 2,096 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. Ubuntu]
- Version [e.g. 16.04]
- Blender version (see the splash screen on startup of Blender)
- Blender Python version (Open the Python Console Editor screen and check the output)
- debugging output (run `setup.py --info`)

**Additional context**
Add any other context about the problem here.
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
python_dist_packages.conf
installation.conf
*~
.*
.^(travis).*
*.orig
*.blend1
*.pyc
Expand Down
54 changes: 54 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# this is essential to make python work out of the box
language: python

dist: xenial

# safelist
branches:
only:
- master

# Define which python version to build against.
# As blender comes bundled with it's own python you can use just one version if you like
python:
- "3.5.7"

before_install:
# update apt-gets repository sources
- sudo apt-get update -qq

# install blender from official sources.
# This will most propably install an outdated blender version,
# but it will resolve all system dependencies blender has to be able to run.
- sudo apt-get install blender

install:
# create temp directory where we store a recent blender version
- mkdir tmp && cd tmp

# download the blender version you want to test against
- wget http://mirror.cs.umn.edu/blender.org/release/Blender2.79/blender-2.79-linux-glibc219-x86_64.tar.bz2

# Extract the archive
- tar jxf blender-2.79-linux-glibc219-x86_64.tar.bz2

# rename the extracted folder to "blender" for easier reference
- mv blender-2.79-linux-glibc219-x86_64 blender

# remove the archive, we do not need it anymore
- rm blender-2.79-linux-glibc219-x86_64.tar.bz2

# go back to root directory
- cd ..

# now create a symlink to the addon within blenders addons directory
# this is important, because otherwhise blender would not be able to load the addon
# - sudo ln -s ${PWD}/phobos ${PWD}/tmp/blender/2.79/scripts/addons/phobos

# instead we use the setup.py to install the addon to the folder
- python ${PWD}/setup.py -t ${PWD}/tmp/blender/2.79/scripts/addons/phobos -b ${PWD}/tmp/blender
- ls ${PWD}/tmp/blender/2.79/scripts/addons/phobos

# Finally start our test runner passing it the blender executable from the downloaded blender release
script: python testrunner.py ./tmp/blender/blender

674 changes: 0 additions & 674 deletions COPYING

This file was deleted.

165 changes: 0 additions & 165 deletions COPYING.LESSER

This file was deleted.

26 changes: 26 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Copyright 2019 University of Bremen & DFKI GmbH Robotics Innovation Center

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
41 changes: 20 additions & 21 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,33 +1,24 @@
# -------------------------------------------------------------------------------
# This file is part of Phobos, a Blender Add-On to edit robot models.
# Copyright (C) 2018 University of Bremen & DFKI GmbH Robotics Innovation Center

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright (C) 2020 University of Bremen & DFKI GmbH Robotics Innovation Center
#
# You should have received a copy of the 3-Clause BSD License in the LICENSE file.
# If not, see <https://opensource.org/licenses/BSD-3-Clause>.
# -------------------------------------------------------------------------------

help:
@echo 'Targets of Phobos:'
@echo ' help - Print this help information.'
@echo ' init - Install the Phobos requirements using pip.'
@echo ' install - Install the Phobos code to your Blender installation.'
@echo ' This also sets up the configuration folder for Phobos.'
@echo ' apidoc - Generates the Sphinx API documentation and moves'
@echo ' it to the gh-pages branch.'
@echo ' clean - Removes the installation configuration file for Phobos.'
@echo ' This does not remove the Phobos installation and configurations!'
@echo ' format - Formats the python code in the folder using the black code'
@echo ' formatter (github.com/ambv/black).'
@echo ' apidoc - Generates the Sphinx API documentation and moves it to the gh-pages'
@echo ' branch.'
@echo ' help - Print this help information.'
@echo ' init - Install the Phobos requirements using pip.'
@echo ' install - Install the Phobos code to your Blender installation.'
@echo ' This also sets up the configuration folder for Phobos.'
@echo ' version - Prints some help relating to drafting a new version.'

init:
pip install -r requirements.txt
Expand All @@ -36,7 +27,7 @@ install:
python3 setup.py

clean:
rm python_dist_packages.conf
rm installation.conf

format:
# add docstrings and format to google style
Expand All @@ -57,4 +48,12 @@ apidoc:
mv doc/_build/html/* .
@echo 'Please commit and push the changes to publish the new doc on https://dfki-ric.github.io/phobos'

version:
@echo 'Change version in:'
@echo ' - codemeta.json'
@echo ' - phobos/defs.py'
@echo ' - phobos/__init__.py'
@echo ' - doc/conf.py'
@echo ' - doc/index.rst'

.PHONY: init test install format apidoc help
File renamed without changes
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://gith
[![license](https://img.shields.io/github/license/dfki-ric/phobos.svg?style=flat)](https://github.com/dfki-ric/phobos/blob/master/COPYING)
[![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/)
[![made-with-sphinx-doc](https://img.shields.io/badge/Made%20with-Sphinx-1f425f.svg)](https://www.sphinx-doc.org/)
[![Build Status](https://travis-ci.org/dfki-ric/phobos.svg?branch=master)](https://travis-ci.org/dfki-ric/phobos)
<!-- TODO link DOI here [![DOI:10.1007/978-3-319-76207-4_15](https://zenodo.org/badge/DOI/10.1007/978-3-319-76207-4_15.svg)](https://doi.org/10.1007/978-3-319-76207-4_15) -->

![Phobos](https://github.com/dfki-ric/phobos/wiki/img/phobos_logo_small.png)
Expand All @@ -26,8 +27,7 @@ Bremen, together with the [Robotics
Group](http://www.informatik.uni-bremen.de/robotik/index_en.php) of the
[University of Bremen](http://www.uni-bremen.de/en.html).

Please contact [Simon V.
Reichel](https://robotik.dfki-bremen.de/de/ueber-uns/mitarbeiter/sire01.html)
Please contact [Kai von Szadkowski](https://robotik.dfki-bremen.de/de/ueber-uns/mitarbeiter/kavo01.html)
for any inquiries, or any questions and feedback not suited for the issues
page.

Expand Down Expand Up @@ -99,5 +99,4 @@ avoiding confusion or obstruction of view when editing very complex models.*

## License

Phobos is distributed under the [GNU Lesser General Public
License](https://www.gnu.org/licenses/lgpl.html).
Phobos is distributed under the [3-Clause BSD License](https://opensource.org/licenses/BSD-3-Clause).
6 changes: 3 additions & 3 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"identifier": "",
"codeRepository": "https://github.com/dfki-ric/phobos",
"datePublished": "2019-02-01",
"dateModified": "2019-02-01",
"dateModified": "2020-12-16",
"dateCreated": "2019-02-01",
"description": "A Blender addon to create and edit robot models in a WYSIWYG environment.",
"keywords": "robotics, Blender, Python, URDF, SDF, model",
"license": "GNU LGPL v3.0",
"license": "BSD-3-Clause",
"title": "Phobos",
"version": "v1.0.0 (Capricious Choutengan)"
"version": "1.0.1"
}
18 changes: 4 additions & 14 deletions config/definitions/defaultControllers.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
# -------------------------------------------------------------------------------
# This file is part of Phobos, a Blender Add-On to edit robot models.
# Copyright (C) 2018 University of Bremen & DFKI GmbH Robotics Innovation Center

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Copyright (C) 2020 University of Bremen & DFKI GmbH Robotics Innovation Center
#
# You should have received a copy of the 3-Clause BSD License in the LICENSE file.
# If not, see <https://opensource.org/licenses/BSD-3-Clause>.
# -------------------------------------------------------------------------------

# If you want to evaluate numeric expressions in this yaml file, just enclose your expression with
Expand Down
Loading

0 comments on commit 0422004

Please sign in to comment.