Skip to content

Commit

Permalink
Prepare for release v2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed Mar 5, 2022
1 parent 776e62f commit a533056
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 38 deletions.
57 changes: 26 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ test-template: &test-template
make test
jobs:
py36:
docker:
- image: python:3.6-slim
<<: *test-template

py37:
docker:
- image: python:3.7-slim
Expand All @@ -42,33 +37,33 @@ jobs:
- image: python:3.10-slim
<<: *test-template

package-and-publish:
machine: true
working_directory: ~/ddgr
steps:
- checkout
- run:
name: "package with packagecore"
command: |
# Use latest installed python3 from pyenv
export PYENV_VERSION="$(pyenv versions | grep -Po '\b3\.\d+\.\d+' | tail -1)"
pip install packagecore
packagecore -o ./dist/ ${CIRCLE_TAG#v}
- run:
name: "publish to GitHub"
command: |
go get github.com/tcnksm/ghr
ghr -t ${GITHUB_API_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace ${CIRCLE_TAG} ./dist/
# package-and-publish:
# machine: true
# working_directory: ~/ddgr
# steps:
# - checkout
# - run:
# name: "package with packagecore"
# command: |
# # Use latest installed python3 from pyenv
# export PYENV_VERSION="$(pyenv versions | grep -Po '\b3\.\d+\.\d+' | tail -1)"
# pip install packagecore
# packagecore -o ./dist/ ${CIRCLE_TAG#v}
# - run:
# name: "publish to GitHub"
# command: |
# go get github.com/tcnksm/ghr
# ghr -t ${GITHUB_API_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace ${CIRCLE_TAG} ./dist/

workflows:
version: 2

test:
jobs: &all-tests
- py36
- py37
- py38
- py39
- py310

nightly:
triggers:
Expand All @@ -80,11 +75,11 @@ workflows:
- master
jobs: *all-tests

publish-github-release:
jobs:
- package-and-publish:
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
# publish-github-release:
# jobs:
# - package-and-publish:
# filters:
# tags:
# only: /^v.*/
# branches:
# ignore: /.*/
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
ddgr v2.0
2022-03-05

- Display results in reversed order (`--rev`, `--reverse`)
- Support Python v3.10 (dropped v3.6)

-------------------------------------------------------------------------------

ddgr v1.9
2020-07-26

Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ A big advantage of `ddgr` over `googler` is DuckDuckGo works over the Tor networ
- [Installation](#installation)
- [Dependencies](#dependencies)
- [From a package manager](#from-a-package-manager)
- [Release packages](#release-packages)
- [From source](#from-source)
- [Running standalone](#running-standalone)
- [Shell completion](#shell-completion)
Expand Down Expand Up @@ -95,10 +94,6 @@ Unlisted packagers:
</p>
</details>

#### Release packages

Packages for Arch Linux, CentOS, Debian, Fedora, OpenSUSE Leap, Solus, and Ubuntu are available with the [latest stable release](https://github.com/jarun/ddgr/releases/latest).

#### From source

If you have git installed, clone this repository. Otherwise download the [latest stable release](https://github.com/jarun/ddgr/releases/latest) or [development version](https://github.com/jarun/ddgr/archive/master.zip).
Expand Down Expand Up @@ -163,6 +158,7 @@ optional arguments:
--json output in JSON format; implies --np
--gb, --gui-browser open a bang directly in gui browser
--np, --noprompt perform search and exit, do not prompt
--rev, --reverse list entries in reversed order
--url-handler UTIL custom script or cli utility to open results
--show-browser-logs do not suppress browser output (stdout and stderr)
-v, --version show program's version number and exit
Expand Down
2 changes: 1 addition & 1 deletion ddgr
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ except ValueError:

# Constants

_VERSION_ = '1.9'
_VERSION_ = '2.0'

COLORMAP = {k: '\x1b[%sm' % v for k, v in {
'a': '30', 'b': '31', 'c': '32', 'd': '33',
Expand Down
2 changes: 1 addition & 1 deletion ddgr.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "DDGR" "1" "21 Jul 2020" "Version 1.9" "User Commands"
.TH "DDGR" "1" "05 Mar 2022" "Version 2.0" "User Commands"
.SH NAME
ddgr \- DuckDuckGo from the terminal
.SH SYNOPSIS
Expand Down

0 comments on commit a533056

Please sign in to comment.