diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8caf908..0000000 --- a/.travis.yml +++ /dev/null @@ -1,47 +0,0 @@ -sudo: false -language: cpp -compiler: gcc - -addons: - apt: - sources: - - ubuntu-toolchain-r-test # ppa:ubuntu-toolchain-r/test - packages: - - gcc-5 - - g++-5 - - wget - -install: - # Use GCC 5. - - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi - # Download CMake binary because those available in PPAs either don't support - # xz downloads or don't support HTTPS. - - wget https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz - - tar -xf cmake-3.6.2-Linux-x86_64.tar.gz - -before_script: - # Move into the cloned LOOT repo build path. - - mkdir build && cd build - # Link dynamically to the C++ standard library runtime. - - ../cmake-3.6.2-Linux-x86_64/bin/cmake .. - -script: - - make all - - python -m unittest test - -after_success: - - ../cmake-3.6.2-Linux-x86_64/bin/cpack -C Release - - cd $TRAVIS_BUILD_DIR - # Need to replace the Bintray config files' version placeholders. - - VERSION=$(ls build/package/loot_api_python-*.tar.xz | sed 's/build\/package\/loot_api_python-//;s/-Linux.tar.xz//;') - - sed -i "s/REPLACE_THIS_VERSION/${VERSION}/" scripts/travis/loot-api.bintray.json - -deploy: - - provider: bintray - file: scripts/travis/loot-api.bintray.json - user: wrinklyninja - key: - secure: "qIZDcrbv3ELv/rHqryFT/cHXIUhQPMPvgjcKUGhIa+9oHOF6M2Y26qy5CTERb1CWePY/EiPC58F9Z4yTFA+M5b22dMdRcSXkdd7wxdeqxfZP4RzTa0hbXZpAl2deOxLhecUtV+L41frHTP0ZOyr+k6T9OWW03OK1gioSWJwx77r1rIR8x/Q4DXhFDntPi/97AOZhWDg0aht3NoS553oXz0l4rXNQbbL2aDPGAoZOWHPAQhK/mmFPxFILJpUv2FBE+3fJd1u5oKh87KRbWatJaAz+1F1R4+bxwV2heqXkvkEW7+xirEUxtohbFMBG7tSFqa4purSBFs1IEeXFer/mhQZVbx7+/95AY0N5XJeLgy+OPPBb53Ez18sZpUckW8zxlKB2e1Y3mgLrd5gtlLwuO3WrjR1DE7eQ5xCPRBuJzSTYUX4gOmDrkEpmo+RaFaJI2Qo9ZktApV0oP9U9D5fNNEcvUJlIfqgVPV5n6mCg6PrY08rg4eO3icw6dEgh7vcVhupZ26i43U3Mhs3z2llh9azOZqoHoaEjSCXQlcixCDIkW6HBsHqkfBS6rm31ojkrJNTUHF/AqJljb6c0nCkh2T2N2TyDJCWUnR6+QmGryKuTtL2E2AEIqAiDSh7S8xcdJ8qYBWWva/a3YtqIryNyMBnHro+t30a6qvV7XL5PTDg=" - skip_cleanup: true - on: - all_branches: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 786b84c..91ba1ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,15 +48,10 @@ add_subdirectory(${PYBIND11_EXTRACTED_PATH}) # LOOT API ####################################### -if (CMAKE_SYSTEM_NAME MATCHES "Windows") - set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.7z") -else() - set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.tar.xz") -endif() ExternalProject_Add(loot-api-c++ PREFIX "external" - URL ${LOOT_API_URL} + URL "https://github.com/loot/loot/releases/download/0.10.2/loot-api_0.10.2-0-g9eb7d26_dev.7z" CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "") diff --git a/docs/conf.py b/docs/conf.py index 7da1270..7c36699 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -346,5 +346,5 @@ texinfo_documents = [ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - 'loot_api': ('http://loot.readthedocs.io/en/0.10.1/', None), + 'loot_api': ('http://loot.readthedocs.io/en/0.10.2/', None), } diff --git a/scripts/travis/loot-api.bintray.json b/scripts/travis/loot-api.bintray.json deleted file mode 100644 index e3d805b..0000000 --- a/scripts/travis/loot-api.bintray.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "package": { - "name": "loot-api-python", - "repo": "loot", - "subject": "wrinklyninja" - }, - "version": { - "name": "REPLACE_THIS_VERSION" - }, - "files": [{ - "includePattern": "build/package/(loot_api_python-.+\\.tar.xz)", - "uploadPattern": "$1" - }], - "publish": true -} diff --git a/src/test.py b/src/test.py index d9935fe..779111d 100644 --- a/src/test.py +++ b/src/test.py @@ -38,17 +38,17 @@ class TestLootApi(GameFixture): def test_version(self): self.assertEqual(Version.major, 0) self.assertEqual(Version.minor, 10) - self.assertEqual(Version.patch, 1) + self.assertEqual(Version.patch, 2) self.assertNotEqual(Version.revision, u'') - self.assertEqual(Version.string(), "0.10.1") + self.assertEqual(Version.string(), "0.10.2") def test_wrapper_version(self): self.assertEqual(WrapperVersion.major, 1) - self.assertEqual(WrapperVersion.minor, 1) - self.assertEqual(WrapperVersion.patch, 2) + self.assertEqual(WrapperVersion.minor, 2) + self.assertEqual(WrapperVersion.patch, 0) self.assertNotEqual(WrapperVersion.revision, u'') self.assertNotEqual(WrapperVersion.revision, Version.revision) - self.assertEqual(WrapperVersion.string(), "1.1.2") + self.assertEqual(WrapperVersion.string(), "1.2.0") def test_create_db(self): db = create_database(GameType.tes4, self.game_path, self.local_path) diff --git a/src/wrapper_version.cpp.in b/src/wrapper_version.cpp.in index f14710d..5f74e4d 100644 --- a/src/wrapper_version.cpp.in +++ b/src/wrapper_version.cpp.in @@ -26,8 +26,8 @@ namespace loot { const unsigned int WrapperVersion::major = 1; -const unsigned int WrapperVersion::minor = 1; -const unsigned int WrapperVersion::patch = 2; +const unsigned int WrapperVersion::minor = 2; +const unsigned int WrapperVersion::patch = 0; const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@"; std::string WrapperVersion::string() {